Skip to content

Commit 0d86887

Browse files
su-shankarzr
authored andcommitted
SwitchAll: Pull request #2833: UIC-3444: Created custom dotdot cluster for SwitchAll CC along with mapper
Merge in UIC/uic from feature/uic-3444-dotdot-cluster-and-mapper to feature/UIC-3276-all-switch-cc Relate-to: #145 Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
1 parent 8bd495d commit 0d86887

File tree

3 files changed

+37
-2
lines changed

3 files changed

+37
-2
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Switch All Command Class
2+
def zwSWITCH_ALL_MODE 0x2702
3+
def zwSWITCH_ALL_ON_OFF 0x2703
4+
5+
// Unify Switch All Cluster
6+
def zbSWITCH_ALL_MODE 0xFD200000
7+
def zbSWITCH_ALL_ON_OFF 0xFD200001
8+
9+
def zwave_no_switch_all (e'zwSWITCH_ALL_MODE == 0)
10+
11+
// 25 is higher priority than other generic switches
12+
scope 25 chain_reaction(0) {
13+
14+
// Linking attributes zwave -> zigbee
15+
r'zbSWITCH_ALL_MODE = r'zwSWITCH_ALL_MODE
16+
d'zbSWITCH_ALL_MODE = d'zwSWITCH_ALL_MODE
17+
r'zbSWITCH_ALL_ON_OFF =
18+
if (zwave_no_switch_all) undefined
19+
if (r'zwSWITCH_ALL_ON_OFF != 0) 1 0
20+
d'zbSWITCH_ALL_ON_OFF =
21+
if (zwave_no_switch_all) undefined
22+
if (d'zwSWITCH_ALL_ON_OFF != 0) 1 0
23+
24+
// Linking attributes zigbee -> zwave
25+
r'zwSWITCH_ALL_MODE = if (zwave_no_switch_all) undefined r'zbSWITCH_ALL_MODE
26+
d'zwSWITCH_ALL_MODE = if (zwave_no_switch_all) undefined d'zbSWITCH_ALL_MODE
27+
d'zwSWITCH_ALL_ON_OFF =
28+
if (zwave_no_switch_all) undefined
29+
if (d'zbSWITCH_ALL_ON_OFF != 0) 1 0
30+
31+
r'zwSWITCH_ALL_ON_OFF =
32+
if (zwave_no_switch_all) undefined
33+
if (r'zbSWITCH_ALL_ON_OFF != 0) 1 0
34+
}
35+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static const std::vector<attribute_schema_t> attribute_schema = {
7272
/////////////////////////////////////////////////////////////////////
7373
{ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_VERSION, "All Switch Command Class version", ATTRIBUTE_ENDPOINT_ID, U8_STORAGE_TYPE},
7474
{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},
75+
{ATTRIBUTE_COMMAND_CLASS_SWITCH_ALL_ON_OFF, "Switch All", ATTRIBUTE_ENDPOINT_ID, U8_STORAGE_TYPE},
7676
/////////////////////////////////////////////////////////////////////
7777
// Association Group Information Command Class attributes
7878
/////////////////////////////////////////////////////////////////////

applications/zpc/components/zwave_command_classes/src/zwave_command_class_switch_all.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static void zwave_command_class_switch_all_on_version_attribute_update(
192192
// Create the switch_all attributes
193193
endpoint_node.emplace_node(ATTRIBUTE(MODE));
194194

195-
endpoint_node.first_parent(ATTRIBUTE_HOME_ID).emplace_node(ATTRIBUTE(ON_OFF));
195+
endpoint_node.emplace_node(ATTRIBUTE(ON_OFF));
196196

197197
}
198198

0 commit comments

Comments
 (0)