esp-zigbee-sdk: optimize the zigbee cluster implementation(0f0acd4)

* fix callback for custom cluster
* stringify zigbee app signal
* fix end device distributed key setting
* register attribute from local variable to static
* fix reportable_change data type

Closes: #25
Closes: #27

components/esp-zigbee-lib/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.6.0"
+version: "0.6.1"
 description: esp-zigbee library component
 url: https://github.com/espressif/esp-zigbee-sdk
 dependencies:

components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_command.h

@@ -68,7 +68,7 @@ typedef struct esp_zb_zcl_config_report_cmd_s {
     uint8_t  attrType;                              /*!< Attribute type to report refer to zb_zcl_common.h zcl_attr_type */
     uint16_t  min_interval;                         /*!< Minimum reporting interval */
     uint16_t  max_interval;                         /*!< Maximum reporting interval */
-    uint16_t reportable_change;                     /*!< Minimum change to attribute will result in report */
+    void* reportable_change;                     /*!< Minimum change to attribute will result in report */
 } esp_zb_zcl_config_report_cmd_t;
 
 /**

components/esp-zigbee-lib/include/zdo/esp_zigbee_zdo_command.h

@@ -313,6 +313,13 @@ void esp_zb_zdo_device_leave_req(esp_zb_zdo_mgmt_leave_req_param_t *cmd_req, esp
  */
 void esp_zb_zdo_permit_joining_req(esp_zb_zdo_permit_joining_req_param_t *cmd_req, esp_zb_zdo_permit_join_callback_t user_cb, void *user_ctx);
 
+/**
+ * @brief Stringify the Zigbee Device Object signal
+ *
+ * @param[in] signal A @ref esp_zb_app_signal_type_t object that expect to stringified
+ * @return A string pointer of esp_zb_app_signal_type_t
+ */
+const char *esp_zb_zdo_signal_to_string(esp_zb_app_signal_type_t signal);
 #ifdef __cplusplus
 }
 #endif

components/esp-zigbee-lib/include/zdo/esp_zigbee_zdo_common.h

