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

tcarmelveilleux · web-flow · commit a12a0c070e2a · 2024-06-14T17:48:30.000Z
* Add AS feature to switch cluster XML

* ZAP regen

* Force push forcer
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

Original file line number	Diff line number	Diff line change
`@@ -2257,6 +2257,7 @@ cluster Switch = 59 {`
`2257`	`2257`	`kMomentarySwitchRelease = 0x4;`
`2258`	`2258`	`kMomentarySwitchLongPress = 0x8;`
`2259`	`2259`	`kMomentarySwitchMultiPress = 0x10;`
	`2260`	`+ kActionSwitch = 0x20;`
`2260`	`2261`	`}`
`2261`	`2262`
`2262`	`2263`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1989,6 +1989,7 @@ cluster Switch = 59 {`
`1989`	`1989`	`kMomentarySwitchRelease = 0x4;`
`1990`	`1990`	`kMomentarySwitchLongPress = 0x8;`
`1991`	`1991`	`kMomentarySwitchMultiPress = 0x10;`
	`1992`	`+ kActionSwitch = 0x20;`
`1992`	`1993`	`}`
`1993`	`1994`
`1994`	`1995`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1574,6 +1574,7 @@ cluster Switch = 59 {`
`1574`	`1574`	`kMomentarySwitchRelease = 0x4;`
`1575`	`1575`	`kMomentarySwitchLongPress = 0x8;`
`1576`	`1576`	`kMomentarySwitchMultiPress = 0x10;`
	`1577`	`+ kActionSwitch = 0x20;`
`1577`	`1578`	`}`
`1578`	`1579`
`1579`	`1580`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -954,6 +954,7 @@ cluster Switch = 59 {`
`954`	`954`	`kMomentarySwitchRelease = 0x4;`
`955`	`955`	`kMomentarySwitchLongPress = 0x8;`
`956`	`956`	`kMomentarySwitchMultiPress = 0x10;`
	`957`	`+ kActionSwitch = 0x20;`
`957`	`958`	`}`
`958`	`959`
`959`	`960`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1600,6 +1600,7 @@ cluster Switch = 59 {`
`1600`	`1600`	`kMomentarySwitchRelease = 0x4;`
`1601`	`1601`	`kMomentarySwitchLongPress = 0x8;`
`1602`	`1602`	`kMomentarySwitchMultiPress = 0x10;`
	`1603`	`+ kActionSwitch = 0x20;`
`1603`	`1604`	`}`
`1604`	`1605`
`1605`	`1606`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1397,6 +1397,7 @@ cluster Switch = 59 {`
`1397`	`1397`	`kMomentarySwitchRelease = 0x4;`
`1398`	`1398`	`kMomentarySwitchLongPress = 0x8;`
`1399`	`1399`	`kMomentarySwitchMultiPress = 0x10;`
	`1400`	`+ kActionSwitch = 0x20;`
`1400`	`1401`	`}`
`1401`	`1402`
`1402`	`1403`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1506,6 +1506,7 @@ cluster Switch = 59 {`
`1506`	`1506`	`kMomentarySwitchRelease = 0x4;`
`1507`	`1507`	`kMomentarySwitchLongPress = 0x8;`
`1508`	`1508`	`kMomentarySwitchMultiPress = 0x10;`
	`1509`	`+ kActionSwitch = 0x20;`
`1509`	`1510`	`}`
`1510`	`1511`
`1511`	`1512`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -2375,6 +2375,7 @@ cluster Switch = 59 {`
`2375`	`2375`	`kMomentarySwitchRelease = 0x4;`
`2376`	`2376`	`kMomentarySwitchLongPress = 0x8;`
`2377`	`2377`	`kMomentarySwitchMultiPress = 0x10;`
	`2378`	`+ kActionSwitch = 0x20;`
`2378`	`2379`	`}`
`2379`	`2380`
`2380`	`2381`	`info event SwitchLatched = 0 {`
`@@ -2430,6 +2431,7 @@ cluster Switch = 59 {`
`2430`	`2431`	`kMomentarySwitchRelease = 0x4;`
`2431`	`2432`	`kMomentarySwitchLongPress = 0x8;`
`2432`	`2433`	`kMomentarySwitchMultiPress = 0x10;`
	`2434`	`+ kActionSwitch = 0x20;`
`2433`	`2435`	`}`
`2434`	`2436`
`2435`	`2437`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -2332,6 +2332,7 @@ cluster Switch = 59 {`
`2332`	`2332`	`kMomentarySwitchRelease = 0x4;`
`2333`	`2333`	`kMomentarySwitchLongPress = 0x8;`
`2334`	`2334`	`kMomentarySwitchMultiPress = 0x10;`
	`2335`	`+ kActionSwitch = 0x20;`
`2335`	`2336`	`}`
`2336`	`2337`
`2337`	`2338`	`info event SwitchLatched = 0 {`
`@@ -2387,6 +2388,7 @@ cluster Switch = 59 {`
`2387`	`2388`	`kMomentarySwitchRelease = 0x4;`
`2388`	`2389`	`kMomentarySwitchLongPress = 0x8;`
`2389`	`2390`	`kMomentarySwitchMultiPress = 0x10;`
	`2391`	`+ kActionSwitch = 0x20;`
`2390`	`2392`	`}`
`2391`	`2393`
`2392`	`2394`	`info event SwitchLatched = 0 {`
Original file line number	Diff line number	Diff line change
`@@ -2280,6 +2280,7 @@ cluster Switch = 59 {`
`2280`	`2280`	`kMomentarySwitchRelease = 0x4;`
`2281`	`2281`	`kMomentarySwitchLongPress = 0x8;`
`2282`	`2282`	`kMomentarySwitchMultiPress = 0x10;`
	`2283`	`+ kActionSwitch = 0x20;`
`2283`	`2284`	`}`
`2284`	`2285`
`2285`	`2286`	`info event SwitchLatched = 0 {`