Skip to content

Commit 270344d

Browse files
brentrubrentru
authored
Merge pull request #654 from adafruit/qtpy-test-dbm
Reduce connection errors on QT Py ESP32-Sx due to 3D Antennas
2 parents 63b812b + 6a2f67a commit 270344d

File tree

3 files changed

+35
-23
lines changed

3 files changed

+35
-23
lines changed

‎.github/workflows/build-clang-doxy.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
3434
- uses: actions/checkout@v4
3535
with:
36-
repository: tyeth/ci-arduino
37-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
36+
repository: adafruit/ci-arduino
37+
ref: ci-wippersnapper
3838
path: ci
3939
- name: Checkout Board Definitions
4040
uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
pip3 install esptool
7575
- name: Build for ESP32-SX (esptool)
76-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
76+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
7777
- name: list files
7878
run: |
7979
ls -Rla examples/
@@ -183,8 +183,8 @@ jobs:
183183
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
184184
- uses: actions/checkout@v4
185185
with:
186-
repository: tyeth/ci-arduino
187-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
186+
repository: adafruit/ci-arduino
187+
ref: ci-wippersnapper
188188
path: ci
189189
- name: Install CI-Arduino
190190
run: bash ci/actions_install.sh
@@ -216,7 +216,7 @@ jobs:
216216
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
217217
- name: Build for ESP32-SX
218218
run: |
219-
python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
219+
python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
220220
- name: list files (tree)
221221
run: |
222222
tree
@@ -374,8 +374,8 @@ jobs:
374374
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
375375
- uses: actions/checkout@v4
376376
with:
377-
repository: tyeth/ci-arduino
378-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
377+
repository: adafruit/ci-arduino
378+
ref: ci-wippersnapper
379379
path: ci
380380
- name: Install CI-Arduino
381381
run: bash ci/actions_install.sh
@@ -395,7 +395,7 @@ jobs:
395395
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
396396
mv nanopb/pb.h src/nanopb/nanopb.pb.h
397397
- name: build SAMD platforms
398-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
398+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
399399
- name: Rename build artifacts to reflect the platform name
400400
run: |
401401
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
@@ -427,8 +427,8 @@ jobs:
427427
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
428428
- uses: actions/checkout@v4
429429
with:
430-
repository: tyeth/ci-arduino
431-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
430+
repository: adafruit/ci-arduino
431+
ref: ci-wippersnapper
432432
path: ci
433433
- name: Install CI-Arduino
434434
run: bash ci/actions_install.sh
@@ -447,7 +447,7 @@ jobs:
447447
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
448448
mv nanopb/pb.h src/nanopb/nanopb.pb.h
449449
- name: build RP2040 platforms
450-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
450+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
451451
- name: Rename build artifacts to reflect the platform name
452452
run: |
453453
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
@@ -478,8 +478,8 @@ jobs:
478478
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
479479
- uses: actions/checkout@v4
480480
with:
481-
repository: tyeth/ci-arduino
482-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
481+
repository: adafruit/ci-arduino
482+
ref: ci-wippersnapper
483483
path: ci
484484
- name: Install CI-Arduino
485485
run: bash ci/actions_install.sh
@@ -498,7 +498,7 @@ jobs:
498498
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
499499
mv nanopb/pb.h src/nanopb/nanopb.pb.h
500500
- name: build SAMD (no-FS) platforms
501-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
501+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
502502

503503
build-esp8266:
504504
name: 🏗️ESP8266
@@ -519,8 +519,8 @@ jobs:
519519
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
520520
- uses: actions/checkout@v4
521521
with:
522-
repository: tyeth/ci-arduino
523-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
522+
repository: adafruit/ci-arduino
523+
ref: ci-wippersnapper
524524
path: ci
525525
- name: Install CI-Arduino
526526
run: bash ci/actions_install.sh
@@ -537,7 +537,7 @@ jobs:
537537
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
538538
mv nanopb/pb.h src/nanopb/nanopb.pb.h
539539
- name: build ESP8266 platforms
540-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
540+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
541541
- name: list build artifacts
542542
run: |
543543
ls
@@ -586,8 +586,8 @@ jobs:
586586
echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
587587
- uses: actions/checkout@v4
588588
with:
589-
repository: tyeth/ci-arduino
590-
ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
589+
repository: adafruit/ci-arduino
590+
ref: ci-wippersnapper
591591
path: ci
592592
- name: Install CI-Arduino
593593
run: bash ci/actions_install.sh
@@ -618,7 +618,7 @@ jobs:
618618
run: |
619619
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
620620
- name: Build for ESP32-SX
621-
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
621+
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
622622
- name: list
623623
run: |
624624
ls
@@ -662,8 +662,8 @@ jobs:
662662
- uses: actions/checkout@v4
663663
with:
664664
repository: adafruit/ci-arduino
665-
path: ci
666665
ref: ci-wippersnapper
666+
path: ci
667667
- name: Checkout Board Definitions
668668
uses: actions/checkout@v4
669669
with:
@@ -795,6 +795,7 @@ jobs:
795795
- uses: actions/checkout@v4
796796
with:
797797
repository: adafruit/ci-arduino
798+
ref: ci-wippersnapper
798799
path: ci
799800
- name: pre-install
800801
run: bash ci/actions_install.sh

‎platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ lib_deps =
9090

9191
; Common build environment for ESP32 platform
9292
[common:esp32]
93-
platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip
93+
platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip
9494
; This is needed for occasional new features and bug fixes
9595
; platform = https://github.com/pioarduino/platform-espressif32#develop
9696
lib_ignore = WiFiNINA, WiFi101, OneWire
@@ -340,6 +340,7 @@ extra_scripts = pre:rename_usb_config.py
340340
extends = common:esp32
341341
board = adafruit_qtpy_esp32s3_nopsram
342342
build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM
343+
board_build.partitions = tinyuf2-partitions-4MB.csv
343344
extra_scripts = pre:rename_usb_config.py
344345

345346
; Adafruit QT Py ESP32-S3 with PSRAM

‎src/network_interfaces/Wippersnapper_ESP32.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ class Wippersnapper_ESP32 : public Wippersnapper {
103103
WiFi.disconnect();
104104
delay(100);
105105

106+
// For boards with a "3D Antenna", we need to reduce the TX power
107+
// to prevent flaky operation.
108+
// NOTE: This is a known issue with the QT Py series of boards.
109+
#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2 || \
110+
ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM || \
111+
ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2 || ARDUINO_ADAFRUIT_QTPY_ESP32C3 || \
112+
ARDUINO_ADAFRUIT_QTPY_ESP32_PICO
113+
WiFi.setTxPower(WIFI_POWER_15dBm);
114+
#endif
115+
106116
// Perform a network scan
107117
int n = WiFi.scanNetworks();
108118
if (n == 0) {

0 commit comments

Comments
 (0)