Merge branch 'master' into feat/hosted_ota

Author: me-no-dev

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -43,6 +43,7 @@ body:
         - latest stable Release (if not listed below)
         - latest development Release Candidate (RC-X)
         - latest master (checkout manually)
+        - v3.3.3
         - v3.3.2
         - v3.3.1
         - v3.3.0

.github/scripts/on-release.sh

@@ -391,6 +391,11 @@ pushd "$OUTPUT_DIR" >/dev/null
 tar -cJf "$LIBS_XZ" "esp32-arduino-libs"
 popd >/dev/null
 
+# Copy esp-hosted binaries
+
+mkdir -p "$GITHUB_WORKSPACE/hosted"
+cp "$OUTPUT_DIR/esp32-arduino-libs/hosted"/*.bin "$GITHUB_WORKSPACE/hosted/"
+
 # Upload ZIP and XZ libs to release page
 
 echo "Uploading ZIP libs to release page ..."

.github/scripts/sketch_utils.sh

@@ -156,7 +156,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
             esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
             esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
             esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
-            esp32c5_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
+            esp32c5_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
 
             # Select the common part of the FQBN based on the target.  The rest will be
             # appended depending on the passed options.

.github/workflows/release.yml

@@ -36,3 +36,45 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.TOOLS_UPLOAD_PAT }}
         run: bash ./.github/scripts/on-release.sh
+
+      - name: Upload hosted binaries
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: hosted
+          if-no-files-found: ignore
+          path: ${{ github.workspace }}/hosted
+
+  upload-hosted-binaries:
+    name: Upload hosted binaries
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout gh-pages branch
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: gh-pages
+
+      - name: Download hosted binaries
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        with:
+          name: hosted
+          path: ${{ github.workspace }}/hosted-latest
+
+      - name: Copy hosted binaries to proper directory and commit
+        env:
+          GITHUB_TOKEN: ${{ secrets.TOOLS_UPLOAD_PAT }}
+        run: |
+          # Create hosted directory if it doesn't exist
+          mkdir -p ${{ github.workspace }}/hosted
+
+          # Copy hosted binaries to proper directory without overwriting existing files
+          cp -n ${{ github.workspace }}/hosted-latest/*.bin ${{ github.workspace }}/hosted/
+
+          # Commit the changes
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add hosted/*.bin
+          if ! git diff --cached --quiet; then
+            git commit -m "Add new esp-hosted slave binaries"
+            git push origin HEAD:gh-pages
+          fi

.gitlab/workflows/common.yml

@@ -13,7 +13,7 @@ stages:
 
 variables:
   ESP_IDF_VERSION: "5.5"
-  ESP_ARDUINO_VERSION: "3.3.2"
+  ESP_ARDUINO_VERSION: "3.3.3"
 
 #############
 # `default` #

boards.txt

@@ -52955,3 +52955,149 @@ soldered_nula_mini_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_
 soldered_nula_mini_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api.zczr -lzboss_stack.zczr -lzboss_port.native
 
 ##############################################################
+
+arduino_nesso_n1.name=Arduino Nesso N1
+
+arduino_nesso_n1.bootloader.tool=esptool_py
+arduino_nesso_n1.bootloader.tool.default=esptool_py
+
+arduino_nesso_n1.upload.tool=esptool_py
+arduino_nesso_n1.upload.tool.default=esptool_py
+arduino_nesso_n1.upload.tool.network=esp_ota
+
+arduino_nesso_n1.upload.maximum_size=1310720
+arduino_nesso_n1.upload.maximum_data_size=327680
+arduino_nesso_n1.upload.flags=
+arduino_nesso_n1.upload.extra_flags=
+arduino_nesso_n1.upload.use_1200bps_touch=false
+arduino_nesso_n1.upload.wait_for_upload_port=false
+
+arduino_nesso_n1.serial.disableDTR=false
+arduino_nesso_n1.serial.disableRTS=false
+
+arduino_nesso_n1.build.tarch=riscv32
+arduino_nesso_n1.build.target=esp
+arduino_nesso_n1.build.mcu=esp32c6
+arduino_nesso_n1.build.core=esp32
+arduino_nesso_n1.build.variant=arduino_nesso_n1
+arduino_nesso_n1.build.board=ARDUINO_NESSO_N1
+arduino_nesso_n1.build.bootloader_addr=0x0
+
+arduino_nesso_n1.build.cdc_on_boot=1
+arduino_nesso_n1.build.f_cpu=160000000L
+arduino_nesso_n1.build.flash_size=16MB
+arduino_nesso_n1.build.flash_freq=80m
+arduino_nesso_n1.build.flash_mode=qio
+arduino_nesso_n1.build.boot=qio
+arduino_nesso_n1.build.partitions=default
+arduino_nesso_n1.build.defines=
+
+## IDE 2.0 Seems to not update the value
+arduino_nesso_n1.menu.JTAGAdapter.default=Disabled
+arduino_nesso_n1.menu.JTAGAdapter.default.build.copy_jtag_files=0
+arduino_nesso_n1.menu.JTAGAdapter.builtin=Integrated USB JTAG
+arduino_nesso_n1.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
+arduino_nesso_n1.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+arduino_nesso_n1.menu.JTAGAdapter.external=FTDI Adapter
+arduino_nesso_n1.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
+arduino_nesso_n1.menu.JTAGAdapter.external.build.copy_jtag_files=1
+arduino_nesso_n1.menu.JTAGAdapter.bridge=ESP USB Bridge
+arduino_nesso_n1.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
+arduino_nesso_n1.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+arduino_nesso_n1.menu.CDCOnBoot.default=Enabled
+arduino_nesso_n1.menu.CDCOnBoot.default.build.cdc_on_boot=1
+arduino_nesso_n1.menu.CDCOnBoot.cdc=Disabled
+arduino_nesso_n1.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+arduino_nesso_n1.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+arduino_nesso_n1.menu.PartitionScheme.default.build.partitions=default
+arduino_nesso_n1.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+arduino_nesso_n1.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+arduino_nesso_n1.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+arduino_nesso_n1.menu.PartitionScheme.no_ota.build.partitions=no_ota
+arduino_nesso_n1.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+arduino_nesso_n1.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+arduino_nesso_n1.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+arduino_nesso_n1.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+arduino_nesso_n1.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+arduino_nesso_n1.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+arduino_nesso_n1.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+arduino_nesso_n1.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+arduino_nesso_n1.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+arduino_nesso_n1.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+arduino_nesso_n1.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+arduino_nesso_n1.menu.PartitionScheme.huge_app.build.partitions=huge_app
+arduino_nesso_n1.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+arduino_nesso_n1.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+arduino_nesso_n1.menu.PartitionScheme.zigbee.build.partitions=zigbee
+arduino_nesso_n1.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+
+arduino_nesso_n1.menu.CPUFreq.160=160MHz (WiFi)
+arduino_nesso_n1.menu.CPUFreq.160.build.f_cpu=160000000L
+arduino_nesso_n1.menu.CPUFreq.80=80MHz (WiFi)
+arduino_nesso_n1.menu.CPUFreq.80.build.f_cpu=80000000L
+arduino_nesso_n1.menu.CPUFreq.40=40MHz
+arduino_nesso_n1.menu.CPUFreq.40.build.f_cpu=40000000L
+arduino_nesso_n1.menu.CPUFreq.20=20MHz
+arduino_nesso_n1.menu.CPUFreq.20.build.f_cpu=20000000L
+arduino_nesso_n1.menu.CPUFreq.10=10MHz
+arduino_nesso_n1.menu.CPUFreq.10.build.f_cpu=10000000L
+
+arduino_nesso_n1.menu.FlashMode.qio=QIO
+arduino_nesso_n1.menu.FlashMode.qio.build.flash_mode=dio
+arduino_nesso_n1.menu.FlashMode.qio.build.boot=qio
+arduino_nesso_n1.menu.FlashMode.dio=DIO
+arduino_nesso_n1.menu.FlashMode.dio.build.flash_mode=dio
+arduino_nesso_n1.menu.FlashMode.dio.build.boot=dio
+
+arduino_nesso_n1.menu.UploadSpeed.921600=921600
+arduino_nesso_n1.menu.UploadSpeed.921600.upload.speed=921600
+arduino_nesso_n1.menu.UploadSpeed.115200=115200
+arduino_nesso_n1.menu.UploadSpeed.115200.upload.speed=115200
+arduino_nesso_n1.menu.UploadSpeed.256000.windows=256000
+arduino_nesso_n1.menu.UploadSpeed.256000.upload.speed=256000
+arduino_nesso_n1.menu.UploadSpeed.230400.windows.upload.speed=256000
+arduino_nesso_n1.menu.UploadSpeed.230400=230400
+arduino_nesso_n1.menu.UploadSpeed.230400.upload.speed=230400
+arduino_nesso_n1.menu.UploadSpeed.460800.linux=460800
+arduino_nesso_n1.menu.UploadSpeed.460800.macosx=460800
+arduino_nesso_n1.menu.UploadSpeed.460800.upload.speed=460800
+arduino_nesso_n1.menu.UploadSpeed.512000.windows=512000
+arduino_nesso_n1.menu.UploadSpeed.512000.upload.speed=512000
+
+arduino_nesso_n1.menu.DebugLevel.none=None
+arduino_nesso_n1.menu.DebugLevel.none.build.code_debug=0
+arduino_nesso_n1.menu.DebugLevel.error=Error
+arduino_nesso_n1.menu.DebugLevel.error.build.code_debug=1
+arduino_nesso_n1.menu.DebugLevel.warn=Warn
+arduino_nesso_n1.menu.DebugLevel.warn.build.code_debug=2
+arduino_nesso_n1.menu.DebugLevel.info=Info
+arduino_nesso_n1.menu.DebugLevel.info.build.code_debug=3
+arduino_nesso_n1.menu.DebugLevel.debug=Debug
+arduino_nesso_n1.menu.DebugLevel.debug.build.code_debug=4
+arduino_nesso_n1.menu.DebugLevel.verbose=Verbose
+arduino_nesso_n1.menu.DebugLevel.verbose.build.code_debug=5
+
+arduino_nesso_n1.menu.EraseFlash.none=Disabled
+arduino_nesso_n1.menu.EraseFlash.none.upload.erase_cmd=
+arduino_nesso_n1.menu.EraseFlash.all=Enabled
+arduino_nesso_n1.menu.EraseFlash.all.upload.erase_cmd=-e
+
+arduino_nesso_n1.menu.ZigbeeMode.default=Disabled
+arduino_nesso_n1.menu.ZigbeeMode.default.build.zigbee_mode=
+arduino_nesso_n1.menu.ZigbeeMode.default.build.zigbee_libs=
+arduino_nesso_n1.menu.ZigbeeMode.ed=Zigbee ED (end device)
+arduino_nesso_n1.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+arduino_nesso_n1.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api.ed -lzboss_stack.ed -lzboss_port.native
+arduino_nesso_n1.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
+arduino_nesso_n1.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+arduino_nesso_n1.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api.zczr -lzboss_stack.zczr -lzboss_port.native
+
+##############################################################

cores/esp32/HardwareSerial.cpp

@@ -572,8 +572,20 @@ HardwareSerial::operator bool() const {
   return uartIsDriverInstalled(_uart);
 }
 
-void HardwareSerial::setRxInvert(bool invert) {
-  uartSetRxInvert(_uart, invert);
+bool HardwareSerial::setRxInvert(bool invert) {
+  return uartSetRxInvert(_uart, invert);
+}
+
+bool HardwareSerial::setTxInvert(bool invert) {
+  return uartSetTxInvert(_uart, invert);
+}
+
+bool HardwareSerial::setCtsInvert(bool invert) {
+  return uartSetCtsInvert(_uart, invert);
+}
+
+bool HardwareSerial::setRtsInvert(bool invert) {
+  return uartSetRtsInvert(_uart, invert);
 }
 
 // negative Pin value will keep it unmodified

cores/esp32/HardwareSerial.h

@@ -356,7 +356,12 @@ class HardwareSerial : public Stream {
 
   void setDebugOutput(bool);
 
-  void setRxInvert(bool);
+  // functions used to enable or disable UART pins signal inversion
+  // returns the requested operation success status
+  bool setRxInvert(bool);
+  bool setTxInvert(bool);
+  bool setCtsInvert(bool);
+  bool setRtsInvert(bool);
 
   // Negative Pin Number will keep it unmodified, thus this function can set individual pins
   // setPins() can be called after or before begin()

cores/esp32/esp32-hal-tinyusb.c

@@ -477,6 +477,25 @@ __attribute__((weak)) uint16_t tud_network_xmit_cb(uint8_t *dst, void *ref, uint
 __attribute__((weak)) void tud_network_init_cb(void) {}
 #endif
 
+#if CFG_TUH_HID
+__attribute__((weak)) void tuh_hid_mount_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report_desc, uint16_t desc_len) {}
+__attribute__((weak)) void tuh_hid_umount_cb(uint8_t dev_addr, uint8_t idx) {}
+__attribute__((weak)) void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report, uint16_t len) {}
+__attribute__((weak)) void tuh_hid_report_sent_cb(uint8_t dev_addr, uint8_t idx, uint8_t const *report, uint16_t len) {}
+__attribute__((weak)) void tuh_hid_get_report_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t report_id, uint8_t report_type, uint16_t len) {}
+__attribute__((weak)) void tuh_hid_set_report_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t report_id, uint8_t report_type, uint16_t len) {}
+__attribute__((weak)) void tuh_hid_set_protocol_complete_cb(uint8_t dev_addr, uint8_t idx, uint8_t protocol) {}
+#endif
+#if CFG_TUH_CDC
+__attribute__((weak)) void tuh_cdc_mount_cb(uint8_t idx) {}
+__attribute__((weak)) void tuh_cdc_umount_cb(uint8_t idx) {}
+__attribute__((weak)) void tuh_cdc_rx_cb(uint8_t idx) {}
+__attribute__((weak)) void tuh_cdc_tx_complete_cb(uint8_t idx) {}
+#endif
+#if CFG_TUH_MSC
+__attribute__((weak)) void tuh_msc_mount_cb(uint8_t dev_addr) {}
+__attribute__((weak)) void tuh_msc_umount_cb(uint8_t dev_addr) {}
+#endif
 /*
  * Private API
  * */

