Merge branch 'espressif:master' into main

Author: Jason2866

libraries/BLE/src/BLEDevice.cpp

@@ -1219,6 +1219,23 @@ void BLEDevice::setCustomGattsHandler(gatts_event_handler handler) {
 
 #if defined(CONFIG_NIMBLE_ENABLED)
 
+/**
+ * @brief Set the SDIO pins for connection to external ESP MCU when using ESP-Hosted with NimBLE
+ * @param [in] clk The clock pin
+ * @param [in] cmd The command pin
+ * @param [in] d0 The data pin 0
+ * @param [in] d1 The data pin 1
+ * @param [in] d2 The data pin 2
+ * @param [in] d3 The data pin 3
+ * @param [in] rst The reset pin
+ * @return True if the pins were set successfully.
+ */
+#if CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE
+bool BLEDevice::setPins(int8_t clk, int8_t cmd, int8_t d0, int8_t d1, int8_t d2, int8_t d3, int8_t rst) {
+  return hostedSetPins(clk, cmd, d0, d1, d2, d3, rst);
+}
+#endif
+
 /**
  * @brief Checks if a peer device is whitelisted.
  * @param [in] address The address to check for in the whitelist.

libraries/BLE/src/BLEDevice.h

@@ -234,6 +234,10 @@ class BLEDevice {
   static bool setOwnAddr(uint8_t *addr);
   static void setDeviceCallbacks(BLEDeviceCallbacks *cb);
   static bool onWhiteList(BLEAddress &address);
+#if CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE
+  // Set SDIO pins for connection to external ESP MCU
+  static bool setPins(int8_t clk, int8_t cmd, int8_t d0, int8_t d1, int8_t d2, int8_t d3, int8_t rst);
+#endif
 #endif
 
 private:

tests/validation/gpio/diagram.esp32.json

@@ -13,16 +13,26 @@
     {
       "type": "wokwi-pushbutton",
       "id": "btn1",
-      "top": -13,
-      "left": -19.2,
-      "attrs": { "color": "green" }
+      "top": 83,
+      "left": -38.4,
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": -39.6,
+      "left": -41.4,
+      "rotate": 90,
+      "attrs": { "color": "red" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-19.2", "v48", "h-38.4" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ]
+    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v57.8", "h-240", "v-76.8" ] ],
+    [ "esp32:GND.2", "led1:C", "black", [ "v0" ] ],
+    [ "esp32:4", "led1:A", "green", [ "h0" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32c3.json

@@ -15,14 +15,24 @@
       "id": "btn1",
       "top": -22.6,
       "left": -19.2,
-      "attrs": { "color": "green" }
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": 28,
+      "left": -286.6,
+      "rotate": 270,
+      "attrs": { "color": "red" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-28.8", "v144", "h-144", "v-95.7" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ]
+    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ],
+    [ "esp32:GND.4", "led1:C", "black", [ "h0" ] ],
+    [ "esp32:4", "led1:A", "green", [ "v0" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32c6.json

@@ -15,14 +15,24 @@
       "id": "btn1",
       "top": -22.6,
       "left": -19.2,
-      "attrs": { "color": "green" }
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": 56.8,
+      "left": -286.6,
+      "rotate": 270,
+      "attrs": { "color": "red" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-19.2", "v-96", "h-163.2", "v93.77" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ]
+    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ],
+    [ "esp32:GND.1", "led1:C", "black", [ "h0" ] ],
+    [ "esp32:4", "led1:A", "green", [ "h0" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32h2.json

@@ -15,14 +15,24 @@
       "id": "btn1",
       "top": -22.6,
       "left": -19.2,
-      "attrs": { "color": "green" }
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": -0.8,
+      "left": -267.4,
+      "rotate": 270,
+      "attrs": { "color": "red" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-19.2", "v-96", "h-163.2", "v93.77" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ]
+    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ],
+    [ "esp32:GND.2", "led1:C", "black", [ "h0" ] ],
+    [ "esp32:4", "led1:A", "green", [ "h-29.14", "v-26.57" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32p4.json

@@ -15,14 +15,17 @@
       "id": "btn1",
       "top": -128.2,
       "left": -19.2,
-      "attrs": { "color": "green", "bounce": "1" }
-    }
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    { "type": "wokwi-led", "id": "led1", "top": -138, "left": -92.2, "attrs": { "color": "red" } }
   ],
   "connections": [
     [ "esp32:38", "$serialMonitor:TX", "", [] ],
     [ "esp32:37", "$serialMonitor:RX", "", [] ],
     [ "btn1:2.r", "esp32:GND.3", "black", [ "h19.4", "v29" ] ],
-    [ "esp32:0", "btn1:1.l", "blue", [ "h-48", "v-67.2" ] ]
+    [ "esp32:0", "btn1:1.l", "blue", [ "h-48", "v-67.2" ] ],
+    [ "esp32:GND.1", "led1:C", "black", [ "v0" ] ],
+    [ "esp32:4", "led1:A", "green", [ "v-19.2", "h-48" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32s2.json

@@ -15,14 +15,24 @@
       "id": "btn1",
       "top": -22.6,
       "left": -19.2,
-      "attrs": { "color": "green" }
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": -0.8,
+      "left": -277,
+      "rotate": 270,
+      "attrs": { "color": "red" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-28.8", "v-57.6", "h-144", "v42.71" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ]
+    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v173", "h-269.2", "v-98.23" ] ],
+    [ "esp32:GND.1", "led1:C", "black", [ "h-67.47", "v-167.51" ] ],
+    [ "esp32:4", "led1:A", "green", [ "h0" ] ]
   ],
   "dependencies": {}
 }

tests/validation/gpio/diagram.esp32s3.json

@@ -13,16 +13,26 @@
     {
       "type": "wokwi-pushbutton",
       "id": "btn1",
-      "top": -22.6,
-      "left": -19.2,
-      "attrs": { "color": "green" }
+      "top": 83,
+      "left": 9.6,
+      "attrs": { "color": "green", "bounce": "0" }
+    },
+    {
+      "type": "wokwi-led",
+      "id": "led1",
+      "top": 66.4,
+      "left": -257.8,
+      "rotate": 270,
+      "attrs": { "color": "red", "flip": "" }
     }
   ],
   "connections": [
     [ "esp32:RX", "$serialMonitor:TX", "", [] ],
     [ "esp32:TX", "$serialMonitor:RX", "", [] ],
     [ "btn1:1.l", "esp32:0", "blue", [ "h-38.4", "v105.78" ] ],
-    [ "btn1:2.r", "esp32:GND.1", "black", [ "h19.4", "v221", "h-269.2", "v-57.42" ] ]
+    [ "btn1:2.r", "esp32:GND.3", "green", [ "h19.4", "v48.2", "h-144.4", "v0.18" ] ],
+    [ "esp32:4", "led1:A", "green", [ "h0" ] ],
+    [ "esp32:GND.1", "led1:C", "black", [ "h0" ] ]
   ],
   "dependencies": {}
 }