@@ -41,31 +41,81 @@ typedef enum {
  * @note It indicates current BDB, NWK or ZDO signal is finished
  */
 typedef enum {
-    ESP_ZB_ZDO_SIGNAL_DEFAULT_START                 = 0,
-    ESP_ZB_ZDO_SIGNAL_SKIP_STARTUP                  = 1,
-    ESP_ZB_ZDO_SIGNAL_DEVICE_ANNCE                  = 2,
-    ESP_ZB_ZDO_SIGNAL_LEAVE                         = 3,
-    ESP_ZB_ZDO_SIGNAL_ERROR                         = 4,
-    ESP_ZB_BDB_SIGNAL_DEVICE_FIRST_START            = 5,
-    ESP_ZB_BDB_SIGNAL_DEVICE_REBOOT                 = 6,
-    ESP_ZB_BDB_SIGNAL_STEERING                      = 10,
-    ESP_ZB_BDB_SIGNAL_FORMATION                     = 11,
-    ESP_ZB_NWK_SIGNAL_DEVICE_ASSOCIATED             = 18,
-    ESP_ZB_ZDO_SIGNAL_LEAVE_INDICATION              = 19,
-    ESP_ZB_COMMON_SIGNAL_CAN_SLEEP                  = 22,
-    ESP_ZB_ZDO_SIGNAL_PRODUCTION_CONFIG_READY       = 23,
-    ESP_ZB_MACSPLIT_DEVICE_BOOT                     = 43,
-    ESP_ZB_MACSPLIT_DEVICE_READY_FOR_UPGRADE        = 44,
-    ESP_ZB_MACSPLIT_DEVICE_FW_UPGRADE_EVENT         = 45,
-    ESP_ZB_ZDO_SIGNAL_DEVICE_AUTHORIZED             = 47,
-    ESP_ZB_ZDO_SIGNAL_DEVICE_UPDATE                 = 48,
-    ESP_ZB_NWK_SIGNAL_PANID_CONFLICT_DETECTED       = 49,
-    ESP_ZB_NLME_STATUS_INDICATION                   = 50,
-    ESP_ZB_NWK_SIGNAL_PERMIT_JOIN_STATUS            = 54,
-    ESP_ZB_BDB_SIGNAL_STEERING_CANCELLED            = 55,
-    ESP_ZB_BDB_SIGNAL_FORMATION_CANCELLED           = 56,
+    ESP_ZB_ZDO_SIGNAL_DEFAULT_START                             = 0x00,
+    ESP_ZB_ZDO_SIGNAL_SKIP_STARTUP                              = 0x01,
+    ESP_ZB_ZDO_SIGNAL_DEVICE_ANNCE                              = 0x02,
+    ESP_ZB_ZDO_SIGNAL_LEAVE                                     = 0x03,
+    ESP_ZB_ZDO_SIGNAL_ERROR                                     = 0x04,
+    ESP_ZB_BDB_SIGNAL_DEVICE_FIRST_START                        = 0x05,
+    ESP_ZB_BDB_SIGNAL_DEVICE_REBOOT                             = 0x06,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_NWK_STARTED                     = 0x07,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_NWK_JOINED_ROUTER               = 0x08,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK                                 = 0x09,
+    ESP_ZB_BDB_SIGNAL_STEERING                                  = 0x0a,
+    ESP_ZB_BDB_SIGNAL_FORMATION                                 = 0x0b,
+    ESP_ZB_BDB_SIGNAL_FINDING_AND_BINDING_TARGET_FINISHED       = 0x0c,
+    ESP_ZB_BDB_SIGNAL_FINDING_AND_BINDING_INITIATOR_FINISHED    = 0x0d,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_TARGET                          = 0x0e,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_NWK                             = 0x0f,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_TARGET_FINISHED                 = 0x10,
+    ESP_ZB_BDB_SIGNAL_TOUCHLINK_ADD_DEVICE_TO_NWK               = 0x11,
+    ESP_ZB_NWK_SIGNAL_DEVICE_ASSOCIATED                         = 0x12,
+    ESP_ZB_ZDO_SIGNAL_LEAVE_INDICATION                          = 0x13,
+    ESP_ZB_BDB_SIGNAL_WWAH_REJOIN_STARTED                       = 0x14,
+    ESP_ZB_ZGP_SIGNAL_COMMISSIONING                             = 0x15,
+    ESP_ZB_COMMON_SIGNAL_CAN_SLEEP                              = 0x16,
+    ESP_ZB_ZDO_SIGNAL_PRODUCTION_CONFIG_READY                   = 0x17,
+    ESP_ZB_NWK_SIGNAL_NO_ACTIVE_LINKS_LEFT                      = 0x18,
+    ESP_ZB_SE_SIGNAL_SKIP_JOIN                                  = 0x19,
+    ESP_ZB_SE_SIGNAL_REJOIN                                     = 0x1a,
+    ESP_ZB_SE_SIGNAL_CHILD_REJOIN                               = 0x1b,
+    ESP_ZB_SE_TC_SIGNAL_CHILD_JOIN_CBKE                         = 0x1c,
+    ESP_ZB_SE_TC_SIGNAL_CHILD_JOIN_NON_CBKE                     = 0x1d,
+    ESP_ZB_SE_SIGNAL_CBKE_FAILED                                = 0x1e,
+    ESP_ZB_SE_SIGNAL_CBKE_OK                                    = 0x1f,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_START                    = 0x20,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_DO_BIND                  = 0x21,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_BIND_OK                  = 0x22,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_BIND_FAILED              = 0x23,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_BIND_INDICATION          = 0x24,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_OK                       = 0x25,
+    ESP_ZB_SE_SIGNAL_SERVICE_DISCOVERY_FAILED                   = 0x26,
+    ESP_ZB_SE_SIGNAL_APS_KEY_READY                              = 0x27,
+    ESP_ZB_SE_SIGNAL_APS_KEY_FAIL                               = 0x28,
+    ESP_ZB_SIGNAL_SUBGHZ_SUSPEND                                = 0x29,
+    ESP_ZB_SIGNAL_SUBGHZ_RESUME                                 = 0x2a,
+    ESP_ZB_MACSPLIT_DEVICE_BOOT                                 = 0x2b,
+    ESP_ZB_MACSPLIT_DEVICE_READY_FOR_UPGRADE                    = 0x2c,
+    ESP_ZB_MACSPLIT_DEVICE_FW_UPGRADE_EVENT                     = 0x2d,
+    ESP_ZB_SIGNAL_NWK_INIT_DONE                                 = 0x2e,
+    ESP_ZB_ZDO_SIGNAL_DEVICE_AUTHORIZED                         = 0x2f,
+    ESP_ZB_ZDO_SIGNAL_DEVICE_UPDATE                             = 0x30,
+    ESP_ZB_NWK_SIGNAL_PANID_CONFLICT_DETECTED                   = 0x31,
+    ESP_ZB_NLME_STATUS_INDICATION                               = 0x32,
+    ESP_ZB_TCSWAP_DB_BACKUP_REQUIRED_SIGNAL                     = 0x33,
+    ESP_ZB_TC_SWAPPED_SIGNAL                                    = 0x34,
+    ESP_ZB_BDB_SIGNAL_TC_REJOIN_DONE                            = 0x35,
+    ESP_ZB_NWK_SIGNAL_PERMIT_JOIN_STATUS                        = 0x36,
+    ESP_ZB_BDB_SIGNAL_STEERING_CANCELLED                        = 0x37,
+    ESP_ZB_BDB_SIGNAL_FORMATION_CANCELLED                       = 0x38,
+    ESP_ZB_SIGNAL_READY_TO_SHUT                                 = 0x39,
+    ESP_ZB_SIGNAL_INTERPAN_PREINIT                              = 0x3a,
+    ESP_ZB_ZGP_SIGNAL_MODE_CHANGE                               = 0x3b,
+    ESP_ZB_ZDO_DEVICE_UNAVAILABLE                               = 0x3c,
+    ESP_ZB_ZGP_SIGNAL_APPROVE_COMMISSIONING                     = 0x3d,
+    ESP_ZB_SIGNAL_END                                           = 0x3e,
 } esp_zb_app_signal_type_t;
 
+/**
+ * @brief The struct of esp zboss app signal message table
+ * @anchor esp_zb_app_signal_msg_t
+ */
+typedef struct
+{
+    esp_zb_app_signal_type_t signal;        /*!< The signal type of Zigbee */
+    const char *msg;                        /*!< The string of Zigbee signal */
+} esp_zb_app_signal_msg_t;
+
 /**
  * @brief The enum of mode of Base Device Behavior (BDB)
  * @anchor esp_zb_bdb_commissioning_mode

examples/esp_zigbee_HA_sample/HA_color_dimmable_light/main/esp_zb_light.c

@@ -91,7 +91,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING);
         } else {
             /* commissioning failed */
-            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_BDB_SIGNAL_STEERING:
@@ -103,12 +103,13 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
                      extended_pan_id[3], extended_pan_id[2], extended_pan_id[1], extended_pan_id[0],
                      esp_zb_get_pan_id(), esp_zb_get_current_channel());
         } else {
-            ESP_LOGI(TAG, "Network steering was not successful (status: %d)", err_status);
+            ESP_LOGI(TAG, "Network steering was not successful (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_STEERING, 1000);
         }
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_HA_sample/HA_color_dimmable_switch/main/esp_zb_switch.c

@@ -126,7 +126,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             ESP_LOGI(TAG, "Start network formation");
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_FORMATION);
         } else {
-            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_BDB_SIGNAL_FORMATION:
@@ -139,7 +139,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
                      esp_zb_get_pan_id(), esp_zb_get_current_channel());
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING);
         } else {
-            ESP_LOGI(TAG, "Restart network formation (status: %d)", err_status);
+            ESP_LOGI(TAG, "Restart network formation (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_FORMATION, 1000);
         }
         break;
@@ -158,7 +158,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
         esp_zb_zdo_find_color_dimmable_light(&cmd_req, user_find_cb, NULL);
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_HA_sample/HA_on_off_light/main/esp_zb_light.c

@@ -64,7 +64,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING);
         } else {
             /* commissioning failed */
-            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_BDB_SIGNAL_STEERING:
@@ -76,12 +76,13 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
                      extended_pan_id[3], extended_pan_id[2], extended_pan_id[1], extended_pan_id[0],
                      esp_zb_get_pan_id(), esp_zb_get_current_channel());
         } else {
-            ESP_LOGI(TAG, "Network steering was not successful (status: %d)", err_status);
+            ESP_LOGI(TAG, "Network steering was not successful (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_STEERING, 1000);
         }
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_HA_sample/HA_on_off_switch/main/esp_zb_switch.c

@@ -94,7 +94,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             ESP_LOGI(TAG, "Start network formation");
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_FORMATION);
         } else {
-            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_BDB_SIGNAL_FORMATION:
@@ -107,7 +107,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
                      esp_zb_get_pan_id(), esp_zb_get_current_channel());
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING);
         } else {
-            ESP_LOGI(TAG, "Restart network formation (status: %d)", err_status);
+            ESP_LOGI(TAG, "Restart network formation (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_FORMATION, 1000);
         }
         break;
@@ -125,7 +125,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
         esp_zb_zdo_find_on_off_light(&cmd_req, user_find_cb, NULL);
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_cli/main/esp_zigbee_cli.c

@@ -69,9 +69,9 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
     case ESP_ZB_ZDO_SIGNAL_LEAVE:
         /* The ESP Zigbee CLI Agent will not attempt to rejoin the network after it receives the LEAVE command. */
         if (err_status == ESP_OK) {
-            ESP_LOGI(TAG, "leave network, status: %d", err_status);
+            ESP_LOGI(TAG, "leave network, status: %s", esp_err_to_name(err_status));
         } else {
-            ESP_LOGE(TAG, "Unable to leave network, status: %d", err_status);
+            ESP_LOGE(TAG, "Unable to leave network, status: %s", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_ZDO_SIGNAL_SKIP_STARTUP:
@@ -120,7 +120,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
         }
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_customized_devices/customized_client/main/esp_HA_customized_switch.c

@@ -78,6 +78,7 @@ static void bind_cb(esp_zb_zdp_status_t zdo_status, void *user_ctx)
         ESP_LOGI(TAG, "bind_cb status:%d and response from:0x%x,endpoint:%d", zdo_status, ((zdo_info_user_ctx_t *)user_ctx)->short_addr, ((zdo_info_user_ctx_t *)user_ctx)->endpoint);
         /* configure report attribute command */
         esp_zb_zcl_config_report_cmd_t report_cmd;
+        bool report_change = 0;
         report_cmd.zcl_basic_cmd.dst_addr_u.addr_short = on_off_light.short_addr;
         report_cmd.zcl_basic_cmd.dst_endpoint = on_off_light.endpoint;
         report_cmd.zcl_basic_cmd.src_endpoint = HA_ONOFF_SWITCH_ENDPOINT;
@@ -87,7 +88,7 @@ static void bind_cb(esp_zb_zdp_status_t zdo_status, void *user_ctx)
         report_cmd.attrType = ESP_ZB_ZCL_ATTR_TYPE_BOOL;
         report_cmd.min_interval = 0;
         report_cmd.max_interval = 30;
-        report_cmd.reportable_change = 0;
+        report_cmd.reportable_change = (void*)&report_change;
         esp_zb_zcl_config_report_cmd_req(&report_cmd);
     }
 }
