Skip to content

Commit b8e644e

Browse files
committed
disable BT Serial examples for S2
1 parent bbfabaf commit b8e644e

File tree

23 files changed

+29
-22
lines changed

23 files changed

+29
-22
lines changed

.github/scripts/install-arduino-ide.sh

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,10 @@ function build_sketch(){ # build_sketch <fqbn> <path-to-ino> [extra-options]
116116
$win_opts $xtra_opts "$sketch"
117117
}
118118

119-
function count_sketches() # count_sketches <examples-path>
119+
function count_sketches() # count_sketches <examples-path> <target-mcu>
120120
{
121121
local examples="$1"
122+
local target="$2"
122123
rm -rf sketches.txt
123124
if [ ! -d "$examples" ]; then
124125
touch sketches.txt
@@ -133,7 +134,7 @@ function count_sketches() # count_sketches <examples-path>
133134
if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
134135
continue
135136
fi;
136-
if [[ -f "$sketchdir/.test.skip" ]]; then
137+
if [[ -f "$sketchdir/.skip.$target" ]]; then
137138
continue
138139
fi
139140
echo $sketch >> sketches.txt
@@ -142,24 +143,25 @@ function count_sketches() # count_sketches <examples-path>
142143
return $sketchnum
143144
}
144145

145-
function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total-chunks> [extra-options]
146+
function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <chunk> <total-chunks> [extra-options]
146147
{
147148
local fqbn=$1
148-
local examples=$2
149-
local chunk_idex=$3
150-
local chunks_num=$4
151-
local xtra_opts=$5
149+
local target="$2"
150+
local examples=$3
151+
local chunk_idex=$4
152+
local chunks_num=$5
153+
local xtra_opts=$6
152154

153-
if [ "$#" -lt 2 ]; then
155+
if [ "$#" -lt 3 ]; then
154156
echo "ERROR: Illegal number of parameters"
155-
echo "USAGE: build_sketches <fqbn> <examples-path> [<chunk> <total-chunks>] [extra-options]"
157+
echo "USAGE: build_sketches <fqbn> <target-mcu <examples-path> [<chunk> <total-chunks>] [extra-options]"
156158
return 1
157159
fi
158160

159-
if [ "$#" -lt 4 ]; then
161+
if [ "$#" -lt 5 ]; then
160162
chunk_idex="0"
161163
chunks_num="1"
162-
xtra_opts=$3
164+
xtra_opts=$4
163165
fi
164166

165167
if [ "$chunks_num" -le 0 ]; then
@@ -208,7 +210,7 @@ function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total
208210
local sketchdirname=$(basename $sketchdir)
209211
local sketchname=$(basename $sketch)
210212
if [ "${sketchdirname}.ino" != "$sketchname" ] \
211-
|| [ -f "$sketchdir/.test.skip" ]; then
213+
|| [ -f "$sketchdir/.skip.$target" ]; then
212214
continue
213215
fi
214216
sketchnum=$(($sketchnum + 1))

.github/scripts/on-push.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ fi
3535

3636
if [ "$BUILD_PIO" -eq 0 ]; then
3737
# ArduinoIDE ESP32 Test
38+
TARGET="esp32"
3839
FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
3940
source ./.github/scripts/install-arduino-ide.sh
4041
source ./.github/scripts/install-arduino-core-esp32.sh
@@ -53,10 +54,11 @@ if [ "$BUILD_PIO" -eq 0 ]; then
5354
if [ "$CHUNK_INDEX" -eq 0 ]; then
5455
bash "$ARDUINO_ESP32_PATH/.github/scripts/check-cmakelists.sh"
5556
fi
56-
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
57+
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
5758
fi
5859

5960
# ArduinoIDE ESP32S2 Test
61+
TARGET="esp32s2"
6062
FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
6163
if [ "$OS_IS_WINDOWS" == "1" ]; then
6264
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -65,7 +67,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
6567
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
6668
build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
6769
else
68-
build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
70+
build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
6971
fi
7072
else
7173
source ./.github/scripts/install-platformio-esp32.sh

libraries/BLE/examples/BLE_client/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_iBeacon/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_notify/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_scan/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_server/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_server_multiconnect/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_uart/.skip.esp32s2

Whitespace-only changes.

libraries/BLE/examples/BLE_write/.skip.esp32s2

Whitespace-only changes.

0 commit comments

Comments
 (0)