Merge remote-tracking branch 'origin/master' into feat/support_rakwireless_rak3112

Author: danielRAKwireless

.github/scripts/package_esptool.sh

@@ -0,0 +1,129 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Check version argument
+if [[ $# -ne 3 ]]; then
+  echo "Usage: $0 <version> <base_folder> <json_path>"
+  echo "Example: $0 5.0.dev1 /tmp/esptool /tmp/esptool-5.0.dev1.json"
+  exit 1
+fi
+
+VERSION=$1
+BASE_FOLDER=$2
+JSON_PATH=$3
+
+export COPYFILE_DISABLE=1
+
+shopt -s nullglob  # So for loop doesn't run if no matches
+
+# Function to update JSON for a given host
+function update_json_for_host {
+  local host=$1
+  local archive=$2
+
+  # Extract the old url from the JSON for this host, then replace only the filename
+  old_url=$(jq -r --arg host "$host" '
+    .packages[].tools[] | select(.name == "esptool_py") | .systems[] | select(.host == $host) | .url // empty
+  ' "$tmp_json")
+  if [[ -n "$old_url" ]]; then
+    base_url="${old_url%/*}"
+    url="$base_url/$archive"
+  else
+    echo "No old url found for $host"
+    exit 1
+  fi
+
+  archiveFileName="$archive"
+  checksum="SHA-256:$(shasum -a 256 "$archive" | awk '{print $1}')"
+  size=$(stat -f%z "$archive")
+
+  # Use jq to update the JSON
+  jq --arg host "$host" \
+     --arg url "$url" \
+     --arg archiveFileName "$archiveFileName" \
+     --arg checksum "$checksum" \
+     --arg size "$size" \
+     '
+     .packages[].tools[]
+     |= if .name == "esptool_py" then
+          .systems = (
+            ((.systems // []) | map(select(.host != $host))) + [{
+              host: $host,
+              url: $url,
+              archiveFileName: $archiveFileName,
+              checksum: $checksum,
+              size: $size
+            }]
+          )
+        else
+          .
+        end
+     ' "$tmp_json" > "$tmp_json.new" && mv "$tmp_json.new" "$tmp_json"
+}
+
+cd "$BASE_FOLDER"
+
+# Delete all archives before starting
+rm -f esptool-*.tar.gz esptool-*.zip
+
+for dir in esptool-*; do
+  # Check if directory exists and is a directory
+  if [[ ! -d "$dir" ]]; then
+    continue
+  fi
+
+  base="${dir#esptool-}"
+
+  # Add 'linux-' prefix if base doesn't contain linux/macos/win64
+  if [[ "$base" != *linux* && "$base" != *macos* && "$base" != *win64* ]]; then
+    base="linux-${base}"
+  fi
+
+  if [[ "$dir" == esptool-win* ]]; then
+    # Windows zip archive
+    zipfile="esptool-v${VERSION}-${base}.zip"
+    echo "Creating $zipfile from $dir ..."
+    zip -r "$zipfile" "$dir"
+  else
+    # Non-Windows: set permissions and tar.gz archive
+    tarfile="esptool-v${VERSION}-${base}.tar.gz"
+    echo "Setting permissions and creating $tarfile from $dir ..."
+    chmod -R u=rwx,g=rx,o=rx "$dir"
+    tar -cvzf "$tarfile" "$dir"
+  fi
+done
+
+# After the for loop, update the JSON for each archive
+# Create a temporary JSON file to accumulate changes
+tmp_json="${JSON_PATH}.tmp"
+cp "$JSON_PATH" "$tmp_json"
+
+for archive in esptool-v"${VERSION}"-*.tar.gz esptool-v"${VERSION}"-*.zip; do
+  [ -f "$archive" ] || continue
+
+  echo "Updating JSON for $archive"
+
+  # Determine host from archive name
+  case "$archive" in
+    *linux-amd64*)   host="x86_64-pc-linux-gnu" ;;
+    *linux-armv7*)   host="arm-linux-gnueabihf" ;;
+    *linux-aarch64*) host="aarch64-linux-gnu" ;;
+    *macos-amd64*)   host="x86_64-apple-darwin" ;;
+    *macos-arm64*)   host="arm64-apple-darwin" ;;
+    *win64*)         hosts=("x86_64-mingw32" "i686-mingw32") ;;
+    *) echo "Unknown host for $archive"; continue ;;
+  esac
+
+  # For win64, loop over both hosts; otherwise, use a single host
+  if [[ "$archive" == *win64* ]]; then
+    for host in "${hosts[@]}"; do
+      update_json_for_host "$host" "$archive"
+    done
+  else
+    update_json_for_host "$host" "$archive"
+  fi
+done
+
+# After all archives are processed, move the temporary JSON to the final file
+mv "$tmp_json" "$JSON_PATH"

.github/workflows/lib.json

