Merge pull request #39 from pioarduino/develop

Changes from develop

Author: Jason2866

Diff for: .github/workflows/examples.yml

@@ -18,8 +18,8 @@ jobs:
           - "examples/arduino-rmt-blink"
           - "examples/arduino-usb-keyboard"
           - "examples/arduino-wifiscan"
-          #- "examples/arduino-zigbee-light"
-          #- "examples/arduino-zigbee-switch"
+          - "examples/arduino-zigbee-light"
+          - "examples/arduino-zigbee-switch"
           - "examples/espidf-arduino-h2zero-BLE_scan"
           #- "examples/espidf-arduino-matter-light"        # Windows compile fails -> Path length limit
           - "examples/espidf-arduino-blink"

Diff for: examples/arduino-zigbee-light/platformio.ini

@@ -9,7 +9,7 @@
 
 
 [env:esp32-h2-devkitm-1]
-platform = https://github.com/pioarduino/platform-espressif32.git#develop
+platform = espressif32
 framework = arduino
 board = esp32-h2-devkitm-1
 monitor_speed = 115200

Diff for: examples/arduino-zigbee-light/src/Zigbee_On_Off_Light.ino

@@ -22,7 +22,7 @@
  * and also the correct partition scheme must be selected in Tools->Partition Scheme.
  *
  * Please check the README.md for instructions and more detailed description.
- * 
+ *
  * Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
  */
 
@@ -33,57 +33,55 @@
 #include "ZigbeeCore.h"
 #include "ep/ZigbeeLight.h"
 
-#define LED_PIN RGB_BUILTIN
-#define BUTTON_PIN 9  // C6/H2 Boot button
-#define ZIGBEE_LIGHT_ENDPOINT       10         /* esp light bulb device endpoint, used to process light controlling commands */
-
-class MyZigbeeLight : public ZigbeeLight {
-public:
-    // Constructor that passes parameters to the base class constructor
-    MyZigbeeLight(uint8_t endpoint) : ZigbeeLight(endpoint) {}
+#define LED_PIN               RGB_BUILTIN
+#define BUTTON_PIN            9  // ESP32-C6/H2 Boot button
+#define ZIGBEE_LIGHT_ENDPOINT 10
 
-    // Override the set_on_off function
-    void setOnOff(bool value) override {
-      rgbLedWrite(LED_PIN, 255 * value, 255 * value, 255 * value);  // Toggle light
-    }
-};
+ZigbeeLight zbLight = ZigbeeLight(ZIGBEE_LIGHT_ENDPOINT);
 
-MyZigbeeLight zbLight = MyZigbeeLight(ZIGBEE_LIGHT_ENDPOINT);
+/********************* RGB LED functions **************************/
+void setLED(bool value) {
+  digitalWrite(LED_PIN, value);
+}
 
 /********************* Arduino functions **************************/
 void setup() {
-  // Init RMT and leave light OFF
-  rgbLedWrite(LED_PIN, 0, 0, 0);
+  // Init LED and turn it OFF (if LED_PIN == RGB_BUILTIN, the rgbLedWrite() will be used under the hood)
+  pinMode(LED_PIN, OUTPUT);
+  digitalWrite(LED_PIN, LOW);
 
   // Init button for factory reset
   pinMode(BUTTON_PIN, INPUT);
 
   //Optional: set Zigbee device name and model
   zbLight.setManufacturerAndModel("Espressif", "ZBLightBulb");
 
+  // Set callback function for light change
+  zbLight.onLightChange(setLED);
+
   //Add endpoint to Zigbee Core
   log_d("Adding ZigbeeLight endpoint to Zigbee Core");
   Zigbee.addEndpoint(&zbLight);
-  
+
   // When all EPs are registered, start Zigbee. By default acts as ZIGBEE_END_DEVICE
   log_d("Calling Zigbee.begin()");
   Zigbee.begin();
 }
 
 void loop() {
-  // Cheking button for factory reset
+  // Checking button for factory reset
   if (digitalRead(BUTTON_PIN) == LOW) {  // Push button pressed
     // Key debounce handling
     delay(100);
     int startTime = millis();
     while (digitalRead(BUTTON_PIN) == LOW) {
       delay(50);
-      if((millis() - startTime) > 3000) {
+      if ((millis() - startTime) > 3000) {
         // If key pressed for more than 3secs, factory reset Zigbee and reboot
-        Serial.printf("Reseting Zigbee to factory settings, reboot.\n");
+        Serial.printf("Resetting Zigbee to factory settings, reboot.\n");
         Zigbee.factoryReset();
       }
     }
   }
   delay(100);
-}
+}

Diff for: examples/arduino-zigbee-switch/platformio.ini

@@ -9,7 +9,7 @@
 
 
 [env:esp32-c6-devkitc-1]
-platform = https://github.com/pioarduino/platform-espressif32.git#develop
+platform = espressif32
 framework = arduino
 board = esp32-c6-devkitc-1
 monitor_speed = 115200

