Skip to content

Commit 1e85bde

Browse files
su-shankarzr
authored andcommitted
SwitchAll: Pull request #2824: UIC-3410: Z-Wave attributes for Switch All CC
Merge in UIC/uic from feature/uic-3410-data-model to feature/UIC-3276-all-switch-cc Relate-to: #145 Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
1 parent 0478b02 commit 1e85bde

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

applications/zpc/components/zpc_attribute_store/include/attribute_store_defined_attribute_types.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,8 +1084,12 @@ DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_POWERLEVEL_VERSION,
10841084
// All Switch Command Class
10851085
///< This represents the version of the All Switch Command class.
10861086
/// zwave_cc_version_t
1087-
DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_ALL_SWITCH_VERSION,
1088-
((COMMAND_CLASS_SWITCH_ALL << 8) | 0x01))
1087+
DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_VERSION,
1088+
ZWAVE_CC_VERSION_ATTRIBUTE(COMMAND_CLASS_SWITCH_ALL))
1089+
DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_MODE,
1090+
((COMMAND_CLASS_SWITCH_ALL << 8) | 0x02))
1091+
DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_ON_OFF,
1092+
((COMMAND_CLASS_SWITCH_ALL << 8) | 0x03))
10891093

10901094
/////////////////////////////////////////////////
10911095
// Sound Switch Command Class

applications/zpc/components/zpc_attribute_store/src/zpc_attribute_store_type_registration.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ static const std::vector<attribute_schema_t> attribute_schema = {
7070
/////////////////////////////////////////////////////////////////////
7171
// All Switch Command Class attributes
7272
/////////////////////////////////////////////////////////////////////
73-
{ATTRIBUTE_COMMAND_CLASS_ALL_SWITCH_VERSION, "All Switch Command Class version", ATTRIBUTE_ENDPOINT_ID, U8_STORAGE_TYPE},
73+
{ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_VERSION, "All Switch Command Class version", ATTRIBUTE_ENDPOINT_ID, U8_STORAGE_TYPE},
74+
{ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_MODE, "Mode", ATTRIBUTE_ENDPOINT_ID, U8_STORAGE_TYPE},
75+
{ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_ON_OFF, "Switch All", ATTRIBUTE_HOME_ID, U8_STORAGE_TYPE},
7476
/////////////////////////////////////////////////////////////////////
7577
// Association Group Information Command Class attributes
7678
/////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)