Merge branch 'master' into OpenThread

Author: SuGlider

.github/scripts/install-arduino-core-esp32.sh

@@ -28,7 +28,11 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
     #git submodule update --init --recursive > /dev/null 2>&1
 
     echo "Installing Platform Tools ..."
-    cd tools && python get.py
+    if [ "$OS_IS_WINDOWS" == "1" ]; then
+      cd tools && ./get.exe
+    else
+      cd tools && python get.py
+    fi
     cd $script_init_path
 
     echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"

.github/scripts/on-release.sh

@@ -421,12 +421,12 @@ fi
 # Upload package JSONs (temporary halted to fix json generation)
 echo "Uploading $PACKAGE_JSON_DEV ..."
 echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
-# echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
+echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
 echo
 if [ "$RELEASE_PRE" == "false" ]; then
     echo "Uploading $PACKAGE_JSON_REL ..."
     echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
-    # echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
+    echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
     echo
 fi
 

.github/workflows/build_py_tools.yml

@@ -3,10 +3,11 @@ name: Build Python Tools
 on:
   pull_request:
     paths:
-    - 'tools/get.py'
-    - 'tools/espota.py'
-    - 'tools/gen_esp32part.py'
-    - 'tools/gen_insights_package.py'
+      - '.github/workflows/build_py_tools.yml'
+      - 'tools/get.py'
+      - 'tools/espota.py'
+      - 'tools/gen_esp32part.py'
+      - 'tools/gen_insights_package.py'
 
 jobs:
   find-changed-tools:
@@ -21,6 +22,13 @@ jobs:
         with:
           fetch-depth: 2
           ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Check if checkout failed
+        if: failure()
+        run: |
+          echo "Checkout failed."
+          echo "Make sure you are using a branch inside the repository and not a fork."
+
       - name: Verify Python Tools Changed
         uses: tj-actions/changed-files@v41
         id: verify-changed-files
@@ -47,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-20.04, ARM, ARM64]
+        os: [windows-latest, macos-latest, ubuntu-20.04, ARM]
         include:
         - os: windows-latest
           TARGET: win64
@@ -63,10 +71,6 @@ jobs:
           CONTAINER: python:3.8-bullseye
           TARGET: arm
           SEPARATOR: ':'
-        - os: ARM64
-          CONTAINER: python:3.8-bullseye
-          TARGET: arm64
-          SEPARATOR: ':'
     container: ${{ matrix.CONTAINER }} # use python container on ARM
     env:
       DISTPATH: pytools-${{ matrix.TARGET }}
@@ -93,7 +97,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
       - name: Set up Python 3.8
         # Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
-        if: matrix.os != 'ARM' && matrix.os != 'ARM64'
+        if: matrix.os != 'ARM'
         uses: actions/setup-python@master
         with:
           python-version: 3.8
@@ -108,7 +112,7 @@ jobs:
             pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=.github/pytools/espressif.ico tools/$tool.py
           done
       - name: Sign binaries
-        if: matrix.os == 'windows-latest' && env.CERTIFICATE != '' && env.CERTIFICATE_PASSWORD != ''
+        if: matrix.os == 'windows-latest'
         env:
           CERTIFICATE: ${{ secrets.CERTIFICATE }}
           CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}

boards.txt

@@ -21731,12 +21731,25 @@ heltec_wifi_kit_32.build.defines=
 heltec_wifi_kit_32.build.band=LoRaWAN_NONE
 heltec_wifi_kit_32.build.LoRaWanDebugLevel=0
 
-heltec_wifi_kit_32.menu.PSRAM.disabled=Disabled
-heltec_wifi_kit_32.menu.PSRAM.disabled.build.defines=
-heltec_wifi_kit_32.menu.PSRAM.disabled.build.extra_libs=
-heltec_wifi_kit_32.menu.PSRAM.enabled=Enabled
-heltec_wifi_kit_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
-heltec_wifi_kit_32.menu.PSRAM.enabled.build.extra_libs=
+heltec_wifi_kit_32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+heltec_wifi_kit_32.menu.PartitionScheme.default.build.partitions=default
+heltec_wifi_kit_32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+heltec_wifi_kit_32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+heltec_wifi_kit_32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+heltec_wifi_kit_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+heltec_wifi_kit_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+heltec_wifi_kit_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+heltec_wifi_kit_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
+heltec_wifi_kit_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
 
 heltec_wifi_kit_32.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wifi_kit_32.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -21907,14 +21920,34 @@ heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32
 heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32
 
 heltec_wifi_lora_32.build.f_cpu=240000000L
