[XML] Add Matter 1.4 Switch cluster AS feature (project-chip#33927)

* Add AS feature to switch cluster XML * ZAP regen * Force push forcer
joonhaengHeo · Jun 14, 2024 · a12a0c0 · a12a0c0
1 parent ad344f5
commit a12a0c0
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 10 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2257,6 +2257,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -1989,6 +1989,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1574,6 +1574,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
@@ -954,6 +954,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -954,6 +954,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1600,6 +1600,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
@@ -1397,6 +1397,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1506,6 +1506,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -2375,6 +2375,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {
@@ -2430,6 +2431,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -2332,6 +2332,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {
@@ -2387,6 +2388,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/scripts/py_matter_idl/matter_idl/generators/__init__.py b/scripts/py_matter_idl/matter_idl/generators/__init__.py
@@ -168,6 +168,7 @@ def internal_render_one_output(self, template_path: str, output_file_name: str,
  if self.dry_run:
  return
 
+ logging.info(f"Template path: {template_path}, CWD: {os.getcwd()}")
  rendered = self.jinja_env.get_template(template_path).render(vars)
 
  # Report regardless if it has changed or not. This is because even if

diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml
@@ -37,27 +37,45 @@ Interactions with the switch device are exposed as attributes (for the latching
  <feature bit="1" code="MS" name="MomentarySwitch" summary="Switch is momentary">
  <optionalConform choice="a"/>
  </feature>
- <feature bit="2" code="MSR" name="MomentarySwitchRelease" summary="Switch supports release">
- <optionalConform>
- <feature name="MS"/>
- </optionalConform>
- </feature>
- <feature bit="3" code="MSL" name="MomentarySwitchLongPress" summary="Switch supports long press">
+ <feature bit="2" code="MSR" name="MomentarySwitchRelease" summary="Switch supports release events generation">
  <optionalConform>
  <andTerm>
  <feature name="MS"/>
- <feature name="MSR"/>
+ <notTerm>
+ <feature name="AS"/>
+ </notTerm>
  </andTerm>
  </optionalConform>
  </feature>
- <feature bit="4" code="MSM" name="MomentarySwitchMultiPress" summary="Switch supports multi-press">
+ <feature bit="3" code="MSL" name="MomentarySwitchLongPress" summary="Switch supports long press detection">
  <optionalConform>
  <andTerm>
  <feature name="MS"/>
- <feature name="MSR"/>
+ <orTerm>
+ <feature name="MSR"/>
+ <feature name="AS"/>
+ </orTerm>
  </andTerm>
  </optionalConform>
  </feature>
+ <feature bit="4" code="MSM" name="MomentarySwitchMultiPress" summary="Switch supports multi-press detection">
+ <otherwiseConform>
+ <mandatoryConform>
+ <feature name="AS"/>
+ </mandatoryConform>
+ <optionalConform>
+ <andTerm>
+ <feature name="MS"/>
+ <feature name="MSR"/>
+ </andTerm>
+ </optionalConform>
+ </otherwiseConform>
+ </feature>
+ <feature bit="5" code="AS" name="ActionSwitch" apiMaturity="provisional" summary="Switch is momentary, targeted at specific user actions (focus on multi-press and optionally long press) with a reduced event generation scheme">
+ <optionalConform>
+ <feature name="MS"/>
+ </optionalConform>
+ </feature>
  </features>
 
  <attribute side="server" code="0x0000" define="NUMBER_OF_POSITIONS" type="int8u" writable="false" optional="false" default="2" min="2">NumberOfPositions</attribute>
@@ -96,5 +114,4 @@ Interactions with the switch device are exposed as attributes (for the latching
 
  </cluster>
 
-
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2280,6 +2280,7 @@ cluster Switch = 59 {
  kMomentarySwitchRelease = 0x4;
  kMomentarySwitchLongPress = 0x8;
  kMomentarySwitchMultiPress = 0x10;
+ kActionSwitch = 0x20;
  }
 
  info event SwitchLatched = 0 {

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h