zboss: version v3.11.5.0+5.1.6

- ZBOSS sources: `617305eb6e51ea20153fc520392177f56373cecf` - Minor modification: trace mask extended to include more subsystems Signed-off-by: Eduardo Montoya <[email protected]> (cherry picked from commit 8c5a403)
nrfconnect · Nov 5, 2024 · 8a66bdb · 8a66bdb
1 parent 56568d9
commit 8a66bdb
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 56 deletions.
diff --git a/zboss/production/include/osif/build_info.h b/zboss/production/include/osif/build_info.h
@@ -11,78 +11,74 @@
  * Please use release scripts to update it's contents.
  *
  * Repositories:
- * platform_ncs       57bb5724114023a002caa10373d4694a3940d34b https://projecttools.nordicsemi.no/bitbucket/scm/ZOI/platform_ncs.git
+ * platform_ncs       f1ce38e33a03c03fb922eea2827c9bf978d16fb1 https://projecttools.nordicsemi.no/bitbucket/scm/zoi/platform_ncs.git
  * zboss-stack-src    617305eb6e51ea20153fc520392177f56373cecf https://projecttools.nordicsemi.no/bitbucket/scm/zoi/zboss_stable
- * zboss-stack-doc    e27795fd73b18a7f3cd497ef2ed3092e569c292a https://projecttools.nordicsemi.no/bitbucket/scm/zoi/zboss_doc
- * nrf                3b6131458487e0cc1df29a539813a26cd50d2355 https://github.com/AdamZelikNS/sdk-nrf
- * zephyr             bf1bd22933927d0444bede472f363cd029262d11 https://github.com/nrfconnect/sdk-zephyr
- * hostap             e2b94fdfa8ffce51e7f6d096c858b71b2d8c1a14 https://github.com/nrfconnect/sdk-hostap
- * wfa-qt-control-app 9f91589a5be2b95a77a2b109901aad3298255315 https://github.com/nrfconnect/sdk-wi-fiquicktrack-controlappc
- * mcuboot            f1e1675630561a745d28107144e9a863860204cf https://github.com/nrfconnect/sdk-mcuboot
+ * zboss-stack-doc    d185acb78465fce1252453a93635fc4e2aac2a68 https://projecttools.nordicsemi.no/bitbucket/scm/zoi/zboss_doc
+ * nrf                21f851fa7d3c91f0e45c67f741bbf9e8efea9fc9 https://github.com/nrfconnect/sdk-nrf
+ * zephyr             bc59fe3cf65c054b13305aa977ecddddf7cf42e4 https://github.com/nrfconnect/sdk-zephyr
+ * wfa-qt-control-app af011c8a8d338ba529f17aed2cc2ef4c1c591a58 https://github.com/nrfconnect/sdk-wi-fiquicktrack-controlappc
+ * mcuboot            c9e44365fd6c7bb1c95000a2d38a6bf263298126 https://github.com/nrfconnect/sdk-mcuboot
  * qcbor              751d36583a9ce1a640900c57e13c9b6b8f3a2ba2 https://github.com/laurencelundblade/QCBOR
- * mbedtls            72868c6f1421afa92cba9f6fe6d1a3f108c174b7 https://github.com/nrfconnect/sdk-mbedtls
- * oberon-psa-crypto  e0800ec5283ba89b2619919ef1889d98a9a79132 https://github.com/nrfconnect/sdk-oberon-psa-crypto
- * nrfxlib            caf2d2988959c82640d67a70ddc93f38a4c9ad24 https://github.com/nrfconnect/sdk-nrfxlib
- * trusted-firmware-m 92a5b4ffa527a1d9fb00924c227536e46169bd6e https://github.com/nrfconnect/sdk-trusted-firmware-m
- * psa-arch-tests     94a349db22cd0e44136c281724ffc71b6e7391c3 https://github.com/nrfconnect/sdk-psa-arch-tests
- * matter             579d8eebc3352ec1cc342ade2570897daa5ccdab https://github.com/nrfconnect/sdk-connectedhomeip
+ * mbedtls            98603a8c91660beac00e0ee1d76198fb7c4ed29b https://github.com/nrfconnect/sdk-mbedtls
+ * oberon-psa-crypto  b41e899e7302462eb952b0b6a7c6903e368fb395 https://github.com/nrfconnect/sdk-oberon-psa-crypto
+ * nrfxlib            999c8a81426ed8d88915e008bfc13b8d33af1361 https://github.com/nrfconnect/sdk-nrfxlib
+ * trusted-firmware-m 8c7fae3936da02b7db4f5c8aba174b252a2b326e https://github.com/nrfconnect/sdk-trusted-firmware-m
+ * psa-arch-tests     3da9313e64806d352c519e3205e81cf959067588 https://github.com/nrfconnect/sdk-psa-arch-tests
+ * matter             f67310e6166ce4738985168fb3d74c5314539688 https://github.com/nrfconnect/sdk-connectedhomeip
+ * soc-hwmv1          32b1ee3e4576815bebf9ce3e8d63efe73bd89c62 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
  * cirrus             3873a08377d93a479105a75ac390d3bbcd31d690 https://github.com/nrfconnect/sdk-mcu-drivers
