Skip to content

lib: update ZBOSS libraries #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edmont merged 3 commits into from
Oct 10, 2025
Merged

lib: update ZBOSS libraries #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c77c2e
lib: update ZBOSS libraries
edmont Oct 9, 2025
ece54f1
doc: update memory requirements
edmont Oct 10, 2025
268ee78
devicetree: format all files
edmont Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions docs/memory.rst
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions lib/zboss/include/osif/build_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
* Please use release scripts to update it's contents.
*
* Repositories:
* platform_ncs 391829ac38b02b52c5d2b7ae49b1dee480fe3ac1 https://projecttools.nordicsemi.no/bitbucket/scm/zoi/platform_ncs.git
* zboss-stack-src 48d7622eb0265c84d035a9bd8e7aca45e944701b https://projecttools.nordicsemi.no/bitbucket/scm/zoi/zboss_r23
* ncs-zigbee 06fcd30fae95b9d640e46061df37989389204f37 https://github.com/nrfconnect/ncs-zigbee
* nrf 7787b264984022cda64d9629278942053e6462a5 https://github.com/nrfconnect/sdk-nrf
* zephyr 1f8f3dc291420c70cd39e77a5cdc954561d4a08f https://github.com/nrfconnect/sdk-zephyr
* platform_ncs bda55fedb68afa19eb498a6a300a01d75fa7637b https://projecttools.nordicsemi.no/bitbucket/scm/zoi/platform_ncs.git
* zboss-stack-src 87a7db34b4812077e71e34527a91e374398aebd2 https://projecttools.nordicsemi.no/bitbucket/scm/zoi/zboss_r23
* ncs-zigbee 551a75f6e311c9e171e4c0868859e94532ac22fb https://github.com/nrfconnect/ncs-zigbee
* nrf 4ab7b98fc76f658249bd8553cf8f9253ff840a53 https://github.com/nrfconnect/sdk-nrf
* zephyr aa34a5632971262ce4002e73ed0fb09e9bd14808 https://github.com/nrfconnect/sdk-zephyr
* wfa-qt-control-app af011c8a8d338ba529f17aed2cc2ef4c1c591a58 https://github.com/nrfconnect/sdk-wi-fiquicktrack-controlappc
* mcuboot 12e5ee106034972b0f1074d6f2261b2b39d1501b https://github.com/nrfconnect/sdk-mcuboot
* qcbor 751d36583a9ce1a640900c57e13c9b6b8f3a2ba2 https://github.com/laurencelundblade/QCBOR
* mbedtls 98603a8c91660beac00e0ee1d76198fb7c4ed29b https://github.com/nrfconnect/sdk-mbedtls
* oberon-psa-crypto 21728cf8402ac567326d0d69eec891a2bfdb8ea3 https://github.com/nrfconnect/sdk-oberon-psa-crypto
* nrfxlib 756bcec432f49aa5def6f47d2d09272f8c4d9192 https://github.com/nrfconnect/sdk-nrfxlib
* trusted-firmware-m f2bf78452629355e4180dc36756f6c1becc819fa https://github.com/nrfconnect/sdk-trusted-firmware-m
* nrfxlib 1143aee1e0521b5309e891b44a0a8048f83074d2 https://github.com/nrfconnect/sdk-nrfxlib
* trusted-firmware-m e200da60e1c82bbf442fcaa9d03f2e5a7c246040 https://github.com/nrfconnect/sdk-trusted-firmware-m
* psa-arch-tests 3da9313e64806d352c519e3205e81cf959067588 https://github.com/nrfconnect/sdk-psa-arch-tests
* matter 684c8128ad203c86d1f058913dcd73fde63e9eaf https://github.com/nrfconnect/sdk-connectedhomeip
* matter 88e08ccd278ab8991632812d509b59ac726dccde https://github.com/nrfconnect/sdk-connectedhomeip
* soc-hwmv1 be0500992bd8c222118b651b88d1f3714855a3aa https://github.com/nrfconnect/sdk-soc-hwmv1
* cjson c6af068b7f05207b28d68880740e4b9ec1e4b50a https://github.com/nrfconnect/sdk-cjson
* azure-sdk-for-c 308c171cb4b5eed266649012a68406487ec81fb2 https://github.com/nrfconnect/azure-sdk-for-c
Expand All @@ -47,7 +47,7 @@
* cmsis-nn ea987c1ca661be723de83bd159aed815d6cbd430 https://github.com/zephyrproject-rtos/cmsis-nn
* edtt b9ca3c7030518f07b7937dacf970d37a47865a76 https://github.com/zephyrproject-rtos/edtt
* fatfs 427159bf95ea49b7680facffaa29ad506b42709b https://github.com/zephyrproject-rtos/fatfs
* hal_nordic 54bde38c6f6ffb3780b26ae728cf79426184384e https://github.com/zephyrproject-rtos/hal_nordic
* hal_nordic bc671cbc669b492144d021faab7df84e79fb0712 https://github.com/nrfconnect/sdk-hal_nordic
* hal_st b2f548fe672f24122c7f92027b2c9eeea8a0483a https://github.com/zephyrproject-rtos/hal_st
* hal_wurthelektronik e5bcb2eac1bb9639ce13b4dafc78eb254e014342 https://github.com/zephyrproject-rtos/hal_wurthelektronik
* hostap 44285310338f423021cc7df2c1056256882a00cc https://github.com/zephyrproject-rtos/hostap
Expand All @@ -70,16 +70,16 @@


