Merge branch 'release/esp-zigbee-sdk-v1.1.2' into 'master'

esp-zboss-lib: release/v1.1.2(af7a8c4d) See merge request espressif/esp-zboss-lib!60
espressif · Feb 23, 2024 · 838714a · 838714a
2 parents 3b20a39 + 6670135
commit 838714a
Show file tree

Hide file tree

Showing 28 changed files with 13 additions and 8 deletions.
diff --git a/idf_component.yml b/idf_component.yml
@@ -1,4 +1,4 @@
-version: 1.1.1
+version: 1.1.2
 description: esp-zboss library component
 url: https://github.com/espressif/esp-zboss-lib
 dependencies:

diff --git a/include/zb_config.h b/include/zb_config.h
@@ -1053,11 +1053,13 @@ ZB_ED_RX_OFF_WHEN_IDLE
 /** @endcond */ /* DOXYGEN_INTERNAL_DOC */
 /* Some defaults for ZDO startup */
 
+uint8_t bdb_get_scan_duration(void);
 #ifndef ZB_TRACE_LEVEL
 /**
    NWK: default energy/active scan duration
 */
-#define ZB_DEFAULT_SCAN_DURATION 4U
+#define ZB_DEFAULT_SCAN_DURATION_VALUE 4U
+#define ZB_DEFAULT_SCAN_DURATION       bdb_get_scan_duration()
 
 #ifdef ZB_SUBGHZ_BAND_ENABLED
 /** @cond DOXYGEN_SUBGHZ_FEATURE */
@@ -1073,13 +1075,16 @@ ZB_ED_RX_OFF_WHEN_IDLE
 #ifndef ZB_NSNG
 /* SNCP release build has enabled trace and in the same time requires to have scan duration value set to 3 */
 #ifdef SNCP_MODE
-#define ZB_DEFAULT_SCAN_DURATION 3U
+#define ZB_DEFAULT_SCAN_DURATION_VALUE 3U
+#define ZB_DEFAULT_SCAN_DURATION       bdb_get_scan_duration()
 #else
-#define ZB_DEFAULT_SCAN_DURATION 3U
+#define ZB_DEFAULT_SCAN_DURATION_VALUE 3U
+#define ZB_DEFAULT_SCAN_DURATION       bdb_get_scan_duration()
 #endif /* SNCP_MODE */
 #else
 /* Increase scan duration for NSNG: usually it runs with high trace level, so we can miss beacons if scan too fast */
-#define ZB_DEFAULT_SCAN_DURATION 6U
+#define ZB_DEFAULT_SCAN_DURATION_VALUE 6U
+#define ZB_DEFAULT_SCAN_DURATION       bdb_get_scan_duration()
 #endif
 
 #if defined ZB_SUBGHZ_BAND_ENABLED

diff --git a/include/zb_vendor_default.h b/include/zb_vendor_default.h
@@ -65,7 +65,7 @@
 #define ZGP_CLUSTER_TEST
 #define ZB_ZGP_SKIP_GPDF_ON_NWK_LAYER
 #define ZB_ZGP_RUNTIME_WORK_MODE_WITH_PROXIES
-#define ZB_ZGP_PROXY_TBL_SIZE 4
+#define ZB_ZGP_PROXY_TBL_SIZE 8
 #endif /* CONFIG_ZB_GP_ENABLED */
 
 /* Device support */

diff --git a/include/zgp/zgp_internal.h b/include/zgp/zgp_internal.h
@@ -108,8 +108,8 @@ typedef ZB_PACKED_PRE struct zb_zgp_cluster_s
   zb_uint8_t  gps_commissioning_exit_mode; /**< @see zgp_commissioning_exit_mode_t  */
   zb_uint8_t  gps_security_level;
   zb_uint16_t gps_commissioning_window;
-  /* let's align it to 4 bytes (38 + 2) */
-  zb_uint16_t align_dummy;
+  /* let's align it to 16 bytes (38 + 10) */
+  zb_uint16_t align_dummy[5];
 } ZB_PACKED_STRUCT zb_zgp_cluster_t;
 
 typedef struct zb_zgp_tbl_array_s

diff --git a/lib/esp32/libzboss_port.a b/lib/esp32/libzboss_port.a
diff --git a/lib/esp32/libzboss_stack.zczr.a b/lib/esp32/libzboss_stack.zczr.a
diff --git a/lib/esp32/libzboss_stack.zczr.trace.a b/lib/esp32/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32c3/libzboss_port.a b/lib/esp32c3/libzboss_port.a
diff --git a/lib/esp32c3/libzboss_stack.zczr.a b/lib/esp32c3/libzboss_stack.zczr.a
diff --git a/lib/esp32c3/libzboss_stack.zczr.trace.a b/lib/esp32c3/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32c6/libzboss_port.a b/lib/esp32c6/libzboss_port.a
diff --git a/lib/esp32c6/libzboss_stack.ed.a b/lib/esp32c6/libzboss_stack.ed.a
diff --git a/lib/esp32c6/libzboss_stack.ed.trace.a b/lib/esp32c6/libzboss_stack.ed.trace.a
diff --git a/lib/esp32c6/libzboss_stack.gpd.a b/lib/esp32c6/libzboss_stack.gpd.a
diff --git a/lib/esp32c6/libzboss_stack.zczr.a b/lib/esp32c6/libzboss_stack.zczr.a
diff --git a/lib/esp32c6/libzboss_stack.zczr.trace.a b/lib/esp32c6/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32h2/libzboss_port.a b/lib/esp32h2/libzboss_port.a
diff --git a/lib/esp32h2/libzboss_stack.ed.a b/lib/esp32h2/libzboss_stack.ed.a
diff --git a/lib/esp32h2/libzboss_stack.ed.trace.a b/lib/esp32h2/libzboss_stack.ed.trace.a
diff --git a/lib/esp32h2/libzboss_stack.gpd.a b/lib/esp32h2/libzboss_stack.gpd.a
diff --git a/lib/esp32h2/libzboss_stack.zczr.a b/lib/esp32h2/libzboss_stack.zczr.a
diff --git a/lib/esp32h2/libzboss_stack.zczr.trace.a b/lib/esp32h2/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32s2/libzboss_port.a b/lib/esp32s2/libzboss_port.a
diff --git a/lib/esp32s2/libzboss_stack.zczr.a b/lib/esp32s2/libzboss_stack.zczr.a
diff --git a/lib/esp32s2/libzboss_stack.zczr.trace.a b/lib/esp32s2/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32s3/libzboss_port.a b/lib/esp32s3/libzboss_port.a
diff --git a/lib/esp32s3/libzboss_stack.zczr.a b/lib/esp32s3/libzboss_stack.zczr.a
diff --git a/lib/esp32s3/libzboss_stack.zczr.trace.a b/lib/esp32s3/libzboss_stack.zczr.trace.a