Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ea4ab84

Browse filesBrowse files
authored
Merge branch 'master' into usb_keyboard
2 parents d139973 + 09a6770 commit ea4ab84
Copy full SHA for ea4ab84

File tree

Expand file treeCollapse file tree

3 files changed

+18
-12
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+18
-12
lines changed

‎.github/scripts/sketch_utils.sh

Copy file name to clipboardExpand all lines: .github/scripts/sketch_utils.sh
+13-7Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
8686
shift
8787
log_compilation=$1
8888
;;
89+
-d )
90+
shift
91+
debug_level="DebugLevel=$1"
92+
;;
8993
* )
9094
break
9195
;;
@@ -140,13 +144,15 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
140144
fi
141145

142146
# Default FQBN options if none were passed in the command line.
143-
144-
esp32_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
145-
esp32s2_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
146-
esp32s3_opts="PSRAM=opi,USBMode=default${fqbn_append:+,$fqbn_append}"
147-
esp32c3_opts="$fqbn_append"
148-
esp32c6_opts="$fqbn_append"
149-
esp32h2_opts="$fqbn_append"
147+
# Replace any double commas with a single one and strip leading and
148+
# trailing commas.
149+
150+
esp32_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
151+
esp32s2_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
152+
esp32s3_opts=$(echo "PSRAM=opi,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
153+
esp32c3_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
154+
esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
155+
esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
150156

151157
# Select the common part of the FQBN based on the target. The rest will be
152158
# appended depending on the passed options.

‎.github/scripts/tests_run.sh

Copy file name to clipboardExpand all lines: .github/scripts/tests_run.sh
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ function run_test() {
109109
rm $sketchdir/diagram.json 2>/dev/null || true
110110

111111
result=0
112-
printf "\033[95mpytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args\033[0m\n"
113-
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
112+
printf "\033[95mpytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args\033[0m\n"
113+
bash -c "set +e; pytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args; exit \$?" || result=$?
114114
printf "\n"
115115
if [ $result -ne 0 ]; then
116116
result=0
117117
printf "\033[95mRetrying test: $sketchname -- Config: $i\033[0m\n"
118-
printf "\033[95mpytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args\033[0m\n"
119-
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
118+
printf "\033[95mpytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args\033[0m\n"
119+
bash -c "set +e; pytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args; exit \$?" || result=$?
120120
printf "\n"
121121
if [ $result -ne 0 ]; then
122122
printf "\033[91mFailed test: $sketchname -- Config: $i\033[0m\n\n"

‎libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/Zigbee_Temp_Hum_Sensor_Sleepy.ino

Copy file name to clipboardExpand all lines: libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/Zigbee_Temp_Hum_Sensor_Sleepy.ino
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void meausureAndSleep() {
4545
// Measure temperature sensor value
4646
float temperature = temperatureRead();
4747

48-
// Use temparture value as humidity value to demonstrate both temperature and humidity
48+
// Use temperature value as humidity value to demonstrate both temperature and humidity
4949
float humidity = temperature;
5050

5151
// Update temperature and humidity values in Temperature sensor EP

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.