/** ZBOSS build tag */
#define ZBOSS_BUILD_TAG "ncs_release-v4.2.2.1"
#define ZBOSS_BUILD_TAG "ncs_release-v4.2.2.3"

/** ZBOSS platform build tag */
#define ZBOSS_PLATFORM_BUILD_TAG "v4.2.2.0+v6.0.6"
#define ZBOSS_PLATFORM_BUILD_TAG "v4.2.2.0+v6.0.8"

/** ZBOSS build date (UTC) */
#define ZBOSS_BUILD_DATE 20250807
#define ZBOSS_BUILD_DATE 20251009

/** ZBOSS build time (UTC) */
#define ZBOSS_BUILD_TIME 091605
#define ZBOSS_BUILD_TIME 183922


#endif /* ZBOSS_BUILD_INFO_H__ */
4 changes: 2 additions & 2 deletions lib/zboss/include/osif/zb_revision_r22.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
*
* Note: This value is automatically updated by the release script.
*/
#define ZBOSS_PLATFORM_PATCH 6U
#define ZBOSS_PLATFORM_PATCH 8U

/**
* Patch version number of the ZBOSS core.
*
* Note: This value is automatically updated by the release script.
*/
#define ZBOSS_PATCH 0U
#define ZBOSS_PATCH 2U
Binary file modified lib/zboss/lib/cortex-m33/hard-float/libzboss.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/lib/cortex-m33/hard-float/libzboss.ed.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/lib/cortex-m4/hard-float/libzboss.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/lib/cortex-m4/hard-float/libzboss.ed.a
View file
Open in desktop
Binary file not shown.
57 changes: 49 additions & 8 deletions lib/zboss/src/commissioning/bdb/zdo_commissioning_bdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ static void bdb_network_formation_machine(zb_uint8_t param);
static void bdb_finding_n_binding_machine(zb_uint8_t param);
#endif

#if defined ZB_ROUTER_ROLE && defined NCP_MODE_HOST
static zb_bool_t bdb_after_mgmt_permit_joining_reopen_loc_done;
#endif

void bdb_initialization_procedure(zb_uint8_t param);
static void bdb_precomm_rejoin_over_all_channels(zb_uint8_t param, zb_uint16_t secure);
void bdb_network_steering_on_network(zb_uint8_t param);
Expand Down Expand Up @@ -1356,6 +1360,35 @@ void bdb_network_steering_on_network(zb_uint8_t param)
zb_zdo_mgmt_permit_joining_req(param, bdb_after_mgmt_permit_joining_cb);
}

