From 45af854ed227530fa540f921935d44825159c09b Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 23 Oct 2024 19:09:29 -0400 Subject: [PATCH 1/4] reduce dBm to 15dBm for all, for now, will need to ifdef guard --- src/network_interfaces/Wippersnapper_ESP32.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network_interfaces/Wippersnapper_ESP32.h b/src/network_interfaces/Wippersnapper_ESP32.h index 891d92d3b..cb0dc4b5d 100644 --- a/src/network_interfaces/Wippersnapper_ESP32.h +++ b/src/network_interfaces/Wippersnapper_ESP32.h @@ -103,6 +103,8 @@ class Wippersnapper_ESP32 : public Wippersnapper { WiFi.disconnect(); delay(100); + WiFi.setTxPower(WIFI_POWER_15dBm); + // Perform a network scan int n = WiFi.scanNetworks(); if (n == 0) { From 7fe6cfa5346f4a2aa515f967289d0599a02d524d Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 24 Oct 2024 10:44:06 -0400 Subject: [PATCH 2/4] inclusion guard around dbm setter, for all qt py --- src/network_interfaces/Wippersnapper_ESP32.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/network_interfaces/Wippersnapper_ESP32.h b/src/network_interfaces/Wippersnapper_ESP32.h index cb0dc4b5d..99c4d47be 100644 --- a/src/network_interfaces/Wippersnapper_ESP32.h +++ b/src/network_interfaces/Wippersnapper_ESP32.h @@ -103,7 +103,15 @@ class Wippersnapper_ESP32 : public Wippersnapper { WiFi.disconnect(); delay(100); +// For boards with a "3D Antenna", we need to reduce the TX power +// to prevent flaky operation. +// NOTE: This is a known issue with the QT Py series of boards. +#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2 || \ + ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM || \ + ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2 || ARDUINO_ADAFRUIT_QTPY_ESP32C3 || \ + ARDUINO_ADAFRUIT_QTPY_ESP32_PICO WiFi.setTxPower(WIFI_POWER_15dBm); +#endif // Perform a network scan int n = WiFi.scanNetworks(); From bd05dd280257875435fb05603dd822a4765434b0 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 24 Oct 2024 11:24:52 -0400 Subject: [PATCH 3/4] point workflow to arduino not tyeth! --- .github/workflows/build-clang-doxy.yml | 45 +++++++++++++------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 40e185937..8ce1746af 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -33,8 +33,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -73,7 +73,7 @@ jobs: run: | pip3 install esptool - name: Build for ESP32-SX (esptool) - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list files run: | ls -Rla examples/ @@ -182,8 +182,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -215,7 +215,7 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX run: | - python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list files (tree) run: | tree @@ -373,8 +373,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -394,7 +394,7 @@ jobs: cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build SAMD platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Rename build artifacts to reflect the platform name run: | mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 @@ -426,8 +426,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -446,7 +446,7 @@ jobs: cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build RP2040 platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Rename build artifacts to reflect the platform name run: | mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 @@ -477,8 +477,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -497,7 +497,7 @@ jobs: cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build SAMD (no-FS) platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 build-esp8266: name: 🏗️ESP8266 @@ -518,8 +518,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -536,7 +536,7 @@ jobs: cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: build ESP8266 platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list build artifacts run: | ls @@ -583,8 +583,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -615,7 +615,7 @@ jobs: run: | cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list run: | ls @@ -659,8 +659,8 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - path: ci ref: ci-wippersnapper + path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 with: @@ -792,6 +792,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino + ref: ci-wippersnapper path: ci - name: pre-install run: bash ci/actions_install.sh From 6a2f67ae0bbdce8e482d944b0cdad39aedb3ef29 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 24 Oct 2024 13:06:33 -0400 Subject: [PATCH 4/4] update platformio.ini to use 3.0.7 --- platformio.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index f0bba3b3d..cdc3229ad 100644 --- a/platformio.ini +++ b/platformio.ini @@ -90,7 +90,7 @@ lib_deps = ; Common build environment for ESP32 platform [common:esp32] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop lib_ignore = WiFiNINA, WiFi101, OneWire @@ -331,6 +331,7 @@ extra_scripts = pre:rename_usb_config.py extends = common:esp32 board = adafruit_qtpy_esp32s3_nopsram build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM +board_build.partitions = tinyuf2-partitions-4MB.csv extra_scripts = pre:rename_usb_config.py ; Adafruit QT Py ESP32-S3 with PSRAM