From 5164a18abfcd4aa5137f67faca2ed22d73e6cde5 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 28 Jul 2023 11:57:04 +0200
Subject: [PATCH] Wip Arduino 3.0.0 devel

---
 boards/esp32c6.json            | 44 ++++++++++++++++++++++++++++++++++
 platformio_override_sample.ini |  4 +++-
 platformio_tasmota32.ini       |  2 +-
 platformio_tasmota_env32.ini   | 23 ++++++++++++++++++
 4 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 boards/esp32c6.json

diff --git a/boards/esp32c6.json b/boards/esp32c6.json
new file mode 100644
index 000000000000..919bcfdfee67
--- /dev/null
+++ b/boards/esp32c6.json
@@ -0,0 +1,44 @@
+{
+    "build": {
+      "arduino":{
+        "ldscript": "esp32c6_out.ld"
+      },
+      "core": "esp32",
+      "extra_flags": "-DESP32_4M -DESP32C6",
+      "f_cpu": "160000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "dio",
+      "mcu": "esp32c6",
+      "variant": "esp32c6",
+      "partitions": "partitions/esp32_partition_app2880k_fs320k.csv"
+    },
+    "connectivity": [
+      "wifi",
+      "bluetooth"
+    ],
+    "debug": {
+      "openocd_target": "esp32c6.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Espressif Generic ESP32-C6 >= 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
+    "upload": {
+      "arduino": {
+        "flash_extra_images": [
+          [
+            "0x10000",
+            "variants/tasmota/tasmota32c6-safeboot.bin"
+          ]
+        ]
+      },
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html",
+    "vendor": "Espressif"
+  }
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 7d9b1d9e8d0f..9f5174833d7d 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -18,7 +18,9 @@
 ; *** Build/upload environment
 default_envs            =
 ; *** Uncomment the line(s) below to select version(s)
-                          tasmota
+                          tasmota32-arduino30
+                          tasmota32c6-safeboot
+;                          tasmota
 ;                          tasmota-debug
 ;                          tasmota-minimal
 ;                          tasmota-lite
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 814af20a0319..d537a0c42276 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -42,7 +42,7 @@ extra_scripts               = pre:pio-tools/add_c_flags.py
                               ${esp_defaults.extra_scripts}
 
 [core32]
-platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2023.07.00/platform-espressif32.zip
+platform                    = https://github.com/Jason2866/platform-espressif32/releases/download/v3.0.0/platform-espressif32-3.0.0.zip
 platform_packages           =
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 337255131b66..546b66d5de9a 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -40,6 +40,29 @@ lib_ignore              =
 ; tasmota/berry/modules/Partition_Manager.tapp
 custom_files_upload     = no_files
 
+[env:tasmota32-arduino30]
+extends                 = env:tasmota32_base
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -DFIRMWARE_SAFEBOOT
+                          -DOTA_URL='""'
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              =
+                          Micro-RTSP
+                          ESP Mail Client
+                          DHT sensor library
+
+[env:tasmota32c6-safeboot]
+extends                 = env:tasmota32_base
+board                   = esp32c6
+build_flags             = ${env:tasmota32_base.build_flags}
+                          -DFIRMWARE_SAFEBOOT
+                          -DOTA_URL='""'
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              =
+                          Micro-RTSP
+                          ESP Mail Client
+                          DHT sensor library
+
 [env:tasmota32-safeboot]
 extends                 = env:tasmota32_base
 build_flags             = ${env:tasmota32_base.build_flags}