Merge branch 'dev'

Author: dchristl

.github/workflows/release.yaml

@@ -94,10 +94,19 @@ jobs:
           mkdir -p release
           zip -j release/${chip}nat_extended_update_v${{ env.VERSION }}.zip $folder/${chip}nat_extended_v${{ env.VERSION }}.bin
           zip -j release/${chip}nat_extended_full_v${{ env.VERSION }}.zip $folder/${chip}nat_extended_full_v${{ env.VERSION }}.bin
-      # - name: Delete old drafts
-      #   uses: hugo19941994/[email protected]
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build ESP32 C6 firmware
+        run: platformio run -e esp32-c6
+      - name: Build one binary for ESP32 C6
+        run: |
+          folder=.pio/build/esp32-c6
+          chip=esp32c6
+          mkdir -p release/ota/ESP32-C6/
+          cp $folder/firmware.bin release/ota/ESP32-C6/firmware.bin 
+          mv $folder/firmware.bin $folder/${chip}nat_extended_v${{ env.VERSION }}.bin
+          esptool.py --chip $chip merge_bin -o $folder/${chip}nat_extended_full_v${{ env.VERSION }}.bin --flash_freq keep --flash_size keep 0x0 $folder/bootloader.bin 0x10000 $folder/${chip}nat_extended_v${{ env.VERSION }}.bin 0x8000 $folder/partitions.bin
+          mkdir -p release/
+          zip -j release/${chip}nat_extended_update_v${{ env.VERSION }}.zip $folder/${chip}nat_extended_v${{ env.VERSION }}.bin
+          zip -j release/${chip}nat_extended_full_v${{ env.VERSION }}.zip $folder/${chip}nat_extended_full_v${{ env.VERSION }}.bin
       - name: Create draft release
         uses: "marvinpinto/action-automatic-releases@latest"
         if: github.ref == 'refs/heads/master'

build.py

@@ -228,12 +228,12 @@ static int deep_sleep(int argc, char **argv)
     if (deep_sleep_args.wakeup_gpio_num->count)
     {
         int io_num = deep_sleep_args.wakeup_gpio_num->ival[0];
-        if (!rtc_gpio_is_valid_gpio(io_num))
+        if (!GPIO_IS_VALID_GPIO(io_num))
         {
-            ESP_LOGE(TAG, "GPIO %d is not an RTC IO", io_num);
+            ESP_LOGE(TAG, "GPIO %d is not a valid IO", io_num);
             return 1;
         }
-        int level = 0;
+        int level = 1;
         if (deep_sleep_args.wakeup_gpio_level->count)
         {
             level = deep_sleep_args.wakeup_gpio_level->ival[0];
@@ -245,15 +245,20 @@ static int deep_sleep(int argc, char **argv)
         }
         ESP_LOGI(TAG, "Enabling wakeup on GPIO%d, wakeup on %s level",
                  io_num, level ? "HIGH" : "LOW");
-        ESP_ERROR_CHECK(esp_sleep_enable_wifi_wakeup());
+
+#if defined(SOC_PM_SUPPORT_EXT1_WAKEUP)
+        ESP_ERROR_CHECK(esp_sleep_enable_ext1_wakeup(1ULL << io_num, level));
+#endif
+#if defined(SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP)
+        ESP_ERROR_CHECK(esp_deep_sleep_enable_gpio_wakeup(1ULL << io_num, level));
+#endif
     }
-#if SOC_RTCIO_HOLD_SUPPORTED
+
+#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
     rtc_gpio_isolate(GPIO_NUM_12);
-#endif // WITH_TASKS_INFO
+#endif
     esp_deep_sleep_start();
-    return 0;
 }
-
 static void register_deep_sleep(void)
 {
     deep_sleep_args.wakeup_time =
@@ -394,6 +399,9 @@ void determineChipType(char chip_type[30])
     case CHIP_ESP32C3:
         sprintf(chip_type, "%s", "ESP32-C3");
         break;
+    case CHIP_ESP32C6:
+        sprintf(chip_type, "%s", "ESP32-C6");
+        break;
     default:
         int chip_model = chip_info.model;
         sprintf(chip_type, "%s (%d)", "Unknown/Unsupported", chip_model);

components/cmd_system/cmd_system.c

@@ -34,8 +34,8 @@ board_build.embed_txtfiles =
     src/pages/jquery-8a1045d9cbf50b52a0805c111ba08e94.js
 
 platform = espressif32
-platform_packages =
-        framework-espidf @ https://github.com/tasmota/esp-idf/releases/download/v5.1.2-org/esp-idf-v5.1.2-org.zip
+; platform_packages =
+;         framework-espidf @ https://github.com/tasmota/esp-idf/releases/download/v5.1.2-org/esp-idf-v5.1.2-org.zip
 
 [env:esp32]
 board = esp32dev
@@ -46,4 +46,7 @@ board = esp32-c3-devkitm-1
 [env:esp32-s2]
 board = lolin_s2_mini
 upload_port = /dev/ttyACM0
+
+[env:esp32-c6]
+board = esp32-c6-devkitm-1