@@ -9,7 +9,8 @@
     {
         "name": "ArduinoBLE",
         "exclude_targets": [
-            "esp32s2"
+            "esp32s2",
+            "esp32p4"
         ],
         "sketch_path": [
             "~/Arduino/libraries/ArduinoBLE/examples/Central/Scan/Scan.ino"

.github/workflows/publishsizes.yml

@@ -66,7 +66,7 @@ jobs:
           path: ./artifacts/sizes-report/pr_num.txt
 
       - name: Report results
-        uses: P-R-O-C-H-Y/report-size-deltas@2043188c68f483a7b50527c4eacf609d05bb67a5 # sizes_v2
+        uses: P-R-O-C-H-Y/report-size-deltas@bea91d2c99ca80c88a883b39b1c4012f00ec3d09 # sizes_v2
         with:
           sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
           github-token: ${{ env.GITHUB_TOKEN }}

CMakeLists.txt

@@ -165,6 +165,7 @@ set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
 set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
 
 set(ARDUINO_LIBRARY_OpenThread_SRCS
+  libraries/OpenThread/src/OThread.cpp
   libraries/OpenThread/src/OThreadCLI.cpp
   libraries/OpenThread/src/OThreadCLI_Util.cpp)
 

boards.txt

@@ -36051,12 +36051,12 @@ XIAO_ESP32S3_Plus.build.cdc_on_boot=1
 XIAO_ESP32S3_Plus.build.msc_on_boot=0
 XIAO_ESP32S3_Plus.build.dfu_on_boot=0
 XIAO_ESP32S3_Plus.build.f_cpu=240000000L
-XIAO_ESP32S3_Plus.build.flash_size=8MB
+XIAO_ESP32S3_Plus.build.flash_size=16MB
 XIAO_ESP32S3_Plus.build.flash_freq=80m
 XIAO_ESP32S3_Plus.build.flash_mode=dio
 XIAO_ESP32S3_Plus.build.boot=qio
 XIAO_ESP32S3_Plus.build.boot_freq=80m
-XIAO_ESP32S3_Plus.build.partitions=default_8MB
+XIAO_ESP32S3_Plus.build.partitions=ffat
 XIAO_ESP32S3_Plus.build.defines=
 XIAO_ESP32S3_Plus.build.loop_core=
 XIAO_ESP32S3_Plus.build.event_core=
@@ -36093,8 +36093,6 @@ XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.boot=dio
 XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.boot_freq=80m
 XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.flash_freq=80m
 
-XIAO_ESP32S3_Plus.menu.FlashSize.8M=8MB (64Mb)
-XIAO_ESP32S3_Plus.menu.FlashSize.8M.build.flash_size=8MB
 XIAO_ESP32S3_Plus.menu.FlashSize.16M=16MB (128Mb)
 XIAO_ESP32S3_Plus.menu.FlashSize.16M.build.flash_size=16MB
 
@@ -50707,4 +50705,60 @@ rakwireless_rak3112.menu.EraseFlash.none.upload.erase_cmd=
 rakwireless_rak3112.menu.EraseFlash.all=Enabled
 rakwireless_rak3112.menu.EraseFlash.all.upload.erase_cmd=-e
 
-##############################################################
+##############################################################
+kodedot.name=kode dot
+
+kodedot.bootloader.tool=esptool_py
+kodedot.bootloader.tool.default=esptool_py
+
+kodedot.upload.tool=esptool_py_app_only
+kodedot.upload.tool.default=esptool_py_app_only
+kodedot.upload.tool.network=esp_ota
+
+kodedot.upload.maximum_size=8388608
+kodedot.upload.maximum_data_size=327680
+kodedot.upload.flags=
+kodedot.upload.extra_flags=
+kodedot.upload.use_1200bps_touch=false
+kodedot.upload.wait_for_upload_port=false
+kodedot.upload.speed=921600
+
+kodedot.upload.erase_cmd=
+
+kodedot.serial.disableDTR=false
+kodedot.serial.disableRTS=false
+
+kodedot.build.tarch=xtensa
+kodedot.build.bootloader_addr=0x0
+kodedot.build.target=esp32s3
+kodedot.build.mcu=esp32s3
+kodedot.build.core=esp32
+kodedot.build.variant=kodedot
+kodedot.build.board=KODE_DOT
+
+kodedot.build.usb_mode=1
+kodedot.build.cdc_on_boot=1
+kodedot.build.msc_on_boot=0
+kodedot.build.dfu_on_boot=0
+
+kodedot.build.f_cpu=240000000L
+
+kodedot.build.flash_offset=0x400000
+kodedot.build.flash_size=16MB
+kodedot.build.flash_freq=80m
+kodedot.build.flash_mode=dio
+
+kodedot.build.custom_partitions=kodedot_partitions
+
+kodedot.build.psram_type=qspi
+kodedot.build.defines=
+
+kodedot.build.loop_core=-DARDUINO_RUNNING_CORE=1
+kodedot.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+
+kodedot.recipe.hooks.objcopy.postobjcopy.3.pattern=
+kodedot.recipe.hooks.objcopy.postobjcopy.3.pattern_args=
+
+kodedot.recipe.output.save_file={build.project_name}.ino.bin
+
+##############################################################

cores/esp32/WString.cpp

@@ -180,15 +180,15 @@ bool String::changeBuffer(unsigned int maxStrLen) {
   if (maxStrLen < sizeof(sso.buff) - 1) {
     if (isSSO() || !buffer()) {
       // Already using SSO, nothing to do
-      uint16_t oldLen = len();
+      size_t oldLen = len();
       setSSO(true);
       setLen(oldLen);
     } else {  // if bufptr && !isSSO()
       // Using bufptr, need to shrink into sso.buff
       char temp[sizeof(sso.buff)];
       memcpy(temp, buffer(), maxStrLen);
       free(wbuffer());
-      uint16_t oldLen = len();
+      size_t oldLen = len();
       setSSO(true);
       memcpy(wbuffer(), temp, maxStrLen);
       setLen(oldLen);
@@ -201,7 +201,7 @@ bool String::changeBuffer(unsigned int maxStrLen) {
   if (newSize > CAPACITY_MAX) {
     return false;
   }
-  uint16_t oldLen = len();
+  size_t oldLen = len();
   char *newbuffer = (char *)realloc(isSSO() ? nullptr : wbuffer(), newSize);
   if (newbuffer) {
     size_t oldSize = capacity() + 1;  // include NULL.