Skip to content

Commit

Permalink
zboss: version v3.11.3.0+5.1.4
Browse files Browse the repository at this point in the history 
- ZBOSS sources: 5c339a77a158b29b0072141573e9f7e661cac96c

Signed-off-by: Eduardo Montoya <[email protected]>
  • Loading branch information
@edmont @jfischer-no
edmont authored and jfischer-no committed Mar 5, 2024
1 parent 0303c5f commit 5ad13ee
Show file tree
Hide file tree
Showing 97 changed files with 2,654 additions and 794 deletions.
17 changes: 17 additions & 0 deletions zboss/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,28 @@ All notable changes to this project in the |NCS| are documented in this file.
nRF Connect SDK v2.6.0
**********************

Updated
=======

* The ZBOSS stack to version ``3.11.3.0+5.1.4``.
For detailed information, see `ZBOSS stack release notes`_ for the |NCS| v2.6.0 release.

Removed
=======

* Precompiled development ZBOSS libraries.

Bug fixes
=========

* Fixed security vulnerabilities.
* Fixed an issue with group command with group ID 0xFFF7.
* Fixed an issue with incorrect access type in Zigbee Discover Attributes Extended Response.
* Fixed an issue with incorrect handling of two "move to color" commands received in a row.
* Fixed an issue with incorrect validation of Manufacturer-specific attribute bit.
* Fixed an issue with incorrect response of ZC to beacon when joining is open.
* Fixed an issue that prevented defining individual reporting contexts when multiple endpoints are implemented.

nRF Connect SDK v2.3.0
**********************

Expand Down
226 changes: 226 additions & 0 deletions zboss/production/include/ha/zb_ha_on_off_output.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
/*
* ZBOSS Zigbee 3.0
*
* Copyright (c) 2012-2024 DSR Corporation, Denver CO, USA.
* www.dsr-zboss.com
* www.dsr-corporation.com
* All rights reserved.
*
*
* Use in source and binary forms, redistribution in binary form only, with
* or without modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions in binary form, except as embedded into a Nordic
* Semiconductor ASA integrated circuit in a product or a software update for
* such product, must reproduce the above copyright notice, this list of
* conditions and the following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* 2. Neither the name of Nordic Semiconductor ASA nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* 3. This software, with or without modification, must only be used with a Nordic
* Semiconductor ASA integrated circuit.
*
* 4. Any software provided in binary form under this license must not be reverse
* engineered, decompiled, modified and/or disassembled.
*
* THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* PURPOSE: On/Off output device definition
*/

#ifndef ZB_HA_ON_OFF_OUTPUT_H
#define ZB_HA_ON_OFF_OUTPUT_H 1

#if defined ZB_HA_DEFINE_DEVICE_ON_OFF_OUTPUT || defined DOXYGEN

/** @cond DOXYGEN_HA_SECTION */

/**
* @defgroup ha_on_off_output On/Off Output
* @addtogroup ha_on_off_output
* @ingroup ZB_HA_DEVICES
@{
@details
On/Off Output device has 5 clusters (see spec 7.4.3): \n
- @ref ZB_ZCL_IDENTIFY \n
- @ref ZB_ZCL_BASIC \n
- @ref ZB_ZCL_ON_OFF \n
- @ref ZB_ZCL_SCENES \n
- @ref ZB_ZCL_GROUPS
On/Off Output device sample
@par Example
- Declaring clusters:
@snippet HA_samples/common/zcl_basic_attr_list.h BASIC_CLUSTER_COMMON
@snippet HA_samples/on_off_output/sample_zc.c COMMON_DECLARATION
- Registering device list:
@snippet HA_samples/on_off_output/sample_zc.c REGISTER
- Example of command handler:
@snippet HA_samples/on_off_output/sample_zc.c COMMAND_HANDLER
@snippet HA_samples/on_off_output/sample_zc.c ZCL_COMMAND_HANDLER
@par
*/

#define ZB_HA_DEVICE_VER_ON_OFF_OUTPUT 0 /*!< On/Off Output device version */

/** @cond internals_doc */
#define ZB_HA_ON_OFF_OUTPUT_IN_CLUSTER_NUM 5 /*!< On/Off output IN cluster number */
#define ZB_HA_ON_OFF_OUTPUT_OUT_CLUSTER_NUM 0 /*!< On/Off output OUT cluster number */

#define ZB_HA_ON_OFF_OUTPUT_CLUSTER_NUM \
(ZB_HA_ON_OFF_OUTPUT_IN_CLUSTER_NUM + ZB_HA_ON_OFF_OUTPUT_OUT_CLUSTER_NUM)

/*! Number of attribute for reporting on On/Off output device */
#define ZB_HA_ON_OFF_OUTPUT_REPORT_ATTR_COUNT \
(ZB_ZCL_ON_OFF_REPORT_ATTR_COUNT)

/** @endcond */