-heltec_wifi_lora_32.build.flash_size=8MB
+heltec_wifi_lora_32.build.flash_size=4MB
 heltec_wifi_lora_32.build.flash_freq=80m
 heltec_wifi_lora_32.build.flash_mode=dio
 heltec_wifi_lora_32.build.boot=qio
-heltec_wifi_lora_32.build.partitions=default_8MB
+heltec_wifi_lora_32.build.partitions=default
 heltec_wifi_lora_32.build.psram=
 heltec_wifi_lora_32.build.defines=-D{build.band} -DMCU_ESP32_D0 -DWIFI_LORA_32 -DHELTEC_BOARD=1 -DRADIO_CHIP_SX127X -DSLOW_CLK_TPYE=0 -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} -DLORAWAN_PREAMBLE_LENGTH={build.LORAWAN_PREAMBLE_LENGTH}  -DLORAWAN_DEVEUI_AUTO={build.LORAWAN_DEVEUI_AUTO}  {build.psram}
 
+heltec_wifi_lora_32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+heltec_wifi_lora_32.menu.PartitionScheme.default.build.partitions=default
+heltec_wifi_lora_32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+heltec_wifi_lora_32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+heltec_wifi_lora_32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+heltec_wifi_lora_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+heltec_wifi_lora_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+heltec_wifi_lora_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+heltec_wifi_lora_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
+heltec_wifi_lora_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+
 heltec_wifi_lora_32.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wifi_lora_32.menu.CPUFreq.240.build.f_cpu=240000000L
 heltec_wifi_lora_32.menu.CPUFreq.160=160MHz (WiFi/BT)
@@ -37110,3 +37143,151 @@ walter.menu.EraseFlash.all=Enabled
 walter.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
