Added c6 support

Author: cjkas

.github/workflows/ci.yaml

@@ -17,6 +17,8 @@ jobs:
             name: ESP32-C3
           - env: esp32s3
             name: ESP32-S3
+          - env: esp32c6
+            name: ESP32-C6
 
     steps:
       - name: Check out code

.github/workflows/release.yaml

@@ -43,6 +43,14 @@ jobs:
             fwname: SomfyController.ino.esp32s3.bin
             fsname: SomfyController.littlefs.esp32s3.bin
             obname: SomfyController.onboard.esp32s3.bin
+          - env: esp32c6
+            name: ESP32-C6
+            chip: ESP32-C6
+            addr_bootloader: "0x0"
+            addr_fs: "0x310000"
+            fwname: SomfyController.ino.esp32c6.bin
+            fsname: SomfyController.littlefs.esp32c6.bin
+            obname: SomfyController.onboard.esp32c6.bin
 
     steps:
       - name: Get Release

platformio.ini

@@ -53,3 +53,14 @@ board_build.partitions = esp32_3MB.csv
 
 [env:esp32s3]
 board = esp32-s3-devkitc-1
+
+[env:esp32c6]
+platform = https://github.com/mnowak32/platform-espressif32.git#boards/seeed_xiao_esp32c6
+platform_packages =
+  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
+  framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.4/esp32-arduino-libs-3.0.4.zip
+board = seeed_xiao_esp32c6
+board_build.partitions = esp32_3MB.csv
+build_flags =
+	${env.build_flags}
+	-I${platformio.packages_dir}/framework-arduinoespressif32/libraries/Network/src

src/ConfigFile.cpp