/** @brief Declare cluster list for On/Off output device
@param cluster_list_name - cluster list variable name
@param on_off_attr_list - attribute list for On/Off cluster
@param basic_attr_list - attribute list for Basic cluster
@param identify_attr_list - attribute list for Identify cluster
@param groups_attr_list - attribute list for Groups cluster
@param scenes_attr_list - attribute list for Scenes cluster
*/
#define ZB_HA_DECLARE_ON_OFF_OUTPUT_CLUSTER_LIST( \
cluster_list_name, \
on_off_attr_list, \
basic_attr_list, \
identify_attr_list, \
groups_attr_list, \
scenes_attr_list) \
zb_zcl_cluster_desc_t cluster_list_name[] = \
{ \
ZB_ZCL_CLUSTER_DESC( \
ZB_ZCL_CLUSTER_ID_IDENTIFY, \
ZB_ZCL_ARRAY_SIZE(identify_attr_list, zb_zcl_attr_t), \
(identify_attr_list), \
ZB_ZCL_CLUSTER_SERVER_ROLE, \
ZB_ZCL_MANUF_CODE_INVALID \
), \
ZB_ZCL_CLUSTER_DESC( \
ZB_ZCL_CLUSTER_ID_BASIC, \
ZB_ZCL_ARRAY_SIZE(basic_attr_list, zb_zcl_attr_t), \
(basic_attr_list), \
ZB_ZCL_CLUSTER_SERVER_ROLE, \
ZB_ZCL_MANUF_CODE_INVALID \
), \
ZB_ZCL_CLUSTER_DESC( \
ZB_ZCL_CLUSTER_ID_ON_OFF, \
ZB_ZCL_ARRAY_SIZE(on_off_attr_list, zb_zcl_attr_t), \
(on_off_attr_list), \
ZB_ZCL_CLUSTER_SERVER_ROLE, \
ZB_ZCL_MANUF_CODE_INVALID \
), \
ZB_ZCL_CLUSTER_DESC( \
ZB_ZCL_CLUSTER_ID_GROUPS, \
ZB_ZCL_ARRAY_SIZE(groups_attr_list, zb_zcl_attr_t), \
(groups_attr_list), \
ZB_ZCL_CLUSTER_SERVER_ROLE, \
ZB_ZCL_MANUF_CODE_INVALID \
), \
ZB_ZCL_CLUSTER_DESC( \
ZB_ZCL_CLUSTER_ID_SCENES, \
ZB_ZCL_ARRAY_SIZE(scenes_attr_list, zb_zcl_attr_t), \
(scenes_attr_list), \
ZB_ZCL_CLUSTER_SERVER_ROLE, \
ZB_ZCL_MANUF_CODE_INVALID \
) \
}

/** @cond internals_doc */

/** @brief Declare simple descriptor for On/Off output device
@param ep_name - endpoint variable name
@param ep_id - endpoint ID
@param in_clust_num - number of supported input clusters
@param out_clust_num - number of supported output clusters
@note in_clust_num, out_clust_num should be defined by numeric constants, not variables or any
definitions, because these values are used to form simple descriptor type name
*/
#define ZB_ZCL_DECLARE_ON_OFF_OUTPUT_SIMPLE_DESC(ep_name, ep_id, in_clust_num, out_clust_num) \
ZB_DECLARE_SIMPLE_DESC(in_clust_num, out_clust_num); \
ZB_AF_SIMPLE_DESC_TYPE(in_clust_num, out_clust_num) simple_desc_##ep_name = \
{ \
ep_id, \
ZB_AF_HA_PROFILE_ID, \
ZB_HA_ON_OFF_OUTPUT_DEVICE_ID, \
ZB_HA_DEVICE_VER_ON_OFF_OUTPUT, \
0, \
in_clust_num, \
out_clust_num, \
{ \
ZB_ZCL_CLUSTER_ID_BASIC, \
ZB_ZCL_CLUSTER_ID_IDENTIFY, \
ZB_ZCL_CLUSTER_ID_ON_OFF, \
ZB_ZCL_CLUSTER_ID_SCENES, \
ZB_ZCL_CLUSTER_ID_GROUPS \
} \
}

/** @endcond */

/** @brief Declare endpoint for On/off output device
@param ep_name - endpoint variable name
@param ep_id - endpoint ID
@param cluster_list - endpoint cluster list
*/
#define ZB_HA_DECLARE_ON_OFF_OUTPUT_EP(ep_name, ep_id, cluster_list) \
ZB_ZCL_DECLARE_ON_OFF_OUTPUT_SIMPLE_DESC( \
ep_name, \
ep_id, \
ZB_HA_ON_OFF_OUTPUT_IN_CLUSTER_NUM, \
ZB_HA_ON_OFF_OUTPUT_OUT_CLUSTER_NUM); \
ZBOSS_DEVICE_DECLARE_REPORTING_CTX(reporting_info## ep_name, \
ZB_HA_ON_OFF_OUTPUT_REPORT_ATTR_COUNT); \
ZB_AF_DECLARE_ENDPOINT_DESC(ep_name, \
ep_id, \
ZB_AF_HA_PROFILE_ID, \
0, \
NULL, \
ZB_ZCL_ARRAY_SIZE( \
cluster_list, \
zb_zcl_cluster_desc_t), \
cluster_list, \
(zb_af_simple_desc_1_1_t*)&simple_desc_##ep_name, \
ZB_HA_ON_OFF_OUTPUT_REPORT_ATTR_COUNT, reporting_info## ep_name, \
0, NULL)

/** @brief Declare On/Off Output device context.
@param device_ctx - device context variable name.
@param ep_name - endpoint variable name.
*/
#define ZB_HA_DECLARE_ON_OFF_OUTPUT_CTX(device_ctx, ep_name) \
ZBOSS_DECLARE_DEVICE_CTX_1_EP(device_ctx, ep_name)


/*! @} */

/** @endcond */ /* DOXYGEN_HA_SECTION */

#endif /* ZB_HA_DEFINE_DEVICE_ON_OFF_OUTPUT */

#endif /* ZB_HA_ON_OFF_OUTPUT_H */
Loading

0 comments on commit 5ad13ee

Please sign in to comment.