Remove redundant "Matter " prefix from device type names. (#36068)
The prefix is redundant because these are all Matter device types anyway, and is
not present in the spec.
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 37af769..f7f5699 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -19,7 +19,7 @@
<deviceType>
<name>MA-orphan</name>
<domain>CHIP</domain>
- <typeName>Matter Orphan Clusters</typeName>
+ <typeName>Orphan Clusters</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0xFFF10001</deviceId>
<clusters lockOthers="true">
@@ -32,7 +32,7 @@
<deviceType>
<name>MA-rootdevice</name>
<domain>CHIP</domain>
- <typeName>Matter Root Node</typeName>
+ <typeName>Root Node</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0016</deviceId>
<class>Node</class>
@@ -103,7 +103,7 @@
<deviceType>
<name>MA-powersource</name>
<domain>CHIP</domain>
- <typeName>Matter Power Source</typeName>
+ <typeName>Power Source</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0011</deviceId>
<class>Utility</class>
@@ -121,7 +121,7 @@
<deviceType>
<name>MA-electricalsensor</name>
<domain>CHIP</domain>
- <typeName>Matter Electrical Sensor</typeName>
+ <typeName>Electrical Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0510</deviceId>
<class>Utility</class>
@@ -136,7 +136,7 @@
<deviceType>
<name>MA-otarequestor</name>
<domain>CHIP</domain>
- <typeName>Matter OTA Requestor</typeName>
+ <typeName>OTA Requestor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0012</deviceId>
<class>Utility</class>
@@ -155,7 +155,7 @@
<deviceType>
<name>MA-otaprovider</name>
<domain>CHIP</domain>
- <typeName>Matter OTA Provider</typeName>
+ <typeName>OTA Provider</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0014</deviceId>
<class>Utility</class>
@@ -174,7 +174,7 @@
<deviceType>
<name>MA-aggregator</name>
<domain>CHIP</domain>
- <typeName>Matter Aggregator</typeName>
+ <typeName>Aggregator</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x000e</deviceId>
<class>Simple</class>
@@ -192,7 +192,7 @@
<deviceType>
<name>MA-bridgednode</name>
<domain>CHIP</domain>
- <typeName>Matter Bridged Node</typeName>
+ <typeName>Bridged Node</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0013</deviceId>
<class>Utility</class>
@@ -214,7 +214,7 @@
<deviceType>
<name>MA-onofflight</name>
<domain>CHIP</domain>
- <typeName>Matter On/Off Light</typeName>
+ <typeName>On/Off Light</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0100</deviceId>
<class>Simple</class>
@@ -311,12 +311,12 @@
<deviceType>
<name>MA-dimmablelight</name>
<domain>CHIP</domain>
- <typeName>Matter Dimmable Light</typeName>
+ <typeName>Dimmable Light</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0101</deviceId>
<class>Simple</class>
<scope>Endpoint</scope>
- <superset>Matter On/Off Light</superset>
+ <superset>On/Off Light</superset>
<clusters lockOthers="true">
<include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -412,12 +412,12 @@
<deviceType>
<name>MA-colortemperaturelight</name>
<domain>CHIP</domain>
- <typeName>Matter Color Temperature Light</typeName>
+ <typeName>Color Temperature Light</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x010C</deviceId>
<class>Simple</class>
<scope>Endpoint</scope>
- <superset>Matter Dimmable Light</superset>
+ <superset>Dimmable Light</superset>
<clusters lockOthers="true">
<include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -531,12 +531,12 @@
<deviceType>
<name>MA-extendedcolorlight</name>
<domain>CHIP</domain>
- <typeName>Matter Extended Color Light</typeName>
+ <typeName>Extended Color Light</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x010D</deviceId>
<class>Simple</class>
<scope>Endpoint</scope>
- <superset>Matter Color Temperature Light</superset>
+ <superset>Color Temperature Light</superset>
<clusters lockOthers="true">
<include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -665,7 +665,7 @@
<deviceType>
<name>MA-onoffpluginunit</name>
<domain>CHIP</domain>
- <typeName>Matter On/Off Plug-in Unit</typeName>
+ <typeName>On/Off Plug-in Unit</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x010A</deviceId>
<class>Simple</class>
@@ -759,7 +759,7 @@
<deviceType>
<name>MA-dimmablepluginunit</name>
<domain>CHIP</domain>
- <typeName>Matter Dimmable Plug-in Unit</typeName>
+ <typeName>Dimmable Plug-in Unit</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x010B</deviceId>
<class>Simple</class>
@@ -853,7 +853,7 @@
<deviceType>
<name>MA-pump</name>
<domain>CHIP</domain>
- <typeName>Matter Pump</typeName>
+ <typeName>Pump</typeName>
<profileId editable="false">0x0999</profileId>
<deviceId editable="false">0x0303</deviceId>
<class>Simple</class>
@@ -933,7 +933,7 @@
<deviceType>
<name>MA-onofflightswitch</name>
<domain>CHIP</domain>
- <typeName>Matter On/Off Light Switch</typeName>
+ <typeName>On/Off Light Switch</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0103</deviceId>
<class>Simple</class>
@@ -993,12 +993,12 @@
<deviceType>
<name>MA-dimmerswitch</name>
<domain>CHIP</domain>
- <typeName>Matter Dimmer Switch</typeName>
+ <typeName>Dimmer Switch</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0104</deviceId>
<class>Simple</class>
<scope>Endpoint</scope>
- <superset>Matter On/Off Light Switch</superset>
+ <superset>On/Off Light Switch</superset>
<clusters lockOthers="true">
<include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -1055,12 +1055,12 @@
<deviceType>
<name>MA-colordimmerswitch</name>
<domain>CHIP</domain>
- <typeName>Matter Color Dimmer Switch</typeName>
+ <typeName>Color Dimmer Switch</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0105</deviceId>
<class>Simple</class>
<scope>Endpoint</scope>
- <superset>Matter Dimmer Switch</superset>
+ <superset>Dimmer Switch</superset>
<clusters lockOthers="true">
<include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -1114,7 +1114,7 @@
<deviceType>
<name>MA-controlbridge</name>
<domain>CHIP</domain>
- <typeName>Matter Control Bridge</typeName>
+ <typeName>Control Bridge</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0840</deviceId>
<class>Simple</class>
@@ -1150,7 +1150,7 @@
<deviceType>
<name>MA-pumpcontroller</name>
<domain>CHIP</domain>
- <typeName>Matter Pump Controller</typeName>
+ <typeName>Pump Controller</typeName>
<profileId editable="false">0x0999</profileId>
<deviceId editable="false">0x0304</deviceId>
<class>Simple</class>
@@ -1218,7 +1218,7 @@
<deviceType>
<name>MA-genericswitch</name>
<domain>CHIP</domain>
- <typeName>Matter Generic Switch</typeName>
+ <typeName>Generic Switch</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x000f</deviceId>
<class>Simple</class>
@@ -1245,7 +1245,7 @@
<deviceType>
<name>MA-contactsensor</name>
<domain>CHIP</domain>
- <typeName>Matter Contact Sensor</typeName>
+ <typeName>Contact Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0015</deviceId>
<class>Simple</class>
@@ -1272,7 +1272,7 @@
<deviceType>
<name>MA-lightsensor</name>
<domain>CHIP</domain>
- <typeName>Matter Light Sensor</typeName>
+ <typeName>Light Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0106</deviceId>
<class>Simple</class>
@@ -1305,7 +1305,7 @@
<deviceType>
<name>MA-occupancysensor</name>
<domain>CHIP</domain>
- <typeName>Matter Occupancy Sensor</typeName>
+ <typeName>Occupancy Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0107</deviceId>
<class>Simple</class>
@@ -1337,7 +1337,7 @@
<deviceType>
<name>MA-tempsensor</name>
<domain>CHIP</domain>
- <typeName>Matter Temperature Sensor</typeName>
+ <typeName>Temperature Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0302</deviceId>
<class>Simple</class>
@@ -1362,7 +1362,7 @@
<deviceType>
<name>MA-pressuresensor</name>
<domain>CHIP</domain>
- <typeName>Matter Pressure Sensor</typeName>
+ <typeName>Pressure Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0305</deviceId>
<class>Simple</class>
@@ -1387,7 +1387,7 @@
<deviceType>
<name>MA-flowsensor</name>
<domain>CHIP</domain>
- <typeName>Matter Flow Sensor</typeName>
+ <typeName>Flow Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0306</deviceId>
<class>Simple</class>
@@ -1412,7 +1412,7 @@
<deviceType>
<name>MA-humiditysensor</name>
<domain>CHIP</domain>
- <typeName>Matter Humidity Sensor</typeName>
+ <typeName>Humidity Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0307</deviceId>
<class>Simple</class>
@@ -1437,7 +1437,7 @@
<deviceType>
<name>MA-onoffsensor</name>
<domain>CHIP</domain>
- <typeName>Matter On/Off Sensor</typeName>
+ <typeName>On/Off Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0850</deviceId>
<class>Simple</class>
@@ -1469,7 +1469,7 @@
<deviceType>
<name>MA-doorlock</name>
<domain>CHIP</domain>
- <typeName>Matter Door Lock</typeName>
+ <typeName>Door Lock</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x000A</deviceId>
<class>Simple</class>
@@ -1517,7 +1517,7 @@
<deviceType>
<name>MA-doorlockcontroller</name>
<domain>CHIP</domain>
- <typeName>Matter Door Lock Controller</typeName>
+ <typeName>Door Lock Controller</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x000B</deviceId>
<class>Simple</class>
@@ -1539,7 +1539,7 @@
<deviceType>
<name>MA-windowcovering</name>
<domain>CHIP</domain>
- <typeName>Matter Window Covering</typeName>
+ <typeName>Window Covering</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0202</deviceId>
<class>Simple</class>
@@ -1604,7 +1604,7 @@
<deviceType>
<name>MA-windowcoveringcontroller</name>
<domain>CHIP</domain>
- <typeName>Matter Window Covering Controller</typeName>
+ <typeName>Window Covering Controller</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0203</deviceId>
<class>Simple</class>
@@ -1641,7 +1641,7 @@
<deviceType>
<name>MA-heatcool</name>
<domain>CHIP</domain>
- <typeName>Matter Heating/Cooling Unit</typeName>
+ <typeName>Heating/Cooling Unit</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0300</deviceId>
<class>Simple</class>
@@ -1705,7 +1705,7 @@
<deviceType>
<name>MA-thermostat</name>
<domain>CHIP</domain>
- <typeName>Matter Thermostat</typeName>
+ <typeName>Thermostat</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0301</deviceId>
<class>Simple</class>
@@ -1772,7 +1772,7 @@
<deviceType>
<name>MA-fan</name>
<domain>CHIP</domain>
- <typeName>Matter Fan</typeName>
+ <typeName>Fan</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x002B</deviceId>
<class>Simple</class>
@@ -1809,7 +1809,7 @@
<deviceType>
<name>MA-casting-videoplayer</name>
<domain>CHIP</domain>
- <typeName>Matter Casting Video Player</typeName>
+ <typeName>Casting Video Player</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0023</deviceId>
<class>Simple</class>
@@ -1844,7 +1844,7 @@
<deviceType>
<name>MA-basic-videoplayer</name>
<domain>CHIP</domain>
- <typeName>Matter Basic Video Player</typeName>
+ <typeName>Basic Video Player</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0028</deviceId>
<class>Simple</class>
@@ -1870,7 +1870,7 @@
<deviceType>
<name>MA-casting-videoclient</name>
<domain>CHIP</domain>
- <typeName>Matter Casting Video Client</typeName>
+ <typeName>Casting Video Client</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0029</deviceId>
<class>Simple</class>
@@ -1904,7 +1904,7 @@
<deviceType>
<name>MA-video-remotecontrol</name>
<domain>CHIP</domain>
- <typeName>Matter Video Remote Control</typeName>
+ <typeName>Video Remote Control</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x002A</deviceId>
<class>Simple</class>
@@ -1937,7 +1937,7 @@
<deviceType>
<name>MA-speaker</name>
<domain>CHIP</domain>
- <typeName>Matter Speaker</typeName>
+ <typeName>Speaker</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0022</deviceId>
<class>Simple</class>
@@ -1963,7 +1963,7 @@
<deviceType>
<name>MA-contentapp</name>
<domain>CHIP</domain>
- <typeName>Matter Content App</typeName>
+ <typeName>Content App</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0024</deviceId>
<class>Simple</class>
@@ -2001,7 +2001,7 @@
<deviceType>
<name>MA-modeselect</name>
<domain>CHIP</domain>
- <typeName>Matter Mode Select</typeName>
+ <typeName>Mode Select</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0027</deviceId>
<class>Simple</class>
@@ -2026,7 +2026,7 @@
<deviceType>
<name>MA-room-airconditioner</name>
<domain>CHIP</domain>
- <typeName>Matter Room Air Conditioner</typeName>
+ <typeName>Room Air Conditioner</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0072</deviceId>
<class>Simple</class>
@@ -2061,7 +2061,7 @@
<deviceType>
<name>MA-smokecoalarm</name>
<domain>CHIP</domain>
- <typeName>Matter Smoke CO Alarm</typeName>
+ <typeName>Smoke CO Alarm</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0076</deviceId>
<class>Simple</class>
@@ -2084,7 +2084,7 @@
<deviceType>
<name>MA-air-purifier</name>
<domain>CHIP</domain>
- <typeName>Matter Air Purifier</typeName>
+ <typeName>Air Purifier</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x002D</deviceId>
<class>Simple</class>
@@ -2105,7 +2105,7 @@
<deviceType>
<name>MA-air-quality-sensor</name>
<domain>CHIP</domain>
- <typeName>Matter Air Quality Sensor</typeName>
+ <typeName>Air Quality Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x002C</deviceId>
<class>Simple</class>
@@ -2135,7 +2135,7 @@
<deviceType>
<name>MA-dishwasher</name>
<domain>CHIP</domain>
- <typeName>Matter Dishwasher</typeName>
+ <typeName>Dishwasher</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0075</deviceId>
<class>Simple</class>
@@ -2165,7 +2165,7 @@
<deviceType>
<name>MA-oven</name>
<domain>CHIP</domain>
- <typeName>Matter Oven</typeName>
+ <typeName>Oven</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x007B</deviceId>
<class>Simple</class>
@@ -2178,7 +2178,7 @@
<deviceType>
<name>MA-microwave-oven</name>
<domain>CHIP</domain>
- <typeName>Matter Microwave Oven</typeName>
+ <typeName>Microwave Oven</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0079</deviceId>
<class>Simple</class>
@@ -2204,7 +2204,7 @@
<deviceType>
<name>MA-refrigerator</name>
<domain>CHIP</domain>
- <typeName>Matter Refrigerator</typeName>
+ <typeName>Refrigerator</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0070</deviceId>
<class>Simple</class>
@@ -2231,7 +2231,7 @@
<deviceType>
<name>MA-laundry-washer</name>
<domain>CHIP</domain>
- <typeName>Matter Laundry Washer</typeName>
+ <typeName>Laundry Washer</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0073</deviceId>
<class>Simple</class>
@@ -2261,7 +2261,7 @@
<deviceType>
<name>MA-laundry-dryer</name>
<domain>CHIP</domain>
- <typeName>Matter Laundry Dryer</typeName>
+ <typeName>Laundry Dryer</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x007C</deviceId>
<class>Simple</class>
@@ -2291,7 +2291,7 @@
<deviceType>
<name>MA-extractor-hood</name>
<domain>CHIP</domain>
- <typeName>Matter Extractor Hood</typeName>
+ <typeName>Extractor Hood</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x007A</deviceId>
<class>Simple</class>
@@ -2319,7 +2319,7 @@
<deviceType>
<name>MA-robotic-vacuum-cleaner</name>
<domain>CHIP</domain>
- <typeName>Matter Robotic Vacuum Cleaner</typeName>
+ <typeName>Robotic Vacuum Cleaner</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0074</deviceId>
<class>Simple</class>
@@ -2337,7 +2337,7 @@
<deviceType>
<name>MA-temperature-controlled-cabinet</name>
<domain>CHIP</domain>
- <typeName>Matter Temperature Controlled Cabinet</typeName>
+ <typeName>Temperature Controlled Cabinet</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0071</deviceId>
<class>Simple</class>
@@ -2366,7 +2366,7 @@
<deviceType>
<name>MA-water-freeze-detector</name>
<domain>CHIP</domain>
- <typeName>Matter Water Freeze Detector</typeName>
+ <typeName>Water Freeze Detector</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0041</deviceId>
<class>Simple</class>
@@ -2381,7 +2381,7 @@
<deviceType>
<name>MA-water-valve</name>
<domain>CHIP</domain>
- <typeName>Matter Water Valve</typeName>
+ <typeName>Water Valve</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0042</deviceId>
<class>Simple</class>
@@ -2395,7 +2395,7 @@
<deviceType>
<name>MA-water-leak-detector</name>
<domain>CHIP</domain>
- <typeName>Matter Water Leak Detector</typeName>
+ <typeName>Water Leak Detector</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0043</deviceId>
<class>Simple</class>
@@ -2410,7 +2410,7 @@
<deviceType>
<name>MA-rain-sensor</name>
<domain>CHIP</domain>
- <typeName>Matter Rain Sensor</typeName>
+ <typeName>Rain Sensor</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0044</deviceId>
<class>Simple</class>
@@ -2425,7 +2425,7 @@
<deviceType>
<name>MA-network-infrastructure-manager</name>
<domain>CHIP</domain>
- <typeName>Matter Network Infrastructure Manager</typeName>
+ <typeName>Network Infrastructure Manager</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0090</deviceId>
<class>Simple</class>
@@ -2440,7 +2440,7 @@
<deviceType>
<name>MA-thread-border-router</name>
<domain>CHIP</domain>
- <typeName>Matter Thread Border Router</typeName>
+ <typeName>Thread Border Router</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0091</deviceId>
<class>Simple</class>
@@ -2455,7 +2455,7 @@
<deviceType>
<name>MA-all-clusters-app</name>
<domain>CHIP</domain>
- <typeName>Matter All-clusters-app Server Example</typeName>
+ <typeName>All-clusters-app Server Example</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0xFFF10003</deviceId>
<clusters lockOthers="true">
@@ -2612,7 +2612,7 @@
<deviceType>
<name>MA-secondary-network-interface</name>
<domain>CHIP</domain>
- <typeName>Matter Secondary Network Interface</typeName>
+ <typeName>Secondary Network Interface</typeName>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0019</deviceId>
<class>Utility</class>
@@ -2633,7 +2633,7 @@
<deviceType>
<name>Cooktop</name>
<domain>CHIP</domain>
- <typeName>Matter Cooktop</typeName>
+ <typeName>Cooktop</typeName>
<class>Simple</class>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0078</deviceId>
@@ -2653,7 +2653,7 @@
<deviceType>
<name>Cook Surface</name>
<domain>CHIP</domain>
- <typeName>Matter Cook Surface</typeName>
+ <typeName>Cook Surface</typeName>
<class>Simple</class>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x0077</deviceId>
@@ -2673,7 +2673,7 @@
<deviceType>
<name>Energy EVSE</name>
<domain>CHIP</domain>
- <typeName>Matter EVSE</typeName>
+ <typeName>EVSE</typeName>
<class>Simple</class>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x050C</deviceId>
@@ -2688,7 +2688,7 @@
<deviceType>
<name>Device Energy Management</name>
<domain>CHIP</domain>
- <typeName>Matter Device Energy Management</typeName>
+ <typeName>Device Energy Management</typeName>
<class>Simple</class>
<profileId editable="false">0x0103</profileId>
<deviceId editable="false">0x050D</deviceId>
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
index 5658861..cadfa6a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -34,76 +34,76 @@
};
constexpr DeviceTypeData knownDeviceTypes[] = {
- { 0x0000000A, DeviceTypeClass::Simple, "Matter Door Lock" },
- { 0x0000000B, DeviceTypeClass::Simple, "Matter Door Lock Controller" },
- { 0x0000000E, DeviceTypeClass::Simple, "Matter Aggregator" },
- { 0x0000000F, DeviceTypeClass::Simple, "Matter Generic Switch" },
- { 0x00000011, DeviceTypeClass::Utility, "Matter Power Source" },
- { 0x00000012, DeviceTypeClass::Utility, "Matter OTA Requestor" },
- { 0x00000013, DeviceTypeClass::Utility, "Matter Bridged Node" },
- { 0x00000014, DeviceTypeClass::Utility, "Matter OTA Provider" },
- { 0x00000015, DeviceTypeClass::Simple, "Matter Contact Sensor" },
- { 0x00000016, DeviceTypeClass::Node, "Matter Root Node" },
- { 0x00000019, DeviceTypeClass::Utility, "Matter Secondary Network Interface" },
- { 0x00000022, DeviceTypeClass::Simple, "Matter Speaker" },
- { 0x00000023, DeviceTypeClass::Simple, "Matter Casting Video Player" },
- { 0x00000024, DeviceTypeClass::Simple, "Matter Content App" },
- { 0x00000027, DeviceTypeClass::Simple, "Matter Mode Select" },
- { 0x00000028, DeviceTypeClass::Simple, "Matter Basic Video Player" },
- { 0x00000029, DeviceTypeClass::Simple, "Matter Casting Video Client" },
- { 0x0000002A, DeviceTypeClass::Simple, "Matter Video Remote Control" },
- { 0x0000002B, DeviceTypeClass::Simple, "Matter Fan" },
- { 0x0000002C, DeviceTypeClass::Simple, "Matter Air Quality Sensor" },
- { 0x0000002D, DeviceTypeClass::Simple, "Matter Air Purifier" },
- { 0x00000041, DeviceTypeClass::Simple, "Matter Water Freeze Detector" },
- { 0x00000042, DeviceTypeClass::Simple, "Matter Water Valve" },
- { 0x00000043, DeviceTypeClass::Simple, "Matter Water Leak Detector" },
- { 0x00000044, DeviceTypeClass::Simple, "Matter Rain Sensor" },
- { 0x00000070, DeviceTypeClass::Simple, "Matter Refrigerator" },
- { 0x00000071, DeviceTypeClass::Simple, "Matter Temperature Controlled Cabinet" },
- { 0x00000072, DeviceTypeClass::Simple, "Matter Room Air Conditioner" },
- { 0x00000073, DeviceTypeClass::Simple, "Matter Laundry Washer" },
- { 0x00000074, DeviceTypeClass::Simple, "Matter Robotic Vacuum Cleaner" },
- { 0x00000075, DeviceTypeClass::Simple, "Matter Dishwasher" },
- { 0x00000076, DeviceTypeClass::Simple, "Matter Smoke CO Alarm" },
- { 0x00000077, DeviceTypeClass::Simple, "Matter Cook Surface" },
- { 0x00000078, DeviceTypeClass::Simple, "Matter Cooktop" },
- { 0x00000079, DeviceTypeClass::Simple, "Matter Microwave Oven" },
- { 0x0000007A, DeviceTypeClass::Simple, "Matter Extractor Hood" },
- { 0x0000007B, DeviceTypeClass::Simple, "Matter Oven" },
- { 0x0000007C, DeviceTypeClass::Simple, "Matter Laundry Dryer" },
- { 0x00000090, DeviceTypeClass::Simple, "Matter Network Infrastructure Manager" },
- { 0x00000091, DeviceTypeClass::Simple, "Matter Thread Border Router" },
- { 0x00000100, DeviceTypeClass::Simple, "Matter On/Off Light" },
- { 0x00000101, DeviceTypeClass::Simple, "Matter Dimmable Light" },
- { 0x00000103, DeviceTypeClass::Simple, "Matter On/Off Light Switch" },
- { 0x00000104, DeviceTypeClass::Simple, "Matter Dimmer Switch" },
- { 0x00000105, DeviceTypeClass::Simple, "Matter Color Dimmer Switch" },
- { 0x00000106, DeviceTypeClass::Simple, "Matter Light Sensor" },
- { 0x00000107, DeviceTypeClass::Simple, "Matter Occupancy Sensor" },
- { 0x0000010A, DeviceTypeClass::Simple, "Matter On/Off Plug-in Unit" },
- { 0x0000010B, DeviceTypeClass::Simple, "Matter Dimmable Plug-in Unit" },
- { 0x0000010C, DeviceTypeClass::Simple, "Matter Color Temperature Light" },
- { 0x0000010D, DeviceTypeClass::Simple, "Matter Extended Color Light" },
- { 0x00000202, DeviceTypeClass::Simple, "Matter Window Covering" },
- { 0x00000203, DeviceTypeClass::Simple, "Matter Window Covering Controller" },
- { 0x00000300, DeviceTypeClass::Simple, "Matter Heating/Cooling Unit" },
- { 0x00000301, DeviceTypeClass::Simple, "Matter Thermostat" },
- { 0x00000302, DeviceTypeClass::Simple, "Matter Temperature Sensor" },
- { 0x00000303, DeviceTypeClass::Simple, "Matter Pump" },
- { 0x00000304, DeviceTypeClass::Simple, "Matter Pump Controller" },
- { 0x00000305, DeviceTypeClass::Simple, "Matter Pressure Sensor" },
- { 0x00000306, DeviceTypeClass::Simple, "Matter Flow Sensor" },
- { 0x00000307, DeviceTypeClass::Simple, "Matter Humidity Sensor" },
- { 0x0000050C, DeviceTypeClass::Simple, "Matter EVSE" },
- { 0x0000050D, DeviceTypeClass::Simple, "Matter Device Energy Management" },
- { 0x00000510, DeviceTypeClass::Utility, "Matter Electrical Sensor" },
- { 0x00000840, DeviceTypeClass::Simple, "Matter Control Bridge" },
- { 0x00000850, DeviceTypeClass::Simple, "Matter On/Off Sensor" },
+ { 0x0000000A, DeviceTypeClass::Simple, "Door Lock" },
+ { 0x0000000B, DeviceTypeClass::Simple, "Door Lock Controller" },
+ { 0x0000000E, DeviceTypeClass::Simple, "Aggregator" },
+ { 0x0000000F, DeviceTypeClass::Simple, "Generic Switch" },
+ { 0x00000011, DeviceTypeClass::Utility, "Power Source" },
+ { 0x00000012, DeviceTypeClass::Utility, "OTA Requestor" },
+ { 0x00000013, DeviceTypeClass::Utility, "Bridged Node" },
+ { 0x00000014, DeviceTypeClass::Utility, "OTA Provider" },
+ { 0x00000015, DeviceTypeClass::Simple, "Contact Sensor" },
+ { 0x00000016, DeviceTypeClass::Node, "Root Node" },
+ { 0x00000019, DeviceTypeClass::Utility, "Secondary Network Interface" },
+ { 0x00000022, DeviceTypeClass::Simple, "Speaker" },
+ { 0x00000023, DeviceTypeClass::Simple, "Casting Video Player" },
+ { 0x00000024, DeviceTypeClass::Simple, "Content App" },
+ { 0x00000027, DeviceTypeClass::Simple, "Mode Select" },
+ { 0x00000028, DeviceTypeClass::Simple, "Basic Video Player" },
+ { 0x00000029, DeviceTypeClass::Simple, "Casting Video Client" },
+ { 0x0000002A, DeviceTypeClass::Simple, "Video Remote Control" },
+ { 0x0000002B, DeviceTypeClass::Simple, "Fan" },
+ { 0x0000002C, DeviceTypeClass::Simple, "Air Quality Sensor" },
+ { 0x0000002D, DeviceTypeClass::Simple, "Air Purifier" },
+ { 0x00000041, DeviceTypeClass::Simple, "Water Freeze Detector" },
+ { 0x00000042, DeviceTypeClass::Simple, "Water Valve" },
+ { 0x00000043, DeviceTypeClass::Simple, "Water Leak Detector" },
+ { 0x00000044, DeviceTypeClass::Simple, "Rain Sensor" },
+ { 0x00000070, DeviceTypeClass::Simple, "Refrigerator" },
+ { 0x00000071, DeviceTypeClass::Simple, "Temperature Controlled Cabinet" },
+ { 0x00000072, DeviceTypeClass::Simple, "Room Air Conditioner" },
+ { 0x00000073, DeviceTypeClass::Simple, "Laundry Washer" },
+ { 0x00000074, DeviceTypeClass::Simple, "Robotic Vacuum Cleaner" },
+ { 0x00000075, DeviceTypeClass::Simple, "Dishwasher" },
+ { 0x00000076, DeviceTypeClass::Simple, "Smoke CO Alarm" },
+ { 0x00000077, DeviceTypeClass::Simple, "Cook Surface" },
+ { 0x00000078, DeviceTypeClass::Simple, "Cooktop" },
+ { 0x00000079, DeviceTypeClass::Simple, "Microwave Oven" },
+ { 0x0000007A, DeviceTypeClass::Simple, "Extractor Hood" },
+ { 0x0000007B, DeviceTypeClass::Simple, "Oven" },
+ { 0x0000007C, DeviceTypeClass::Simple, "Laundry Dryer" },
+ { 0x00000090, DeviceTypeClass::Simple, "Network Infrastructure Manager" },
+ { 0x00000091, DeviceTypeClass::Simple, "Thread Border Router" },
+ { 0x00000100, DeviceTypeClass::Simple, "On/Off Light" },
+ { 0x00000101, DeviceTypeClass::Simple, "Dimmable Light" },
+ { 0x00000103, DeviceTypeClass::Simple, "On/Off Light Switch" },
+ { 0x00000104, DeviceTypeClass::Simple, "Dimmer Switch" },
+ { 0x00000105, DeviceTypeClass::Simple, "Color Dimmer Switch" },
+ { 0x00000106, DeviceTypeClass::Simple, "Light Sensor" },
+ { 0x00000107, DeviceTypeClass::Simple, "Occupancy Sensor" },
+ { 0x0000010A, DeviceTypeClass::Simple, "On/Off Plug-in Unit" },
+ { 0x0000010B, DeviceTypeClass::Simple, "Dimmable Plug-in Unit" },
+ { 0x0000010C, DeviceTypeClass::Simple, "Color Temperature Light" },
+ { 0x0000010D, DeviceTypeClass::Simple, "Extended Color Light" },
+ { 0x00000202, DeviceTypeClass::Simple, "Window Covering" },
+ { 0x00000203, DeviceTypeClass::Simple, "Window Covering Controller" },
+ { 0x00000300, DeviceTypeClass::Simple, "Heating/Cooling Unit" },
+ { 0x00000301, DeviceTypeClass::Simple, "Thermostat" },
+ { 0x00000302, DeviceTypeClass::Simple, "Temperature Sensor" },
+ { 0x00000303, DeviceTypeClass::Simple, "Pump" },
+ { 0x00000304, DeviceTypeClass::Simple, "Pump Controller" },
+ { 0x00000305, DeviceTypeClass::Simple, "Pressure Sensor" },
+ { 0x00000306, DeviceTypeClass::Simple, "Flow Sensor" },
+ { 0x00000307, DeviceTypeClass::Simple, "Humidity Sensor" },
+ { 0x0000050C, DeviceTypeClass::Simple, "EVSE" },
+ { 0x0000050D, DeviceTypeClass::Simple, "Device Energy Management" },
+ { 0x00000510, DeviceTypeClass::Utility, "Electrical Sensor" },
+ { 0x00000840, DeviceTypeClass::Simple, "Control Bridge" },
+ { 0x00000850, DeviceTypeClass::Simple, "On/Off Sensor" },
};
-static_assert(ExtractVendorFromMEI(0xFFF10001) != 0, "Must have class defined for \"Matter Orphan Clusters\" if it's a standard device type");
-static_assert(ExtractVendorFromMEI(0xFFF10003) != 0, "Must have class defined for \"Matter All-clusters-app Server Example\" if it's a standard device type");
+static_assert(ExtractVendorFromMEI(0xFFF10001) != 0, "Must have class defined for \"Orphan Clusters\" if it's a standard device type");
+static_assert(ExtractVendorFromMEI(0xFFF10003) != 0, "Must have class defined for \"All-clusters-app Server Example\" if it's a standard device type");
} // anonymous namespace
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
index fd04833..5aa0a78 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -6636,141 +6636,141 @@
switch (id)
{
case 0x0000000A:
- return "Matter Door Lock";
+ return "Door Lock";
case 0x0000000B:
- return "Matter Door Lock Controller";
+ return "Door Lock Controller";
case 0x0000000E:
- return "Matter Aggregator";
+ return "Aggregator";
case 0x0000000F:
- return "Matter Generic Switch";
+ return "Generic Switch";
case 0x00000011:
- return "Matter Power Source";
+ return "Power Source";
case 0x00000012:
- return "Matter OTA Requestor";
+ return "OTA Requestor";
case 0x00000013:
- return "Matter Bridged Node";
+ return "Bridged Node";
case 0x00000014:
- return "Matter OTA Provider";
+ return "OTA Provider";
case 0x00000015:
- return "Matter Contact Sensor";
+ return "Contact Sensor";
case 0x00000016:
- return "Matter Root Node";
+ return "Root Node";
case 0x00000019:
- return "Matter Secondary Network Interface";
+ return "Secondary Network Interface";
case 0x00000022:
- return "Matter Speaker";
+ return "Speaker";
case 0x00000023:
- return "Matter Casting Video Player";
+ return "Casting Video Player";
case 0x00000024:
- return "Matter Content App";
+ return "Content App";
case 0x00000027:
- return "Matter Mode Select";
+ return "Mode Select";
case 0x00000028:
- return "Matter Basic Video Player";
+ return "Basic Video Player";
case 0x00000029:
- return "Matter Casting Video Client";
+ return "Casting Video Client";
case 0x0000002A:
- return "Matter Video Remote Control";
+ return "Video Remote Control";
case 0x0000002B:
- return "Matter Fan";
+ return "Fan";
case 0x0000002C:
- return "Matter Air Quality Sensor";
+ return "Air Quality Sensor";
case 0x0000002D:
- return "Matter Air Purifier";
+ return "Air Purifier";
case 0x00000041:
- return "Matter Water Freeze Detector";
+ return "Water Freeze Detector";
case 0x00000042:
- return "Matter Water Valve";
+ return "Water Valve";
case 0x00000043:
- return "Matter Water Leak Detector";
+ return "Water Leak Detector";
case 0x00000044:
- return "Matter Rain Sensor";
+ return "Rain Sensor";
case 0x00000070:
- return "Matter Refrigerator";
+ return "Refrigerator";
case 0x00000071:
- return "Matter Temperature Controlled Cabinet";
+ return "Temperature Controlled Cabinet";
case 0x00000072:
- return "Matter Room Air Conditioner";
+ return "Room Air Conditioner";
case 0x00000073:
- return "Matter Laundry Washer";
+ return "Laundry Washer";
case 0x00000074:
- return "Matter Robotic Vacuum Cleaner";
+ return "Robotic Vacuum Cleaner";
case 0x00000075:
- return "Matter Dishwasher";
+ return "Dishwasher";
case 0x00000076:
- return "Matter Smoke CO Alarm";
+ return "Smoke CO Alarm";
case 0x00000077:
- return "Matter Cook Surface";
+ return "Cook Surface";
case 0x00000078:
- return "Matter Cooktop";
+ return "Cooktop";
case 0x00000079:
- return "Matter Microwave Oven";
+ return "Microwave Oven";
case 0x0000007A:
- return "Matter Extractor Hood";
+ return "Extractor Hood";
case 0x0000007B:
- return "Matter Oven";
+ return "Oven";
case 0x0000007C:
- return "Matter Laundry Dryer";
+ return "Laundry Dryer";
case 0x00000090:
- return "Matter Network Infrastructure Manager";
+ return "Network Infrastructure Manager";
case 0x00000091:
- return "Matter Thread Border Router";
+ return "Thread Border Router";
case 0x00000100:
- return "Matter On/Off Light";
+ return "On/Off Light";
case 0x00000101:
- return "Matter Dimmable Light";
+ return "Dimmable Light";
case 0x00000103:
- return "Matter On/Off Light Switch";
+ return "On/Off Light Switch";
case 0x00000104:
- return "Matter Dimmer Switch";
+ return "Dimmer Switch";
case 0x00000105:
- return "Matter Color Dimmer Switch";
+ return "Color Dimmer Switch";
case 0x00000106:
- return "Matter Light Sensor";
+ return "Light Sensor";
case 0x00000107:
- return "Matter Occupancy Sensor";
+ return "Occupancy Sensor";
case 0x0000010A:
- return "Matter On/Off Plug-in Unit";
+ return "On/Off Plug-in Unit";
case 0x0000010B:
- return "Matter Dimmable Plug-in Unit";
+ return "Dimmable Plug-in Unit";
case 0x0000010C:
- return "Matter Color Temperature Light";
+ return "Color Temperature Light";
case 0x0000010D:
- return "Matter Extended Color Light";
+ return "Extended Color Light";
case 0x00000202:
- return "Matter Window Covering";
+ return "Window Covering";
case 0x00000203:
- return "Matter Window Covering Controller";
+ return "Window Covering Controller";
case 0x00000300:
- return "Matter Heating/Cooling Unit";
+ return "Heating/Cooling Unit";
case 0x00000301:
- return "Matter Thermostat";
+ return "Thermostat";
case 0x00000302:
- return "Matter Temperature Sensor";
+ return "Temperature Sensor";
case 0x00000303:
- return "Matter Pump";
+ return "Pump";
case 0x00000304:
- return "Matter Pump Controller";
+ return "Pump Controller";
case 0x00000305:
- return "Matter Pressure Sensor";
+ return "Pressure Sensor";
case 0x00000306:
- return "Matter Flow Sensor";
+ return "Flow Sensor";
case 0x00000307:
- return "Matter Humidity Sensor";
+ return "Humidity Sensor";
case 0x0000050C:
- return "Matter EVSE";
+ return "EVSE";
case 0x0000050D:
- return "Matter Device Energy Management";
+ return "Device Energy Management";
case 0x00000510:
- return "Matter Electrical Sensor";
+ return "Electrical Sensor";
case 0x00000840:
- return "Matter Control Bridge";
+ return "Control Bridge";
case 0x00000850:
- return "Matter On/Off Sensor";
+ return "On/Off Sensor";
case 0xFFF10001:
- return "Matter Orphan Clusters";
+ return "Orphan Clusters";
case 0xFFF10003:
- return "Matter All-clusters-app Server Example";
+ return "All-clusters-app Server Example";
default:
return "Unknown";
}