cores/esp32/esp32-hal-touch-ng.c

@@ -117,8 +117,12 @@ bool touchDisable() {
   if (!enabled) {  // Already disabled
     return true;
   }
-  if (!running && (touch_sensor_disable(touch_sensor_handle) != ESP_OK)) {
-    log_e("Touch sensor still running or disable failed!");
+  if (running) {
+    log_e("Touch sensor still running!");
+    return false;
+  }
+  if (touch_sensor_disable(touch_sensor_handle) != ESP_OK) {
+    log_e("Touch sensor disable failed!");
     return false;
   }
   enabled = false;
@@ -129,8 +133,12 @@ bool touchStart() {
   if (running) {  // Already running
     return true;
   }
-  if (enabled && (touch_sensor_start_continuous_scanning(touch_sensor_handle) != ESP_OK)) {
-    log_e("Touch sensor not enabled or failed to start continuous scanning failed!");
+  if (!enabled) {
+    log_e("Touch sensor not enabled!");
+    return false;
+  }
+  if (touch_sensor_start_continuous_scanning(touch_sensor_handle) != ESP_OK) {
+    log_e("Touch sensor failed to start continuous scanning!");
     return false;
   }
   running = true;
@@ -395,7 +403,7 @@ static void __touchConfigInterrupt(uint8_t pin, void (*userFunc)(void), void *Ar
       return;
     }
 
-    touch_channel_config_t chan_cfg = {};
+    touch_channel_config_t chan_cfg = TOUCH_CHANNEL_DEFAULT_CONFIG();
     for (int i = 0; i < _sample_num; i++) {
 #if SOC_TOUCH_SENSOR_VERSION == 1  // ESP32
       chan_cfg.abs_active_thresh[i] = threshold;
@@ -416,17 +424,17 @@ static void __touchConfigInterrupt(uint8_t pin, void (*userFunc)(void), void *Ar
 
 // it keeps backwards compatibility
 static void __touchAttachInterrupt(uint8_t pin, void (*userFunc)(void), touch_value_t threshold) {
-  __touchConfigInterrupt(pin, userFunc, NULL, threshold, false);
+  __touchConfigInterrupt(pin, userFunc, NULL, false, threshold);
 }
 
 // new additional version of the API with User Args
 static void __touchAttachArgsInterrupt(uint8_t pin, void (*userFunc)(void), void *args, touch_value_t threshold) {
-  __touchConfigInterrupt(pin, userFunc, args, threshold, true);
+  __touchConfigInterrupt(pin, userFunc, args, true, threshold);
 }
 
 // new additional API to detach touch ISR
 static void __touchDettachInterrupt(uint8_t pin) {
-  __touchConfigInterrupt(pin, NULL, NULL, 0, false);  // userFunc as NULL acts as detaching
+  __touchConfigInterrupt(pin, NULL, NULL, false, 0);  // userFunc as NULL acts as detaching
 }
 
 // /*