Merge branch 'espressif:master' into main

Author: Jason2866

libraries/NetworkClientSecure/src/NetworkClientSecure.cpp

@@ -339,9 +339,9 @@ void NetworkClientSecure::setCACert(const char *rootCA) {
   _use_insecure = false;
 }
 
-void NetworkClientSecure::setCACertBundle(const uint8_t *bundle) {
-  if (bundle != NULL) {
-    esp_crt_bundle_set(bundle, sizeof(bundle));
+void NetworkClientSecure::setCACertBundle(const uint8_t *bundle, size_t size) {
+  if (bundle != NULL && size > 0) {
+    esp_crt_bundle_set(bundle, size);
     attach_ssl_certificate_bundle(sslclient.get(), true);
     _use_ca_bundle = true;
   } else {

libraries/NetworkClientSecure/src/NetworkClientSecure.h

@@ -73,7 +73,7 @@ class NetworkClientSecure : public NetworkClient {
   void setCertificate(const char *client_ca);
   void setPrivateKey(const char *private_key);
   bool loadCACert(Stream &stream, size_t size);
-  void setCACertBundle(const uint8_t *bundle);
+  void setCACertBundle(const uint8_t *bundle, size_t size);
   bool loadCertificate(Stream &stream, size_t size);
   bool loadPrivateKey(Stream &stream, size_t size);
   bool verify(const char *fingerprint, const char *domain_name);

libraries/RainMaker/examples/RMakerCustom/RMakerCustom.ino

@@ -9,7 +9,7 @@ const char *service_name = "PROV_1234";
 const char *pop = "abcd1234";
 
 //GPIO for push button
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
 static int gpio_0 = 9;
 static int gpio_dimmer = 7;
 #else

libraries/RainMaker/examples/RMakerCustom/ci.json

@@ -1,6 +1,5 @@
 {
   "targets": {
-    "esp32c6": false,
     "esp32h2": false
   }
 }

libraries/RainMaker/examples/RMakerCustomAirCooler/RMakerCustomAirCooler.ino

@@ -11,7 +11,7 @@
 const char *service_name = "PROV_1234";
 const char *pop = "abcd1234";
 
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
 //GPIO for push button
 static int gpio_reset = 9;
 //GPIO for virtual device

libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json

@@ -1,6 +1,5 @@
 {
   "targets": {
-    "esp32c6": false,
     "esp32h2": false
   }
 }

libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json

@@ -1,6 +1,5 @@
 {
   "targets": {
-    "esp32c6": false,
     "esp32h2": false
   }
 }

libraries/RainMaker/examples/RMakerSwitch/RMakerSwitch.ino

@@ -9,7 +9,7 @@ const char *service_name = "PROV_1234";
 const char *pop = "abcd1234";
 
 // GPIO for push button
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
 static int gpio_0 = 9;
 static int gpio_switch = 7;
 #else

libraries/RainMaker/examples/RMakerSwitch/ci.json

@@ -1,6 +1,5 @@
 {
   "targets": {
-    "esp32c6": false,
     "esp32h2": false
   }
 }