- * openthread         a57d927b0ace94972a49ea2672c9073b88b86377 https://github.com/nrfconnect/sdk-openthread
- * suit-generator     15711cccd7700652ca3906b86d4d58cfe340e70c https://github.com/nrfconnect/suit-generator
- * suit-processor     dcb84006795fe99b497e044f3435988d206ac177 https://github.com/nrfconnect/suit-processor
+ * openthread         ee86dc26d71c9ef021fad8a28898829df772011a https://github.com/nrfconnect/sdk-openthread
+ * suit-generator     a9b80a109a5da13101b69120f678add48d68cc57 https://github.com/nrfconnect/suit-generator
+ * suit-processor     7d94614168540359651391e64aa4de6515e43fca https://github.com/nrfconnect/suit-processor
  * cmock              f65066f15d8248e6dcb778efb8739904a4512087 https://github.com/ThrowTheSwitch/cmock
- * memfault-firmware-sdk 3d51c80bc58933671403eca7c5250a9b03294c5e https://github.com/memfault/memfault-firmware-sdk
- * bsim               68f6282c6a7f54641b75f5f9fc953c85e272a983 https://github.com/BabbleSim/bsim_west
+ * memfault-firmware-sdk 47d69c572c44c19d23936193629e19372e22c7e2 https://github.com/memfault/memfault-firmware-sdk
+ * bsim               9ee22c707970f6621adba0375841c0a609e24628 https://github.com/BabbleSim/bsim_west
  * coremark           d5fad6bd094899101a4e5fd53af7298160ced6ab https://github.com/eembc/coremark
  * canopennode        dec12fa3f0d790cafa8414a4c2930ea71ab72ffd https://github.com/zephyrproject-rtos/canopennode
  * chre               3b32c76efee705af146124fb4190f71be5a4e36e https://github.com/zephyrproject-rtos/chre
- * lz4                8e303c264fc21c2116dc612658003a22e933124d https://github.com/zephyrproject-rtos/lz4
- * nanopb             7f88274070afa5edfaf608f4d8e32f3d3c1de139 https://github.com/zephyrproject-rtos/nanopb
- * tf-m-tests         85f533a4aa5b4fe31247676a923db7453eb4429c https://github.com/zephyrproject-rtos/tf-m-tests
+ * lz4                11b8a1e22fa651b524494e55d22b69d3d9cebcfd https://github.com/zephyrproject-rtos/lz4
+ * nanopb             4474bd35bd39de067f0532a1b19ce3aed9ed9807 https://github.com/zephyrproject-rtos/nanopb
+ * tf-m-tests         d552e4f18b92032bd335d5e3aa312f6acd82a83b https://github.com/zephyrproject-rtos/tf-m-tests
  * zscilib            ee1b287d9dd07208d2cc52284240ac25bb66eae3 https://github.com/zephyrproject-rtos/zscilib
  * cmsis              4b96cbb174678dcd3ca86e11e1f24bc5f8726da0 https://github.com/zephyrproject-rtos/cmsis
  * cmsis-dsp          6489e771e9c405f1763b52d64a3f17a1ec488ace https://github.com/zephyrproject-rtos/cmsis-dsp
- * cmsis-nn           0c8669d81381ccf3b1a01d699f3b68b50134a99f https://github.com/zephyrproject-rtos/cmsis-nn
- * edtt               64e5105ad82390164fb73fc654be3f73a608209a https://github.com/zephyrproject-rtos/edtt
+ * 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         fc02d66798f691b66bd6b0236e63082a9c498bbf https://github.com/zephyrproject-rtos/hal_nordic
- * hal_st             b77157f6bc4395e398d90ab02a7d2cbc01ab2ce7 https://github.com/zephyrproject-rtos/hal_st
+ * hal_nordic         c1c448df1b751c1c03229a447a2216f29e6aaf99 https://github.com/zephyrproject-rtos/hal_nordic
+ * hal_st             b2f548fe672f24122c7f92027b2c9eeea8a0483a https://github.com/zephyrproject-rtos/hal_st
  * hal_wurthelektronik e5bcb2eac1bb9639ce13b4dafc78eb254e014342 https://github.com/zephyrproject-rtos/hal_wurthelektronik
