Merge branch 'espressif:master' into master

Author: DogushC

.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"

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
 

cores/esp32/esp32-hal-spi.h

@@ -38,8 +38,8 @@ extern "C" {
 #define HSPI 2  //SPI 2 bus normally mapped to pins 12 - 15, but can be matrixed to any pins
 #define VSPI 3  //SPI 3 bus normally attached to pins 5, 18, 19 and 23, but can be matrixed to any pins
 #else
-#define FSPI 0
-#define HSPI 1
+#define FSPI 0  // ESP32C2, C3, C6, H2, S3, P4 - SPI 2 bus
+#define HSPI 1  // ESP32S3, P4 - SPI 3 bus
 #endif
 
 // This defines are not representing the real Divider of the ESP32

docs/en/guides/core_compatibility.rst

@@ -9,28 +9,28 @@ Welcome to the compatibility guide for library developers aiming to support mult
 Code Adaptations
 ----------------
 
-To ensure compatibility with both versions of the ESP32 Arduino core, developers should utilize conditional compilation directives in their code. Below is an example of how to conditionally include code based on the ESP32 Arduino core version::
+To ensure compatibility with both versions of the ESP32 Arduino core, developers should utilize conditional compilation directives in their code. Below is an example of how to conditionally include code based on the ESP32 Arduino core version:
 
-    .. code-block:: cpp
+.. code-block:: cpp
 
-      #ifdef ESP_ARDUINO_VERSION_MAJOR
-      #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-          // Code for version 3.x
-      #else
-          // Code for version 2.x
-      #endif
-      #else
-          // Code for version 1.x
-      #endif
+   #ifdef ESP_ARDUINO_VERSION_MAJOR
+   #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+       // Code for version 3.x
+   #else
+       // Code for version 2.x
+   #endif
+   #else
+       // Code for version 1.x
+   #endif
 
 Version Print
 -------------
 
-To easily print the ESP32 Arduino core version at runtime, developers can use the `ESP_ARDUINO_VERSION_STR` macro. Below is an example of how to print the ESP32 Arduino core version::
+To easily print the ESP32 Arduino core version at runtime, developers can use the `ESP_ARDUINO_VERSION_STR` macro. Below is an example of how to print the ESP32 Arduino core version:
 
-    .. code-block:: cpp
+.. code-block:: cpp
 
-      Serial.printf(" ESP32 Arduino core version: %s\n", ESP_ARDUINO_VERSION_STR);
+   Serial.printf(" ESP32 Arduino core version: %s\n", ESP_ARDUINO_VERSION_STR);
 
 API Differences
 ---------------

libraries/DNSServer/src/DNSServer.cpp

@@ -111,16 +111,22 @@ void DNSServer::_handleUDP(AsyncUDPPacket &pkt) {
   // will reply with IP only to "*" or if domain matches without www. subdomain
   if (dnsHeader.OPCode == DNS_OPCODE_QUERY && requestIncludesOnlyOneQuestion(dnsHeader)
       && (_domainName.isEmpty() || getDomainNameWithoutWwwPrefix(static_cast<const unsigned char *>(dnsQuestion.QName), dnsQuestion.QNameLength) == _domainName)) {
-    replyWithIP(pkt, dnsHeader, dnsQuestion);
+
+    // Qtype = A (1) or ANY (255): send an A record otherwise an empty response
+    if (ntohs(dnsQuestion.QType) == 1 || ntohs(dnsQuestion.QType) == 255) {
+      replyWithIP(pkt, dnsHeader, dnsQuestion);
+    } else {
+      replyWithNoAnsw(pkt, dnsHeader, dnsQuestion);
+    }
     return;
   }
-
   // otherwise reply with custom code
   replyWithCustomCode(pkt, dnsHeader);
 }
 
 bool DNSServer::requestIncludesOnlyOneQuestion(DNSHeader &dnsHeader) {
-  return ntohs(dnsHeader.QDCount) == 1 && dnsHeader.ANCount == 0 && dnsHeader.NSCount == 0 && dnsHeader.ARCount == 0;
+  dnsHeader.ARCount = 0;  // We assume that if ARCount !=0 there is a EDNS OPT packet, just ignore
+  return ntohs(dnsHeader.QDCount) == 1 && dnsHeader.ANCount == 0 && dnsHeader.NSCount == 0;
 }
 
 String DNSServer::getDomainNameWithoutWwwPrefix(const unsigned char *start, size_t len) {
@@ -139,7 +145,6 @@ String DNSServer::getDomainNameWithoutWwwPrefix(const unsigned char *start, size
 
 void DNSServer::replyWithIP(AsyncUDPPacket &req, DNSHeader &dnsHeader, DNSQuestion &dnsQuestion) {
   AsyncUDPMessage rpl;
-
   // Change the type of message to a response and set the number of answers equal to
   // the number of questions in the header
   dnsHeader.QR = DNS_QR_RESPONSE;
@@ -187,3 +192,76 @@ void DNSServer::replyWithCustomCode(AsyncUDPPacket &req, DNSHeader &dnsHeader) {
   rpl.write(reinterpret_cast<const uint8_t *>(&dnsHeader), sizeof(DNSHeader));
   _udp.sendTo(rpl, req.remoteIP(), req.remotePort());
 }
+
+void DNSServer::replyWithNoAnsw(AsyncUDPPacket &req, DNSHeader &dnsHeader, DNSQuestion &dnsQuestion) {
+
+  dnsHeader.QR = DNS_QR_RESPONSE;
+  dnsHeader.ANCount = 0;
+  dnsHeader.NSCount = htons(1);
+
+  AsyncUDPMessage rpl;
+  rpl.write(reinterpret_cast<const uint8_t *>(&dnsHeader), sizeof(DNSHeader));
+
+  // Write the question
+  rpl.write(dnsQuestion.QName, dnsQuestion.QNameLength);
+  rpl.write((uint8_t *)&dnsQuestion.QType, 2);
+  rpl.write((uint8_t *)&dnsQuestion.QClass, 2);
+
+  // An empty answer contains an authority section with a SOA,
+  // We take the name of the query as the root of the zone for which the SOA is generated
+  // and use a value of DNS_MINIMAL_TTL seconds  in order to minimize negative caching
+  // Write the authority section:
+  // The SOA RR's ownername is set equal to the query name, and we use made up names for
+  // the MNAME and  RNAME - it doesn't really matter from a protocol perspective - as for
+  // a no such QTYPE answer only the timing fields are used.
+  // a protocol perspective - it
+  // Use DNS name compression : instead of repeating the name in this RNAME occurrence,
+  // set the two MSB of the byte corresponding normally to the length to 1. The following
+  // 14 bits must be used to specify the offset of the domain name in the message
+  // (<255 here so the first byte has the 6 LSB at 0)
+  rpl.write((uint8_t)0xC0);
+  rpl.write((uint8_t)DNS_OFFSET_DOMAIN_NAME);
+
+  // DNS type A : host address, DNS class IN for INternet, returning an IPv4 address
+  uint16_t answerType = htons(DNS_TYPE_SOA), answerClass = htons(DNS_CLASS_IN);
+  uint32_t Serial = htonl(DNS_SOA_SERIAL);    // Date type serial based on the date this piece of code was written
+  uint32_t Refresh = htonl(DNS_SOA_REFRESH);  // These timers don't matter, we don't serve zone transfers
+  uint32_t Retry = htonl(DNS_SOA_RETRY);
+  uint32_t Expire = htonl(DNS_SOA_EXPIRE);
+  uint32_t MinTTL = htonl(DNS_MINIMAL_TTL);  // See RFC2308 section 5
+  char MLabel[] = DNS_SOA_MNAME_LABEL;
+  char RLabel[] = DNS_SOA_RNAME_LABEL;
+  char PostFixLabel[] = DNS_SOA_POSTFIX_LABEL;
+
+  // 4 accounts for len fields and  for both rname
+  // and lname and their postfix labels and there are 5 32 bit fields
+
+  uint16_t RdataLength = htons((uint16_t)(strlen(MLabel) + strlen(RLabel) + 2 * strlen(PostFixLabel) + 4 + 5 * sizeof(Serial)));
+
+  rpl.write((unsigned char *)&answerType, 2);
+  rpl.write((unsigned char *)&answerClass, 2);
+  rpl.write((unsigned char *)&MinTTL, 4);  // DNS Time To Live
+
+  rpl.write((unsigned char *)&RdataLength, 2);
+
+  rpl.write((uint8_t)strlen(MLabel));
+  rpl.write((unsigned char *)&MLabel, strlen(MLabel));
+
+  rpl.write((unsigned char *)&PostFixLabel, strlen(PostFixLabel));
+  rpl.write((uint8_t)0);
+  //  rpl.write((uint8_t)0xC0);
+  //  rpl.write((uint8_t)DNS_OFFSET_DOMAIN_NAME);
+
+  rpl.write((uint8_t)strlen(RLabel));
+  rpl.write((unsigned char *)&RLabel, strlen(RLabel));
+  rpl.write((unsigned char *)&PostFixLabel, strlen(PostFixLabel));
+  rpl.write((uint8_t)0);
+
+  rpl.write((unsigned char *)&Serial, 4);
+  rpl.write((unsigned char *)&Refresh, 4);
+  rpl.write((unsigned char *)&Retry, 4);
+  rpl.write((unsigned char *)&Expire, 4);
+  rpl.write((unsigned char *)&MinTTL, 4);
+
+  _udp.sendTo(rpl, req.remoteIP(), req.remotePort());
+}

libraries/DNSServer/src/DNSServer.h

@@ -9,6 +9,26 @@
 #define DNS_OFFSET_DOMAIN_NAME DNS_HEADER_SIZE  // Offset in bytes to reach the domain name labels in the DNS message
 #define DNS_DEFAULT_PORT       53
 
+#define DNS_SOA_MNAME_LABEL "ns"
+#define DNS_SOA_RNAME_LABEL "esp32"
+// The POSTFIX_LABEL will be concatenated to the RName and MName Label  label
+// do not use a multilabel name here. "local" is a good choice as it is reserved for
+// local use by IANA
+// The postfix label is defined as an array of characters that follows the
+// definition of RFC1035 3.1
+// for instance, a postfix of  example.com would be defined as:
+// #define DNS_SOA_POSTFIX_LABEL {'\7', 'e', 'x', 'a', 'm', 'p', 'l', 'e', '\3', 'c', 'o', 'm', '\0'}
+#define DNS_SOA_POSTFIX_LABEL \
+  { '\5', 'l', 'o', 'c', 'a', 'l', '\0' }
+// From the following values only the MINIMAL_TTL has relevance
+// in the context of client-server protocol interactions.
+// The other values are arbitrary chosen as they are only relevant for
+// in a zone-transfer scenario.
+#define DNS_SOA_SERIAL  2025052900  // Arbitrary serial (format: YYYYMMDDnn)
+#define DNS_SOA_REFRESH 100000      // Arbitrary (seconds)
+#define DNS_SOA_RETRY   10000       // Arbitrary (seconds)
+#define DNS_SOA_EXPIRE  1000000     // Arbitrary (seconds)
+#define DNS_MINIMAL_TTL 5           // Time to live for negative answers RFC2308
 enum class DNSReplyCode : uint16_t {
   NoError = 0,
   FormError = 1,
@@ -179,5 +199,7 @@ class DNSServer {
   inline bool requestIncludesOnlyOneQuestion(DNSHeader &dnsHeader);
   void replyWithIP(AsyncUDPPacket &req, DNSHeader &dnsHeader, DNSQuestion &dnsQuestion);
   inline void replyWithCustomCode(AsyncUDPPacket &req, DNSHeader &dnsHeader);
+  inline void replyWithNoAnsw(AsyncUDPPacket &req, DNSHeader &dnsHeader, DNSQuestion &dnsQuestion);
+
   void _handleUDP(AsyncUDPPacket &pkt);
 };

libraries/OpenThread/src/OThread.cpp

@@ -335,6 +335,8 @@ void OpenThread::otPrintNetworkInformation(Stream &output) {
 
   output.printf("Role: %s", otGetStringDeviceRole());
   output.println();
+  output.printf("RLOC16: 0x%04x", otThreadGetRloc16(mInstance));  // RLOC16
+  output.println();
   output.printf("Network Name: %s", otThreadGetNetworkName(mInstance));
   output.println();
   output.printf("Channel: %d", otLinkGetChannel(mInstance));

libraries/SPI/src/SPI.cpp

@@ -63,9 +63,9 @@ SPIClass::~SPIClass() {
 #endif
 }
 
-void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) {
+bool SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) {
   if (_spi) {
-    return;
+    return true;
   }
 
   if (!_div) {
@@ -74,7 +74,7 @@ void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) {
 
   _spi = spiStartBus(_spi_num, _div, SPI_MODE0, SPI_MSBFIRST);
   if (!_spi) {
-    return;
+    return false;
   }
 
   if (sck == -1 && miso == -1 && mosi == -1 && ss == -1) {
@@ -110,10 +110,11 @@ void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) {
   if (_mosi >= 0 && !spiAttachMOSI(_spi, _mosi)) {
     goto err;
   }
-  return;
+  return true;
 
 err:
   log_e("Attaching pins to SPI failed.");
+  return false;
 }
 
 void SPIClass::end() {