Merge pull request #7 from QB4-dev/devel

QB4-dev · web-flow · commit 24ec7aabffd7 · 2025-03-19T20:30:55.000+01:00
Merge devel - support all ESP32 variants
diff --git a/esp-supla/esp-supla.c b/esp-supla/esp-supla.c
@@ -18,9 +18,9 @@
 #include <esp_wifi.h>
 #include <cJSON.h>
 
-#if CONFIG_IDF_TARGET_ESP32
-#include <esp_random.h>
-#include <esp_mac.h>
+#ifndef CONFIG_IDF_TARGET_ESP8266
+#include <esp_random.h> //ESP-IDF only
+#include <esp_mac.h>    //ESP-IDF only
 #endif
 
 static const char *TAG = "ESP-SUPLA";
@@ -130,30 +130,40 @@ esp_err_t supla_esp_nvs_config_write(struct supla_config *supla_conf)
     return ESP_OK;
 }
 
-esp_err_t supla_esp_nvs_channel_config_store(supla_channel_t *ch, void *nvs_config, size_t len)
+esp_err_t supla_esp_nvs_channel_state_store(supla_channel_t *ch, void *nvs_config, size_t len)
 {
     CHECK_ARG(ch);
     CHECK_ARG(nvs_config);
     nvs_handle nvs;
     char nvs_key[8];
     esp_err_t rc;
+    void *stored;
+    size_t stored_len;
     int ch_num = supla_channel_get_assigned_number(ch);
 
+    stored = malloc(len);
+    if (!stored)
+        return ESP_ERR_NO_MEM;
+
     snprintf(nvs_key, sizeof(nvs_key), "ch%02d", ch_num);
     rc = nvs_open(NVS_STORAGE, NVS_READWRITE, &nvs);
     if (rc == ESP_OK) {
-        nvs_set_blob(nvs, nvs_key, nvs_config, len);
-        nvs_commit(nvs);
+        //compare data and store if different
+        nvs_get_blob(nvs, nvs_key, stored, &stored_len);
+        if (memcmp(nvs_config, stored, len) != 0) {
+            nvs_set_blob(nvs, nvs_key, nvs_config, len);
+            nvs_commit(nvs);
+            ESP_LOGI(TAG, "ch[%d] config stored to NVS", ch_num);
+        }
         nvs_close(nvs);
     } else {
         supla_log(LOG_ERR, "nvs open error %s", esp_err_to_name(rc));
-        return rc;
     }
-    ESP_LOGI(TAG, "ch[%d] config stored to NVS", ch_num);
-    return ESP_OK;
+    free(stored);
+    return rc;
 }
 