@@ -616,7 +616,9 @@ bool ShadeConfigFile::restoreFile(SomfyShadeController *s, const char *filename,
   if(opts.network) {
     settings.IP.save();
     settings.WIFI.save();
+#ifndef CONFIG_IDF_TARGET_ESP32C6
     settings.Ethernet.save();
+#endif
   }
   if(opts.mqtt) settings.MQTT.save();
   return true;
@@ -672,13 +674,15 @@ bool ShadeConfigFile::readNetRecord(restore_options_t &opts) {
     if(opts.network) {
       if(strncmp(settings.serverId, this->header.serverId, sizeof(settings.serverId)) == 0) {
         ESP_LOGI(TAG, "Restoring Ethernet adapter settings");
+#ifndef CONFIG_IDF_TARGET_ESP32C6
         settings.Ethernet.boardType = this->readUInt8(1);
         settings.Ethernet.phyType = static_cast<eth_phy_type_t>(this->readUInt8(0));
         settings.Ethernet.CLKMode = static_cast<eth_clock_mode_t>(this->readUInt8(0));
         settings.Ethernet.phyAddress = this->readInt8(1);
         settings.Ethernet.PWRPin = this->readInt8(1);
         settings.Ethernet.MDCPin = this->readInt8(16);
         settings.Ethernet.MDIOPin = this->readInt8(23);
+#endif
       }
     }
     if(this->file.position() != startPos + this->header.netRecordSize) {
@@ -1035,13 +1039,17 @@ bool ShadeConfigFile::writeNetRecord() {
   this->writeBool(settings.MQTT.pubDisco);
   this->writeVarString(settings.MQTT.rootTopic);
   this->writeVarString(settings.MQTT.discoTopic);
+#ifndef CONFIG_IDF_TARGET_ESP32C6
   this->writeUInt8(settings.Ethernet.boardType);
   this->writeUInt8(static_cast<uint8_t>(settings.Ethernet.phyType));
   this->writeUInt8(static_cast<uint8_t>(settings.Ethernet.CLKMode));
   this->writeInt8(settings.Ethernet.phyAddress);
   this->writeInt8(settings.Ethernet.PWRPin);
   this->writeInt8(settings.Ethernet.MDCPin);
   this->writeInt8(settings.Ethernet.MDIOPin, CFG_REC_END);
+#else
+  this->writeUInt8(0, CFG_REC_END);
+#endif
   return true;
 }
 bool ShadeConfigFile::writeTransRecord(transceiver_config_t &cfg) {

src/ConfigSettings.cpp

@@ -155,21 +155,14 @@ bool ConfigSettings::begin() {
     case esp_chip_model_t::CHIP_ESP32S3:
       strcpy(this->chipModel, "s3");
       break;
-    case esp_chip_model_t::CHIP_ESP32S2:
-      strcpy(this->chipModel, "s2");
-      break;
     case esp_chip_model_t::CHIP_ESP32C3:
       strcpy(this->chipModel, "c3");
       break;
-//    case esp_chip_model_t::CHIP_ESP32C2:
-//      strcpy(this->chipModel, "c2");
-//      break;
-//    case esp_chip_model_t::CHIP_ESP32C6:
-//      strcpy(this->chipModel, "c6");
-//      break;
-    case esp_chip_model_t::CHIP_ESP32H2:
-      strcpy(this->chipModel, "h2");
+#ifdef CHIP_ESP32C6
+    case esp_chip_model_t::CHIP_ESP32C6:
+      strcpy(this->chipModel, "c6");
       break;
+#endif
     default:
       sprintf(this->chipModel, "UNK%d", static_cast<int>(ci.model));
       break;
@@ -188,7 +181,9 @@ bool ConfigSettings::begin() {
   this->Security.begin();
   this->IP.begin();
   this->WIFI.begin();
+#ifndef CONFIG_IDF_TARGET_ESP32C6
   this->Ethernet.begin();
+#endif
   this->NTP.begin();
   this->MQTT.begin();
   this->print();
@@ -258,7 +253,9 @@ void ConfigSettings::print() {
   ESP_LOGD(TAG, "Connection Type: %u", (unsigned int) this->connType);
   this->NTP.print();
   if(this->connType == conn_types_t::wifi || this->connType == conn_types_t::unset) this->WIFI.print();
+#ifndef CONFIG_IDF_TARGET_ESP32C6
   if(this->connType == conn_types_t::ethernet || this->connType == conn_types_t::ethernetpref) this->Ethernet.print();
+#endif
 }
 void ConfigSettings::emitSockets() {}
 void ConfigSettings::emitSockets(uint8_t num) {}
@@ -590,6 +587,7 @@ bool WifiSettings::ssidExists(const char *ssid) {
   }
   return false;
 }
+#ifndef CONFIG_IDF_TARGET_ESP32C6
 EthernetSettings::EthernetSettings() {}
 bool EthernetSettings::begin() {
   this->load();
@@ -653,6 +651,7 @@ void EthernetSettings::print() {
   ESP_LOGD(TAG, "Ethernet Settings Board:%d PHYType:%d CLK:%d ADDR:%d PWR:%d MDC:%d MDIO:%d",
     this->boardType, this->phyType, this->CLKMode, this->phyAddress, this->PWRPin, this->MDCPin, this->MDIOPin);
 }
+#endif // CONFIG_IDF_TARGET_ESP32C6
 void ConfigSettings::printAvailHeap() {
   ESP_LOGD(TAG, "Max Heap: %u", (unsigned int)ESP.getMaxAllocHeap());
   ESP_LOGD(TAG, "Free Heap: %u", (unsigned int)ESP.getFreeHeap());

src/ConfigSettings.h

@@ -1,5 +1,7 @@
 #include <ArduinoJson.h>
+#ifndef CONFIG_IDF_TARGET_ESP32C6
 #include <ETH.h>
+#endif
 #ifndef configsettings_h
 #define configsettings_h
 #include "WResp.h"
@@ -88,6 +90,7 @@ class WifiSettings: BaseSettings {
     void print();
 
 };
+#ifndef CONFIG_IDF_TARGET_ESP32C6
 class EthernetSettings: BaseSettings {
   public:
     EthernetSettings();
@@ -98,7 +101,7 @@ class EthernetSettings: BaseSettings {
     int8_t PWRPin = ETH_PHY_POWER;
     int8_t MDCPin = ETH_PHY_MDC;
     int8_t MDIOPin = ETH_PHY_MDIO;
-    
+
     bool begin();
     bool fromJSON(JsonObject &obj);
     bool toJSON(JsonObject &obj);
@@ -108,6 +111,7 @@ class EthernetSettings: BaseSettings {
     void print();
     bool usesPin(uint8_t pin);
 };
+#endif
 class IPSettings: BaseSettings {
   public:
     IPSettings();
@@ -180,7 +184,9 @@ class ConfigSettings: BaseSettings {
     uint8_t status;
     IPSettings IP;
     WifiSettings WIFI;
+#ifndef CONFIG_IDF_TARGET_ESP32C6
     EthernetSettings Ethernet;
+#endif
     NTPSettings NTP;
     MQTTSettings MQTT;
     SecuritySettings Security;