- * libmetal           243eed541b9c211a2ce8841c788e62ddce84425e https://github.com/zephyrproject-rtos/libmetal
+ * hostap             44285310338f423021cc7df2c1056256882a00cc https://github.com/zephyrproject-rtos/hostap
+ * libmetal           a6851ba6dba8c9e87d00c42f171a822f7a29639b https://github.com/zephyrproject-rtos/libmetal
  * liblc3             1a5938ebaca4f13fe79ce074f5dee079783aa29f https://github.com/zephyrproject-rtos/liblc3
- * littlefs           408c16a909dd6cf128874a76f21c793798c9e423 https://github.com/zephyrproject-rtos/littlefs
+ * littlefs           009bcff0ed4853a53df8256039fa815bda6854dd https://github.com/zephyrproject-rtos/littlefs
  * loramac-node       fb00b383072518c918e2258b0916c996f2d4eebe https://github.com/zephyrproject-rtos/loramac-node
  * lvgl               2b498e6f36d6b82ae1da12c8b7742e318624ecf5 https://github.com/zephyrproject-rtos/lvgl
  * mipi-sys-t         71ace1f5caa03e56c8740a09863e685efb4b2360 https://github.com/zephyrproject-rtos/mipi-sys-t
- * net-tools          7c7a856814d7f27509c8511fef14cec21f7d0c30 https://github.com/zephyrproject-rtos/net-tools
- * nrf_hw_models      36b12714a5ed32450d907c89bb118f6280da3483 https://github.com/zephyrproject-rtos/nrf_hw_models
- * open-amp           da78aea63159771956fe0c9263f2e6985b66e9d5 https://github.com/zephyrproject-rtos/open-amp
- * picolibc           764ef4e401a8f4c6a86ab723533841f072885a5b https://github.com/zephyrproject-rtos/picolibc
+ * net-tools          93acc8bac4661e74e695eb1aea94c7c5262db2e2 https://github.com/zephyrproject-rtos/net-tools
+ * nrf_hw_models      eeed2591d38e5e9bf89658df67555f2777249fc0 https://github.com/zephyrproject-rtos/nrf_hw_models
+ * open-amp           b735edbc739ad59156eb55bb8ce2583d74537719 https://github.com/zephyrproject-rtos/open-amp
+ * picolibc           06bde1fd7531b1f788f6e42b6f7b358c0fe4f814 https://github.com/zephyrproject-rtos/picolibc
  * segger             b011c45b585e097d95d9cf93edf4f2e01588d3cd https://github.com/zephyrproject-rtos/segger
  * tinycrypt          1012a3ebee18c15ede5efc8332ee2fc37817670f https://github.com/zephyrproject-rtos/tinycrypt
- * uoscore-uedhoc     150f4eb2955eaf36ac0f9519d4f4f58d5ade5740 https://github.com/zephyrproject-rtos/uoscore-uedhoc
- * zcbor              75d088037eb237b18e7ec1f47c9ce494b9b95aab https://github.com/zephyrproject-rtos/zcbor
- *
- * Note:
- * Commit 3b6131458487e0cc1df29a539813a26cd50d2355 in https://github.com/AdamZelikNS/sdk-nrf is based
- * on f1db33f3b677ad19db665d4c6e946263a47b4f52 in https://github.com/nrfconnect/sdk-nrf and additional
- * changes at the top apply to the subsys/zigbee/osif sources and are related to Factory Reset functionality.
+ * uoscore-uedhoc     84ef879a46d7bfd9a423fbfb502b04289861f9ea https://github.com/zephyrproject-rtos/uoscore-uedhoc
+ * zcbor              47f34dd7f5284e8750b5a715dee7f77c6c5bdc3f https://github.com/zephyrproject-rtos/zcbor
  */
 
 
 /** ZBOSS build tag */
-#define ZBOSS_BUILD_TAG "ncs_release-3.11.4.0"
+#define ZBOSS_BUILD_TAG "ncs_release-3.11.5.0"
 
 /** ZBOSS platform build tag */