Diff for: examples/arduino-zigbee-switch/src/Zigbee_On_Off_Switch.ino

@@ -23,7 +23,7 @@
  * and also the correct partition scheme must be selected in Tools->Partition Scheme.
  *
  * Please check the README.md for instructions and more detailed description.
- * 
+ *
  * Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
  */
 
@@ -65,24 +65,7 @@ typedef enum {
 
 static SwitchData buttonFunctionPair[] = {{GPIO_INPUT_IO_TOGGLE_SWITCH, SWITCH_ONOFF_TOGGLE_CONTROL}};
 
-/* Zigbee switch */
-class MyZigbeeSwitch : public ZigbeeSwitch {
-public:
-    // Constructor that passes parameters to the base class constructor
-    MyZigbeeSwitch(uint8_t endpoint) : ZigbeeSwitch(endpoint) {}
-
-    // Override the set_on_off function
-    void readManufacturer(char* manufacturer) override {
-      //Do what you want with the manufacturer string
-      Serial.printf("Manufacturer: %s\n", manufacturer);
-    }
-    void readModel(char* model) override {
-      //Do what you want with the model string
-      Serial.printf("Model: %s\n", model);
-    }
-};
-
-MyZigbeeSwitch zbSwitch = MyZigbeeSwitch(SWITCH_ENDPOINT_NUMBER);
+ZigbeeSwitch zbSwitch = ZigbeeSwitch(SWITCH_ENDPOINT_NUMBER);
 
 /********************* Zigbee functions **************************/
 static void onZbButton(SwitchData *button_func_pair) {
@@ -111,8 +94,11 @@ static void enableGpioInterrupt(bool enabled) {
 
 /********************* Arduino functions **************************/
 void setup() {
-  
+
   Serial.begin(115200);
+  while (!Serial) {
+    delay(10);
+  }
 
   //Optional: set Zigbee device name and model
   zbSwitch.setManufacturerAndModel("Espressif", "ZigbeeSwitch");
@@ -126,7 +112,6 @@ void setup() {
 
   //Open network for 180 seconds after boot
   Zigbee.setRebootOpenNetwork(180);
-  
 
   // Init button switch
   for (int i = 0; i < PAIR_SIZE(buttonFunctionPair); i++) {
@@ -143,14 +128,27 @@ void setup() {
   // When all EPs are registered, start Zigbee with ZIGBEE_COORDINATOR mode
   log_d("Calling Zigbee.begin()");
   Zigbee.begin(ZIGBEE_COORDINATOR);
-  
+
   Serial.println("Waiting for Light to bound to the switch");
   //Wait for switch to bound to a light:
-  while(!zbSwitch.isBound()) 
-  {
+  while (!zbSwitch.isBound()) {
     Serial.printf(".");
     delay(500);
   }
+
+  // Optional: read manufacturer and model name from the bound light
+  std::list<zb_device_params_t *> boundLights = zbSwitch.getBoundDevices();
+  //List all bound lights
+  for (const auto &device : boundLights) {
+    Serial.printf("Device on endpoint %d, short address: 0x%x\n", device->endpoint, device->short_addr);
+    Serial.printf(
+      "IEEE Address: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", device->ieee_addr[0], device->ieee_addr[1], device->ieee_addr[2], device->ieee_addr[3],
+      device->ieee_addr[4], device->ieee_addr[5], device->ieee_addr[6], device->ieee_addr[7]
+    );
+    Serial.printf("Light manufacturer: %s", zbSwitch.readManufacturer(device->endpoint, device->short_addr));
+    Serial.printf("Light model: %s", zbSwitch.readModel(device->endpoint, device->short_addr));
+  }
+
   Serial.println();
 }
 
@@ -160,7 +158,6 @@ void loop() {
   SwitchData buttonSwitch;
   static SwitchState buttonState = SWITCH_IDLE;
   bool eventFlag = false;
-  
 
   /* check if there is any queue received, if yes read out the buttonSwitch */
   if (xQueueReceive(gpio_evt_queue, &buttonSwitch, portMAX_DELAY)) {

Diff for: examples/espidf-arduino-matter-light/main/idf_component.yml

@@ -1,3 +1,7 @@
 dependencies:
   espressif/esp_matter:
-    version: "^1.3.0"
+    version: "^1.3.0"
+  espressif/cmake_utilities:
+    version: "0.*"
+    rules:
+      - if: "target in [esp32c2]"

Diff for: platform.py

@@ -39,6 +39,9 @@ def configure_default_packages(self, variables, targets):
         mcu = variables.get("board_build.mcu", board_config.get("build.mcu", "esp32"))
         frameworks = variables.get("pioframework", [])
 
+        if variables.get("custom_sdkconfig") is not None:
+            frameworks.append("espidf")
+
         if "arduino" in frameworks:
             self.packages["framework-arduinoespressif32"]["optional"] = False
             self.packages["framework-arduinoespressif32-libs"]["optional"] = False