-esp_err_t supla_esp_nvs_channel_config_restore(supla_channel_t *ch, void *nvs_config, size_t len)
+esp_err_t supla_esp_nvs_channel_state_restore(supla_channel_t *ch, void *nvs_config, size_t len)
 {
     CHECK_ARG(ch);
     CHECK_ARG(nvs_config);
@@ -175,7 +185,7 @@ esp_err_t supla_esp_nvs_channel_config_restore(supla_channel_t *ch, void *nvs_co
     return ESP_OK;
 }
 
-esp_err_t supla_esp_nvs_config_erase(void)
+esp_err_t supla_esp_nvs_data_erase(void)
 {
     nvs_handle nvs;
     esp_err_t rc;
@@ -236,7 +246,7 @@ esp_err_t supla_esp_get_wifi_state(supla_dev_t *dev, TDSC_ChannelState *state)
         state->Fields |= SUPLA_CHANNELSTATE_FIELD_IPV4;
         state->IPv4 = ip_info.ip.addr;
     }
-#elif CONFIG_IDF_TARGET_ESP32
+#else //ESP32xx
     esp_netif_ip_info_t ip_info = {};
     esp_netif_t *netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF");
     if (esp_netif_get_ip_info(netif, &ip_info) == ESP_OK) {
@@ -388,6 +398,7 @@ static esp_err_t supla_dev_post_config(supla_dev_t *dev, httpd_req_t *req)
 
         config.ssl = 0;
 #ifdef CONFIG_ESP_LIBSUPLA_USE_ESP_TLS
+        config.ssl = false;
         if (httpd_query_key_value(req_data, "ssl", value, sizeof(value)) == ESP_OK)
             config.ssl = !strcmp("on", value);
 #endif
@@ -415,7 +426,7 @@ static esp_err_t supla_dev_erase_config(supla_dev_t *dev)
     struct supla_config config = { 0 };
     int rc;
 
-    rc = supla_esp_nvs_config_erase();
+    rc = supla_esp_nvs_data_erase();
     if (rc != ESP_OK)
         return rc;
 
diff --git a/examples/default/main/main.c b/examples/default/main/main.c
@@ -22,7 +22,7 @@
 #if CONFIG_IDF_TARGET_ESP8266
 #define PUSH_BUTTON_PIN GPIO_NUM_0
 #define LED_PIN GPIO_NUM_2
-#elif CONFIG_IDF_TARGET_ESP32
+#else //ESP32xx
 #define PUSH_BUTTON_PIN GPIO_NUM_0
 #define LED_PIN GPIO_NUM_27
 #endif
@@ -125,11 +125,33 @@ void app_main()
 
     io_init();
     wifi_init();
-#if CONFIG_IDF_TARGET_ESP8266
+
+#if defined(CONFIG_IDF_TARGET_ESP8266)
     supla_dev = supla_dev_create("ESP8266", NULL);
-#elif CONFIG_IDF_TARGET_ESP32
+#elif defined(CONFIG_IDF_TARGET_ESP32)
     supla_dev = supla_dev_create("ESP32", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+    supla_dev = supla_dev_create("ESP32S2", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+    supla_dev = supla_dev_create("ESP32S3", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32C2)
+    supla_dev = supla_dev_create("ESP32C2", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32C3)
+    supla_dev = supla_dev_create("ESP32C3", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32C5)
+    supla_dev = supla_dev_create("ESP32C5", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32C6)
+    supla_dev = supla_dev_create("ESP32C6", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32C61)
+    supla_dev = supla_dev_create("ESP32C61", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32P4)
+    supla_dev = supla_dev_create("ESP32P4", NULL);
+#elif defined(CONFIG_IDF_TARGET_ESP32H2)
+    supla_dev = supla_dev_create("ESP32H2", NULL);
+#else
+    supla_dev = supla_dev_create("ESPXX", NULL);
 #endif
+
     wifi_init_sta();
     xTaskCreate(&io_task, "io", 2048, NULL, 1, NULL);
     xTaskCreate(&supla_task, "supla", 8192, supla_dev, 1, NULL);
diff --git a/examples/default/main/wifi.c b/examples/default/main/wifi.c
@@ -79,7 +79,7 @@ void wifi_init(void)
     ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
     ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
 
-#if CONFIG_IDF_TARGET_ESP32
+#ifndef CONFIG_IDF_TARGET_ESP8266
     esp_netif_create_default_wifi_sta();
 #endif
 
diff --git a/include/esp-supla.h b/include/esp-supla.h
@@ -31,34 +31,34 @@ esp_err_t supla_esp_nvs_config_init(struct supla_config *supla_conf);
 esp_err_t supla_esp_nvs_config_write(struct supla_config *supla_conf);
 
 /**
- * @brief Write SUPLA channel config to NVS memory
+ * @brief Write SUPLA channel state to NVS memory
  *
  * @param[in] ch SUPLA channel
- * @param[in] nvs_config SUPLA channel config
- * @param[in] len SUPLA channelconfig size
+ * @param[in] nvs_state SUPLA channel data
+ * @param[in] len SUPLA nvs_state size
  * @return
  *     - ESP_OK success
  */
-esp_err_t supla_esp_nvs_channel_config_store(supla_channel_t *ch, void *nvs_config, size_t len);
+esp_err_t supla_esp_nvs_channel_state_store(supla_channel_t *ch, void *nvs_state, size_t len);
 
 /**
- * @brief Read SUPLA channel config from NVS memory
+ * @brief Read SUPLA channel state from NVS memory
  *
  * @param[in] ch SUPLA channel
- * @param[out] nvs_config SUPLA channel config
- * @param[in] len SUPLA channelconfig size
+ * @param[out] nvs_state SUPLA channel data
+ * @param[in] len SUPLA nvs_state size
  * @return
  *     - ESP_OK success
  */
-esp_err_t supla_esp_nvs_channel_config_restore(supla_channel_t *ch, void *nvs_config, size_t len);
+esp_err_t supla_esp_nvs_channel_state_restore(supla_channel_t *ch, void *nvs_state, size_t len);
 
 /**
- * @brief Erase SUPLA config from NVS memory
+ * @brief Erase SUPLA data from NVS memory
  *
  * @return
  *     - ESP_OK success
  */
-esp_err_t supla_esp_nvs_config_erase(void);
+esp_err_t supla_esp_nvs_data_erase(void);
 
 /**
  * @brief generate SUPLA device hostname from device name and last two bytes
diff --git a/libsupla b/libsupla
@@ -1 +1 @@
-Subproject commit 87a56453d63dcca3fc36d015b83d69f7f0a24a2b
+Subproject commit 323ec72e31e2efca463b337329550b719eff2ca7
diff --git a/platform/arch_esp.c b/platform/arch_esp.c
@@ -14,7 +14,7 @@
 #ifdef CONFIG_ESP_LIBSUPLA_USE_ESP_TLS
 #include <esp_tls.h>
 
-#ifndef CONFIG_IDF_TARGET_ESP32
+#ifdef CONFIG_IDF_TARGET_ESP8266
 // delete name variant is deprecated in ESP-IDF, however ESP8266 RTOS still
 // use it.
 #define esp_tls_conn_destroy esp_tls_conn_delete