-#define ZBOSS_PLATFORM_BUILD_TAG "v3.11.4.0+v5.1.5"
+#define ZBOSS_PLATFORM_BUILD_TAG "v3.11.5.0+v5.1.6"
 
 /** ZBOSS build date (UTC) */
-#define ZBOSS_BUILD_DATE 20240606
+#define ZBOSS_BUILD_DATE 20241104
 
 /** ZBOSS build time (UTC) */
-#define ZBOSS_BUILD_TIME 112744
+#define ZBOSS_BUILD_TIME 094223
 
 
 #endif /* ZBOSS_BUILD_INFO_H__ */
diff --git a/zboss/production/include/osif/libzboss_config.ed.h b/zboss/production/include/osif/libzboss_config.ed.h
@@ -408,8 +408,7 @@
 /**
  * Length of the internal ZBOSS MAC TX queue
  *
- * The value of NRF_802154_RX_BUFFERS (ZIGBEE_RX_QUEUE_LENGTH in nRF5 SDK)
- * should not be greater than ZB_MAC_QUEUE_SIZE.
+ * The value of NET_PKT_RX_COUNT should not be greater than ZB_MAC_QUEUE_SIZE.
  * If the node is flooded with requests, that require a response to be sent,
  * the node should be able to schedule responses for each buffer,
  * stored inside MAC LL RX queue.

diff --git a/zboss/production/include/osif/libzboss_config.h b/zboss/production/include/osif/libzboss_config.h
@@ -408,8 +408,7 @@
 /**
  * Length of the internal ZBOSS MAC TX queue
  *
- * The value of NRF_802154_RX_BUFFERS (ZIGBEE_RX_QUEUE_LENGTH in nRF5 SDK)
- * should not be greater than ZB_MAC_QUEUE_SIZE.
+ * The value of NET_PKT_RX_COUNT should not be greater than ZB_MAC_QUEUE_SIZE.
  * If the node is flooded with requests, that require a response to be sent,
  * the node should be able to schedule responses for each buffer,
  * stored inside MAC LL RX queue.

diff --git a/zboss/production/include/osif/mac_platform.h b/zboss/production/include/osif/mac_platform.h
@@ -21,8 +21,6 @@
 #define ZB_AUTO_ACK_TX
 #define ZB_MAC_AUTO_ACK_RECV
 #define ZB_MANUAL_ACK
-#define ZB_MANUAL_ACK_TIMEOUT
-#define MAC_ACK_PARSE_BY_INTR
 
 /* gpTxOffset should be calibrated for each HW/SW variant.
  * The reason is that ZB_GPD_TX_OFFSET_US is used from ZGP stub during Green Power frame transmitting,

diff --git a/zboss/production/include/osif/zb_revision_r22.h b/zboss/production/include/osif/zb_revision_r22.h
@@ -29,11 +29,11 @@
  *
  * Note: This value is automatically updated by the release script.
  */
-#define ZBOSS_PLATFORM_PATCH 5U
+#define ZBOSS_PLATFORM_PATCH 6U
 
 /**
  * Patch version number of the ZBOSS core.
  *
  * Note: This value is automatically updated by the release script.
  */
-#define ZBOSS_PATCH 4U
+#define ZBOSS_PATCH 5U
diff --git a/zboss/production/lib/cortex-m33/hard-float/libgppb.a b/zboss/production/lib/cortex-m33/hard-float/libgppb.a
diff --git a/zboss/production/lib/cortex-m33/hard-float/libncp-dev.a b/zboss/production/lib/cortex-m33/hard-float/libncp-dev.a
diff --git a/zboss/production/lib/cortex-m33/hard-float/libncp-dev.ed.a b/zboss/production/lib/cortex-m33/hard-float/libncp-dev.ed.a
diff --git a/zboss/production/lib/cortex-m33/hard-float/libzboss.a b/zboss/production/lib/cortex-m33/hard-float/libzboss.a
diff --git a/zboss/production/lib/cortex-m33/hard-float/libzboss.ed.a b/zboss/production/lib/cortex-m33/hard-float/libzboss.ed.a
diff --git a/zboss/production/lib/cortex-m4/hard-float/libgppb.a b/zboss/production/lib/cortex-m4/hard-float/libgppb.a
diff --git a/zboss/production/lib/cortex-m4/hard-float/libncp-dev.a b/zboss/production/lib/cortex-m4/hard-float/libncp-dev.a
diff --git a/zboss/production/lib/cortex-m4/hard-float/libncp-dev.ed.a b/zboss/production/lib/cortex-m4/hard-float/libncp-dev.ed.a
diff --git a/zboss/production/lib/cortex-m4/hard-float/libzboss.a b/zboss/production/lib/cortex-m4/hard-float/libzboss.a
diff --git a/zboss/production/lib/cortex-m4/hard-float/libzboss.ed.a b/zboss/production/lib/cortex-m4/hard-float/libzboss.ed.a
diff --git a/zboss/production/trace/include/libzboss_config.ed.h b/zboss/production/trace/include/libzboss_config.ed.h
@@ -97,7 +97,7 @@
  *
  * Note: For general debugging purposes, please use 0x00000C48.
  */