+
+elecrow_crowpanel_7.name=Elecrow CrowPanel 7.0P
+elecrow_crowpanel_7.vid.0=0x1a86
+elecrow_crowpanel_7.pid.0=0x7523
+
+elecrow_crowpanel_7.upload.tool=esptool_py
+elecrow_crowpanel_7.upload.tool.default=esptool_py
+elecrow_crowpanel_7.upload.tool.network=esp_ota
+elecrow_crowpanel_7.upload.maximum_size=1310720
+elecrow_crowpanel_7.upload.maximum_data_size=327680
+elecrow_crowpanel_7.upload.wait_for_upload_port=false
+elecrow_crowpanel_7.upload.speed=460800
+elecrow_crowpanel_7.upload.flags=
+elecrow_crowpanel_7.upload.extra_flags=
+
+elecrow_crowpanel_7.bootloader.tool=esptool_py
+elecrow_crowpanel_7.bootloader.tool.default=esptool_py
+
+elecrow_crowpanel_7.serial.disableDTR=true
+elecrow_crowpanel_7.serial.disableRTS=true
+
+elecrow_crowpanel_7.build.tarch=xtensa
+elecrow_crowpanel_7.build.bootloader_addr=0x0
+elecrow_crowpanel_7.build.mcu=esp32s3
+elecrow_crowpanel_7.build.core=esp32
+elecrow_crowpanel_7.build.target=esp32s3
+elecrow_crowpanel_7.build.variant=elecrow_crowpanel_7
+elecrow_crowpanel_7.build.board=ELECROW_CROWPANEL_7
+
+elecrow_crowpanel_7.build.usb_mode=1
+elecrow_crowpanel_7.build.cdc_on_boot=1
+elecrow_crowpanel_7.build.msc_on_boot=0
+elecrow_crowpanel_7.build.dfu_on_boot=0
+
+elecrow_crowpanel_7.build.f_cpu=240000000L
+elecrow_crowpanel_7.build.flash_size=4MB
+elecrow_crowpanel_7.build.flash_freq=80m
+elecrow_crowpanel_7.build.flash_mode=dio
+elecrow_crowpanel_7.build.boot=dio
+elecrow_crowpanel_7.build.partitions=default
+
+elecrow_crowpanel_7.menu.PSRAM.disabled=Disabled
+elecrow_crowpanel_7.menu.PSRAM.disabled.build.defines=
+elecrow_crowpanel_7.menu.PSRAM.enabled=Enabled
+elecrow_crowpanel_7.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+elecrow_crowpanel_7.menu.PSRAM.enabled.build.psram_type=opi
+
+elecrow_crowpanel_7.menu.LoopCore.1=Core 1
+elecrow_crowpanel_7.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+elecrow_crowpanel_7.menu.LoopCore.0=Core 0
+elecrow_crowpanel_7.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+elecrow_crowpanel_7.menu.EventsCore.1=Core 1
+elecrow_crowpanel_7.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+elecrow_crowpanel_7.menu.EventsCore.0=Core 0
+elecrow_crowpanel_7.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+elecrow_crowpanel_7.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.default.build.partitions=default
+elecrow_crowpanel_7.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+elecrow_crowpanel_7.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+elecrow_crowpanel_7.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.minimal.build.partitions=minimal
+elecrow_crowpanel_7.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.no_ota.build.partitions=no_ota
+elecrow_crowpanel_7.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+elecrow_crowpanel_7.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+elecrow_crowpanel_7.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+elecrow_crowpanel_7.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+elecrow_crowpanel_7.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+elecrow_crowpanel_7.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.huge_app.build.partitions=huge_app
+elecrow_crowpanel_7.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+elecrow_crowpanel_7.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+elecrow_crowpanel_7.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+elecrow_crowpanel_7.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+elecrow_crowpanel_7.menu.CPUFreq.240=240MHz (WiFi/BT)
+elecrow_crowpanel_7.menu.CPUFreq.240.build.f_cpu=240000000L
+elecrow_crowpanel_7.menu.CPUFreq.160=160MHz (WiFi/BT)
+elecrow_crowpanel_7.menu.CPUFreq.160.build.f_cpu=160000000L
+elecrow_crowpanel_7.menu.CPUFreq.80=80MHz (WiFi/BT)
+elecrow_crowpanel_7.menu.CPUFreq.80.build.f_cpu=80000000L
+elecrow_crowpanel_7.menu.CPUFreq.40=40MHz (40MHz XTAL)
+elecrow_crowpanel_7.menu.CPUFreq.40.build.f_cpu=40000000L
+elecrow_crowpanel_7.menu.CPUFreq.26=26MHz (26MHz XTAL)
+elecrow_crowpanel_7.menu.CPUFreq.26.build.f_cpu=26000000L
+elecrow_crowpanel_7.menu.CPUFreq.20=20MHz (40MHz XTAL)
+elecrow_crowpanel_7.menu.CPUFreq.20.build.f_cpu=20000000L
+elecrow_crowpanel_7.menu.CPUFreq.13=13MHz (26MHz XTAL)
+elecrow_crowpanel_7.menu.CPUFreq.13.build.f_cpu=13000000L
+elecrow_crowpanel_7.menu.CPUFreq.10=10MHz (40MHz XTAL)
+elecrow_crowpanel_7.menu.CPUFreq.10.build.f_cpu=10000000L
+
+elecrow_crowpanel_7.menu.FlashMode.qio=QIO
+elecrow_crowpanel_7.menu.FlashMode.qio.build.flash_mode=dio
+elecrow_crowpanel_7.menu.FlashMode.qio.build.boot=qio
+elecrow_crowpanel_7.menu.FlashMode.dio=DIO
+elecrow_crowpanel_7.menu.FlashMode.dio.build.flash_mode=dio
+elecrow_crowpanel_7.menu.FlashMode.dio.build.boot=dio
+
+elecrow_crowpanel_7.menu.FlashFreq.80=80MHz
+elecrow_crowpanel_7.menu.FlashFreq.80.build.flash_freq=80m
+elecrow_crowpanel_7.menu.FlashFreq.40=40MHz
+elecrow_crowpanel_7.menu.FlashFreq.40.build.flash_freq=40m
+
+elecrow_crowpanel_7.menu.FlashSize.4MB=4MB (32Mb)
+elecrow_crowpanel_7.menu.FlashSize.4MB.build.flash_size=4MB
+
+elecrow_crowpanel_7.menu.UploadSpeed.921600=921600
+elecrow_crowpanel_7.menu.UploadSpeed.921600.upload.speed=921600
+elecrow_crowpanel_7.menu.UploadSpeed.115200=115200
+elecrow_crowpanel_7.menu.UploadSpeed.115200.upload.speed=115200
+elecrow_crowpanel_7.menu.UploadSpeed.256000.windows=256000
+elecrow_crowpanel_7.menu.UploadSpeed.256000.upload.speed=256000
+elecrow_crowpanel_7.menu.UploadSpeed.230400.windows.upload.speed=256000
+elecrow_crowpanel_7.menu.UploadSpeed.230400=230400
+elecrow_crowpanel_7.menu.UploadSpeed.230400.upload.speed=230400
+elecrow_crowpanel_7.menu.UploadSpeed.460800.linux=460800
+elecrow_crowpanel_7.menu.UploadSpeed.460800.macosx=460800
+elecrow_crowpanel_7.menu.UploadSpeed.460800.upload.speed=460800
+elecrow_crowpanel_7.menu.UploadSpeed.512000.windows=512000
+elecrow_crowpanel_7.menu.UploadSpeed.512000.upload.speed=512000
+
+elecrow_crowpanel_7.menu.DebugLevel.none=None
+elecrow_crowpanel_7.menu.DebugLevel.none.build.code_debug=0
+elecrow_crowpanel_7.menu.DebugLevel.error=Error
+elecrow_crowpanel_7.menu.DebugLevel.error.build.code_debug=1
+elecrow_crowpanel_7.menu.DebugLevel.warn=Warn
+elecrow_crowpanel_7.menu.DebugLevel.warn.build.code_debug=2
+elecrow_crowpanel_7.menu.DebugLevel.info=Info
+elecrow_crowpanel_7.menu.DebugLevel.info.build.code_debug=3
+elecrow_crowpanel_7.menu.DebugLevel.debug=Debug
+elecrow_crowpanel_7.menu.DebugLevel.debug.build.code_debug=4
+elecrow_crowpanel_7.menu.DebugLevel.verbose=Verbose
+elecrow_crowpanel_7.menu.DebugLevel.verbose.build.code_debug=5
+
+elecrow_crowpanel_7.menu.EraseFlash.none=Disabled
+elecrow_crowpanel_7.menu.EraseFlash.none.upload.erase_cmd=
+elecrow_crowpanel_7.menu.EraseFlash.all=Enabled
+elecrow_crowpanel_7.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################

cores/esp32/esp_arduino_version.h

@@ -23,7 +23,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ESP_ARDUINO_VERSION_MINOR 0
 /** Patch version number (x.x.X) */
-#define ESP_ARDUINO_VERSION_PATCH 1
+#define ESP_ARDUINO_VERSION_PATCH 2
 
 /**
  * Macro to convert ARDUINO version number into an integer

docs/en/api/preferences.rst

@@ -524,7 +524,7 @@ Arduino-esp32 Preferences API
 
    .. code-block:: arduino
 
-      uint8_t getUChar(const char* key, uint8_t defaultValue = 0);
+      bool getBool(const char* key, bool defaultValue = false);
 
    ..
 

libraries/BluetoothSerial/src/BluetoothSerial.cpp

@@ -878,7 +878,7 @@ size_t BluetoothSerial::write(const uint8_t *buffer, size_t size) {
 void BluetoothSerial::flush() {
   if (_spp_tx_queue != NULL) {
     while (uxQueueMessagesWaiting(_spp_tx_queue) > 0) {
-      delay(100);
+      delay(2);
     }
   }
 }