Add events to Generic Switch XML (#12197)

* Add events to Generic Switch * scripts/tools/zap_regen_all.py
project-chip · Feb 13, 2024 · 1252408 · 1252408
1 parent 2ff8d00
commit 1252408
Show file tree

Hide file tree

Showing 5 changed files with 639 additions and 9 deletions.
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
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
-  <domain name="CHIP"/>
+  <domain name="CHIP" />
   <cluster>
     <domain>CHIP</domain>
     <name>Switch</name>
@@ -27,20 +27,51 @@ limitations under the License.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade.</description>
 
-    <globalAttribute side="server" code="0xFFFC" value="0"/>
-    <globalAttribute side="server" code="0xFFFD" value="1"/>
+    <globalAttribute side="server" code="0xFFFC" value="0" />
+    <globalAttribute side="server" code="0xFFFD" value="1" />
 
     <attribute side="server" code="0x0000" define="NUMBER_OF_POSITIONS" type="INT8U" writable="false" optional="false" default="2" min="2">number of positions</attribute>
     <attribute side="server" code="0x0001" define="CURRENT_POSITION" type="INT8U" writable="false" reportable="true" optional="false">current position</attribute>
     <attribute side="server" code="0x0002" define="MULTI_PRESS_MAX" type="INT8U" writable="false" optional="false" default="2" min="2">multi press max</attribute>
+    <event side="server" code="0x00" priority="info" name="SwitchLatched" optional="true">
+      <description>Switch Latched</description>
+      <field id="0" name="NewPosition" type="INT8U" />
+    </event>
+    <event side="server" code="0x01" priority="info" name="InitialPress" optional="true">
+      <description>Initial Press</description>
+      <field id="0" name="NewPosition" type="INT8U" />
+    </event>
+    <event side="server" code="0x02" priority="info" name="LongPress" optional="true">
+      <description>Long Press</description>
+      <field id="0" name="NewPosition" type="INT8U" />
+    </event>
+    <event side="server" code="0x03" priority="info" name="ShortRelease" optional="true">
+      <description>Short Release</description>
+      <field id="0" name="PreviousPosition" type="INT8U" />
+    </event>
+    <event side="server" code="0x04" priority="info" name="LongRelease" optional="true">
+      <description>Long Release</description>
+      <field id="0" name="PreviousPosition" type="INT8U" />
+    </event>
+    <event side="server" code="0x05" priority="info" name="MultiPressOngoing" optional="true">
+      <description>MultiPress Ongoing</description>
+      <field id="0" name="NewPosition" type="INT8U" />
+      <field id="1" name="CurrentNumberOfPressesCounted" type="INT8U" />
+    </event>
+    <event side="server" code="0x06" priority="info" name="MultiPressComplete" optional="true">
+      <description>MultiPress Complete</description>
+      <field id="0" name="NewPosition" type="INT8U" />
+      <field id="1" name="TotalNumberOfPressesCounted" type="INT8U" />
+    </event>
+
   </cluster>
 
   <bitmap name="SwitchFeature" type="BITMAP32">
-    <field name="LatchingSwitch" mask="0x1"/>
-    <field name="MomentarySwitch" mask="0x2"/>
-    <field name="MomentarySwitchRelease" mask="0x4"/>
-    <field name="MomentarySwitchLongPress" mask="0x8"/>
-    <field name="MomentarySwitchMultiPress" mask="0x10"/>
+    <field name="LatchingSwitch" mask="0x1" />
+    <field name="MomentarySwitch" mask="0x2" />
+    <field name="MomentarySwitchRelease" mask="0x4" />
+    <field name="MomentarySwitchLongPress" mask="0x8" />
+    <field name="MomentarySwitchMultiPress" mask="0x10" />
   </bitmap>
 
 </configurator>
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/third_party/zap/repo b/third_party/zap/repo
+1,633 −1,645		docs/zap-schema.svg
+1 −1		package.json
+0 −1		src-electron/db/db-mapping.js
+1 −6		src-electron/db/query-attribute.js
+2 −4		src-electron/db/query-command.js
+73 −78		src-electron/db/query-config.js
+9 −49		src-electron/db/query-loader.js
+10 −33		src-electron/db/query-zcl.js
+0 −1		src-electron/db/zap-schema.sql
+4 −4		src-electron/rest/endpoint.js
+4 −2		src-electron/rest/file-ops.js
+60 −195		src-electron/rest/user-data.js
+19 −39		src-electron/zcl/zcl-loader-silabs.js
+4 −4		src-electron/zcl/zcl-loader.js
+0 −2		src-shared/rest-api.js
+1 −1		src/boot/axios.js
+10 −17		src/boot/ws.js
+18 −7		src/components/ZclAttributeManager.vue
+4 −139		src/components/ZclAttributeReportingManager.vue
+3 −4		src/components/ZclClusterView.vue
+28 −45		src/components/ZclCommandManager.vue
+2 −2		src/components/ZclDomainClusterView.vue
+1 −1		src/components/ZclGeneralOptionsBar.vue
+1 −3		src/css/app.sass
+1 −0		src/store/zap/actions.js
+1 −1		src/store/zap/mutations.js
+3 −3		src/store/zap/state.js
+3 −3		src/util/editable-attributes-mixin.js
+0 −156		test/custom-cluster.test.js
+0 −1		test/gen-meta.test.js
+1 −2		test/mutations.test.js
+1 −1		test/resource/meta/struct.zapt
+2 −2		test/resource/meta/types.xml
+2 −0		test/test-util.js
+0 −1		zcl-builtin/shared/schema/zcl.xsd