-#define CONFIG_ZB_TRACE_MASK 0xFFFF
+#define CONFIG_ZB_TRACE_MASK 0xFFFFFFFF
 
 /**
  * Max compiled-in log level for ZBOSS traces - Off
@@ -408,8 +408,7 @@
 /**
  * Length of the internal ZBOSS MAC TX queue
  *
- * The value of NRF_802154_RX_BUFFERS (ZIGBEE_RX_QUEUE_LENGTH in nRF5 SDK)
- * should not be greater than ZB_MAC_QUEUE_SIZE.
+ * The value of NET_PKT_RX_COUNT should not be greater than ZB_MAC_QUEUE_SIZE.
  * If the node is flooded with requests, that require a response to be sent,
  * the node should be able to schedule responses for each buffer,
  * stored inside MAC LL RX queue.

diff --git a/zboss/production/trace/include/libzboss_config.h b/zboss/production/trace/include/libzboss_config.h
@@ -97,7 +97,7 @@
  *
  * Note: For general debugging purposes, please use 0x00000C48.
  */
-#define CONFIG_ZB_TRACE_MASK 0xFFFF
+#define CONFIG_ZB_TRACE_MASK 0xFFFFFFFF
 
 /**
  * Max compiled-in log level for ZBOSS traces - Off
@@ -408,8 +408,7 @@
 /**
  * Length of the internal ZBOSS MAC TX queue
  *
- * The value of NRF_802154_RX_BUFFERS (ZIGBEE_RX_QUEUE_LENGTH in nRF5 SDK)
- * should not be greater than ZB_MAC_QUEUE_SIZE.
+ * The value of NET_PKT_RX_COUNT should not be greater than ZB_MAC_QUEUE_SIZE.
  * If the node is flooded with requests, that require a response to be sent,
  * the node should be able to schedule responses for each buffer,
  * stored inside MAC LL RX queue.

diff --git a/zboss/production/trace/lib/cortex-m33/hard-float/libgppb.a b/zboss/production/trace/lib/cortex-m33/hard-float/libgppb.a
diff --git a/zboss/production/trace/lib/cortex-m33/hard-float/libncp-dev.a b/zboss/production/trace/lib/cortex-m33/hard-float/libncp-dev.a
diff --git a/zboss/production/trace/lib/cortex-m33/hard-float/libncp-dev.ed.a b/zboss/production/trace/lib/cortex-m33/hard-float/libncp-dev.ed.a
diff --git a/zboss/production/trace/lib/cortex-m33/hard-float/libzboss.a b/zboss/production/trace/lib/cortex-m33/hard-float/libzboss.a
diff --git a/zboss/production/trace/lib/cortex-m33/hard-float/libzboss.ed.a b/zboss/production/trace/lib/cortex-m33/hard-float/libzboss.ed.a
diff --git a/zboss/production/trace/lib/cortex-m4/hard-float/libgppb.a b/zboss/production/trace/lib/cortex-m4/hard-float/libgppb.a
diff --git a/zboss/production/trace/lib/cortex-m4/hard-float/libncp-dev.a b/zboss/production/trace/lib/cortex-m4/hard-float/libncp-dev.a
diff --git a/zboss/production/trace/lib/cortex-m4/hard-float/libncp-dev.ed.a b/zboss/production/trace/lib/cortex-m4/hard-float/libncp-dev.ed.a
diff --git a/zboss/production/trace/lib/cortex-m4/hard-float/libzboss.a b/zboss/production/trace/lib/cortex-m4/hard-float/libzboss.a
diff --git a/zboss/production/trace/lib/cortex-m4/hard-float/libzboss.ed.a b/zboss/production/trace/lib/cortex-m4/hard-float/libzboss.ed.a