Skip to content

Commit 8156212

Browse files
committed
ci(FQBN): Use QIO as default as DIO can be used on demand now
1 parent f8e03cf commit 8156212

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

Diff for: .github/scripts/sketch_utils.sh

+20-12
Original file line numberDiff line numberDiff line change
@@ -98,34 +98,42 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
9898

9999
# Default FQBN options if none were passed in the command line.
100100

101-
esp32_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
102-
esp32s2_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
103-
esp32s3_opts="PSRAM=opi,USBMode=default,FlashMode=dio${fqbn_append:+,$fqbn_append}"
104-
esp32c3_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
105-
esp32c6_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
106-
esp32h2_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
101+
esp32_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
102+
esp32s2_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
103+
esp32s3_opts="PSRAM=opi,USBMode=default${fqbn_append:+,$fqbn_append}"
104+
esp32c3_opts="$fqbn_append"
105+
esp32c6_opts="$fqbn_append"
106+
esp32h2_opts="$fqbn_append"
107107

108108
# Select the common part of the FQBN based on the target. The rest will be
109109
# appended depending on the passed options.
110110

111+
opt=""
112+
111113
case "$target" in
112114
"esp32")
113-
fqbn="espressif:esp32:esp32:${options:-$esp32_opts}"
115+
[ -n "${options:-$esp32_opts}" ] && opt=":${options:-$esp32_opts}"
116+
fqbn="espressif:esp32:esp32$opt"
114117
;;
115118
"esp32s2")
116-
fqbn="espressif:esp32:esp32s2:${options:-$esp32s2_opts}"
119+
[ -n "${options:-$esp32s2_opts}" ] && opt=":${options:-$esp32s2_opts}"
120+
fqbn="espressif:esp32:esp32s2$opt"
117121
;;
118122
"esp32c3")
119-
fqbn="espressif:esp32:esp32c3:${options:-$esp32c3_opts}"
123+
[ -n "${options:-$esp32c3_opts}" ] && opt=":${options:-$esp32c3_opts}"
124+
fqbn="espressif:esp32:esp32c3$opt"
120125
;;
121126
"esp32s3")
122-
fqbn="espressif:esp32:esp32s3:${options:-$esp32s3_opts}"
127+
[ -n "${options:-$esp32s3_opts}" ] && opt=":${options:-$esp32s3_opts}"
128+
fqbn="espressif:esp32:esp32s3$opt"
123129
;;
124130
"esp32c6")
125-
fqbn="espressif:esp32:esp32c6:${options:-$esp32c6_opts}"
131+
[ -n "${options:-$esp32c6_opts}" ] && opt=":${options:-$esp32c6_opts}"
132+
fqbn="espressif:esp32:esp32c6$opt"
126133
;;
127134
"esp32h2")
128-
fqbn="espressif:esp32:esp32h2:${options:-$esp32h2_opts}"
135+
[ -n "${options:-$esp32h2_opts}" ] && opt=":${options:-$esp32h2_opts}"
136+
fqbn="espressif:esp32:esp32h2$opt"
129137
;;
130138
esac
131139

Diff for: docs/en/contributing.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ And in the ``README.md`` file:
172172
By default, the CI system will use the FQBNs specified in the ``.github/scripts/sketch_utils.sh`` file to compile the sketches.
173173
Currently, the default FQBNs are:
174174

175-
* ``espressif:esp32:esp32:PSRAM=enabled,FlashMode=dio``
176-
* ``espressif:esp32:esp32s2:PSRAM=enabled,FlashMode=dio``
177-
* ``espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,FlashMode=dio``
178-
* ``espressif:esp32:esp32c3:FlashMode=dio``
179-
* ``espressif:esp32:esp32c6:FlashMode=dio``
180-
* ``espressif:esp32:esp32h2:FlashMode=dio``
175+
* ``espressif:esp32:esp32:PSRAM=enabled``
176+
* ``espressif:esp32:esp32s2:PSRAM=enabled``
177+
* ``espressif:esp32:esp32s3:PSRAM=opi,USBMode=default``
178+
* ``espressif:esp32:esp32c3``
179+
* ``espressif:esp32:esp32c6``
180+
* ``espressif:esp32:esp32h2``
181181

182182
There are two ways to alter the FQBNs used to compile the sketches: by using the ``fqbn`` or ``fqbn_append`` fields in the ``ci.json`` file.
183183

0 commit comments

Comments
 (0)