#ifdef ZB_ROUTER_ROLE
static void bdb_after_mgmt_permit_joining_reopen_local(zb_uint8_t param)
{
zb_zdo_mgmt_permit_joining_req_param_t * req;

if (param)
{
#ifdef NCP_MODE_HOST
bdb_after_mgmt_permit_joining_reopen_loc_done = ZB_TRUE;
#endif

TRACE_MSG(TRACE_ZDO3, ">> bdb_after_mgmt_permit_joining_reopen_local, param %hd", (FMT__H, param));

req = ZB_BUF_GET_PARAM(param, zb_zdo_mgmt_permit_joining_req_param_t);
ZB_BZERO(req, sizeof(zb_zdo_mgmt_permit_joining_req_param_t));
req->permit_duration = ZB_BDBC_MIN_COMMISSIONING_TIME_S;
req->dest_addr = ZB_PIBCACHE_NETWORK_ADDRESS();

zb_zdo_mgmt_permit_joining_req(param, bdb_network_steering_finish);

TRACE_MSG(TRACE_ZDO3, "<< bdb_after_mgmt_permit_joining_reopen_local", (FMT__0));
}
else
{
zb_buf_get_out_delayed(bdb_after_mgmt_permit_joining_reopen_local);
}
}
#endif // ZB_ROUTER_ROLE

/*
Called when broadcasting PermitJoining finished
during EZ-Mode Nwk Steering for ZC or ZR:
Expand All @@ -1380,14 +1413,22 @@ void bdb_after_mgmt_permit_joining_cb(zb_uint8_t param)
#ifdef ZB_ROUTER_ROLE
if (ZB_IS_DEVICE_ZC_OR_ZR())
{
zb_zdo_mgmt_permit_joining_req_param_t *req = ZB_BUF_GET_PARAM(param,
zb_zdo_mgmt_permit_joining_req_param_t);

ZB_BZERO(req, sizeof(zb_zdo_mgmt_permit_joining_req_param_t));
req->permit_duration = ZB_BDBC_MIN_COMMISSIONING_TIME_S;
req->dest_addr = ZB_PIBCACHE_NETWORK_ADDRESS();

zb_zdo_mgmt_permit_joining_req(param, bdb_network_steering_finish);
#ifndef NCP_MODE_HOST
bdb_after_mgmt_permit_joining_reopen_local(param);
#else
/* For NCP-HOST we should avoid duplicating the triggering of the following
* request and use ZB_SCHEDULE_CALLBACK. This is due to the timing constraints
* of the serial interface.
*/
if (bdb_after_mgmt_permit_joining_reopen_loc_done)
{
TRACE_MSG(TRACE_ERROR, "Already done: bdb_after_mgmt_permit_joining_reopen_local", (FMT__0));
}
else
{
ZB_SCHEDULE_CALLBACK(bdb_after_mgmt_permit_joining_reopen_local, 0);
}
#endif
param = 0;
}
#endif
Expand Down
3 changes: 3 additions & 0 deletions lib/zboss/src/include/zb_g_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,9 @@ typedef struct zb_reg_api_s

zb_bool_t is_rejoin_failure; /*!< Set a rejoining status for a test, and should be reset from a test */
zb_bool_t lock_nwk_data_processing; /*!< NWK data processing will be locked, ZB_NWK_IN_Q won't be processed, be careful not to conflict with zb_nlme_start_router_request */
zb_bool_t duplicate_nwk_comm_req_with_invalid_status; /*!< Duplicates received Network Commissioning Request, prepares and sends Response with invalid MAC status, and postpones processing of the original Request */
zb_bool_t enable_delay_nwk_comm_rsp_handling; /*!< Enables delaying Network Commissioning Response with error status processing while setting PIB attributes */
zb_bool_t delay_nwk_comm_rsp_handling; /*!< Delays processing Network Commissioning Response while setting PIB attributes */
} zb_reg_api_t;

#define ZB_REGRESSION_TESTS_API() ZG->reg_api
Expand Down
Binary file modified lib/zboss/trace/lib/cortex-m33/hard-float/libzboss.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/trace/lib/cortex-m33/hard-float/libzboss.ed.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/trace/lib/cortex-m4/hard-float/libzboss.a
View file
Open in desktop
Binary file not shown.
Binary file modified lib/zboss/trace/lib/cortex-m4/hard-float/libzboss.ed.a
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion samples/light_bulb/boards/nrf52840dk_nrf52840.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
low-power-enable;
};
};

};