@@ -192,7 +193,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
     case ESP_ZB_BDB_SIGNAL_DEVICE_REBOOT:
         if (err_status != ESP_OK) {
             /* commissioning failed */
-            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         } else {
             /* device auto start successfully and on a formed network */
             esp_zb_ieee_addr_t extended_pan_id;
@@ -222,7 +223,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             find_req.dst_nwk_addr = 0x0000;
             esp_zb_zdo_find_on_off_light(&find_req, user_find_cb, NULL);
         } else {
-            ESP_LOGI(TAG, "Network steering was not successful (status: %d)", err_status);
+            ESP_LOGI(TAG, "Network steering was not successful (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_STEERING, 1000);
         }
         break;
@@ -233,7 +234,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
         }
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }

examples/esp_zigbee_customized_devices/customized_server/main/esp_HA_customized_light.c

@@ -44,7 +44,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
             ESP_LOGI(TAG, "Start network formation");
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_FORMATION);
         } else {
-            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status);
+            ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status));
         }
         break;
     case ESP_ZB_BDB_SIGNAL_FORMATION:
@@ -57,7 +57,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
                      esp_zb_get_pan_id(), esp_zb_get_current_channel());
             esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING);
         } else {
-            ESP_LOGI(TAG, "Restart network formation (status: %d)", err_status);
+            ESP_LOGI(TAG, "Restart network formation (status: %s)", esp_err_to_name(err_status));
             esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_FORMATION, 1000);
         }
         break;
@@ -81,7 +81,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
         }
         break;
     default:
-        ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);
+        ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type,
+                 esp_err_to_name(err_status));
         break;
     }
 }