&timer2 {
Expand Down
2 changes: 1 addition & 1 deletion samples/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/ {
pwmleds {
compatible = "pwm-leds";

pwm_led3: pwm_led_3 {
pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
};
Expand Down Expand Up @@ -37,7 +38,6 @@
low-power-enable;
};
};

};

&timer2 {
Expand Down
12 changes: 6 additions & 6 deletions samples/light_bulb/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/ {

chosen {
ncs,zigbee-timer = &timer20;
};

pwmleds {
compatible = "pwm-leds";

pwm_led3: pwm_led_3 {
pwms = <&pwm20 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
};
Expand All @@ -22,13 +21,13 @@
// restore full RRAM and SRAM space - by default some parts are dedicated to FLPR
&cpuapp_rram {
reg = <0x0 DT_SIZE_K(1012)>;
// Resize storage_partition to fit within memory boundaries

// Resize storage_partition to fit within memory boundaries
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

storage_partition: partition@f6000 {
label = "storage";
reg = <0xF6000 DT_SIZE_K(28)>;
Expand All @@ -38,7 +37,7 @@

&cpuapp_sram {
reg = <0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
};

// TODO: re-enable HWFC once it's fixed
Expand All @@ -59,6 +58,7 @@
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
};
};

pwm_sleep: pwm_sleep {
group1 {
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
Expand Down
6 changes: 3 additions & 3 deletions samples/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/ {

chosen {
ncs,zigbee-timer = &timer20;
};

pwmleds {
compatible = "pwm-leds";

pwm_led3: pwm_led_3 {
pwms = <&pwm20 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
};
Expand All @@ -26,7 +25,7 @@

&cpuapp_sram {
reg = <0x20000000 DT_SIZE_K(256)>;
ranges = <0x0 0x20000000 0x40000>;
ranges = <0x0 0x20000000 0x40000>;
};

// TODO: re-enable HWFC once it's fixed
Expand All @@ -47,6 +46,7 @@
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
};
};

pwm_sleep: pwm_sleep {
group1 {
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
Expand Down
2 changes: 1 addition & 1 deletion samples/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
ncs,zigbee-timer = &timer2;
Expand Down
12 changes: 6 additions & 6 deletions samples/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/ {

chosen {
ncs,zigbee-timer = &timer20;
};

pwmleds {
compatible = "pwm-leds";

pwm_led3: pwm_led_3 {
pwms = <&pwm20 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
};
Expand All @@ -22,13 +21,13 @@
// restore full RRAM and SRAM space - by default some parts are dedicated to FLPR
&cpuapp_rram {
reg = <0x0 DT_SIZE_K(1012)>;
// Resize storage_partition to fit within memory boundaries

// Resize storage_partition to fit within memory boundaries
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

storage_partition: partition@f6000 {
label = "storage";
reg = <0xF6000 DT_SIZE_K(28)>;
Expand All @@ -38,7 +37,7 @@

&cpuapp_sram {
reg = <0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
};

// TODO: re-enable HWFC once it's fixed
Expand All @@ -59,6 +58,7 @@
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
};
};

pwm_sleep: pwm_sleep {
group1 {
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
Expand Down
12 changes: 6 additions & 6 deletions samples/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp_fota.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/ {

chosen {
ncs,zigbee-timer = &timer20;
nordic,pm-ext-flash = &mx25r64;
};

pwmleds {
compatible = "pwm-leds";

pwm_led3: pwm_led_3 {
pwms = <&pwm20 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
};
Expand All @@ -23,13 +22,13 @@
// restore full RRAM and SRAM space - by default some parts are dedicated to FLPR
&cpuapp_rram {
reg = <0x0 DT_SIZE_K(1012)>;
// Resize storage_partition to fit within memory boundaries

// Resize storage_partition to fit within memory boundaries
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

storage_partition: partition@f6000 {
label = "storage";
reg = <0xF6000 DT_SIZE_K(28)>;
Expand All @@ -39,7 +38,7 @@

&cpuapp_sram {
reg = <0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
};

// TODO: re-enable HWFC once it's fixed
Expand All @@ -60,6 +59,7 @@
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
};
};

pwm_sleep: pwm_sleep {
group1 {
psels = <NRF_PSEL(PWM_OUT1, 1, 10)>;
Expand Down
Loading