From c5b2d706d4d3dc54f4f3d6c06a52a4a26e3d7604 Mon Sep 17 00:00:00 2001 From: cecille Date: Thu, 9 Nov 2023 10:36:35 -0500 Subject: [PATCH 1/3] DM XML: Add device types to script and re-gen --- data_model/clusters/AlarmBase.xml | 6 +- data_model/clusters/Channel.xml | 3 +- data_model/device_types/Aggregator.xml | 73 +++++++ data_model/device_types/AirPurifier.xml | 81 ++++++++ data_model/device_types/AirQualitySensor.xml | 108 ++++++++++ data_model/device_types/BaseDeviceType.xml | 65 ++++++ data_model/device_types/BasicVideoPlayer.xml | 98 +++++++++ data_model/device_types/BooleanSensor.xml | 72 +++++++ data_model/device_types/BridgedNode.xml | 84 ++++++++ .../device_types/CastingVideoClient.xml | 109 ++++++++++ .../device_types/CastingVideoPlayer.xml | 117 +++++++++++ data_model/device_types/ColorDimmerSwitch.xml | 92 +++++++++ .../device_types/ColorTemperatureLight.xml | 148 ++++++++++++++ data_model/device_types/ContactSensor.xml | 72 +++++++ data_model/device_types/ContentApp.xml | 96 +++++++++ data_model/device_types/ControlBridge.xml | 99 +++++++++ data_model/device_types/CookSurface.xml | 72 +++++++ data_model/device_types/Cooktop.xml | 80 ++++++++ data_model/device_types/DimmableLight.xml | 145 +++++++++++++ .../device_types/DimmablePlug-InUnit.xml | 142 +++++++++++++ data_model/device_types/DimmerSwitch.xml | 89 ++++++++ data_model/device_types/Dishwasher.xml | 99 +++++++++ data_model/device_types/DoorLock.xml | 190 ++++++++++++++++++ .../device_types/DoorLockController.xml | 99 +++++++++ data_model/device_types/EVSE.xml | 106 ++++++++++ data_model/device_types/EnergyTariff.xml | 64 ++++++ .../device_types/EnergyTariffCalendar.xml | 64 ++++++ .../device_types/ExtendedColorLight.xml | 160 +++++++++++++++ data_model/device_types/ExtractorHood.xml | 89 ++++++++ data_model/device_types/Fan.xml | 85 ++++++++ data_model/device_types/FlowSensor.xml | 79 ++++++++ data_model/device_types/GenericSwitch.xml | 74 +++++++ .../device_types/HeatingCoolingUnit.xml | 95 +++++++++ data_model/device_types/HumiditySensor.xml | 79 ++++++++ data_model/device_types/LaundryDryer.xml | 99 +++++++++ data_model/device_types/LaundryWasher.xml | 99 +++++++++ data_model/device_types/LightSensor.xml | 80 ++++++++ data_model/device_types/MicrowaveOven.xml | 92 +++++++++ .../device_types/ModeSelectDeviceType.xml | 70 +++++++ data_model/device_types/NetworkInfraIntro.xml | 58 ++++++ .../device_types/NetworkInfraManager.xml | 69 +++++++ data_model/device_types/OccupancySensor.xml | 80 ++++++++ data_model/device_types/OnOffLight.xml | 145 +++++++++++++ data_model/device_types/OnOffLightSwitch.xml | 86 ++++++++ data_model/device_types/OnOffPlug-inUnit.xml | 145 +++++++++++++ data_model/device_types/OnOffSensor.xml | 93 +++++++++ data_model/device_types/OtaProvider.xml | 72 +++++++ data_model/device_types/OtaRequestor.xml | 72 +++++++ data_model/device_types/Oven.xml | 69 +++++++ data_model/device_types/PowerSource.xml | 75 +++++++ data_model/device_types/PressureSensor.xml | 79 ++++++++ data_model/device_types/Pump.xml | 110 ++++++++++ data_model/device_types/PumpController.xml | 103 ++++++++++ data_model/device_types/Refrigerator.xml | 85 ++++++++ .../device_types/RoboticVacuumCleaner.xml | 107 ++++++++++ .../device_types/RoomAirConditioner.xml | 98 +++++++++ .../device_types/RootNodeDeviceType.xml | 164 +++++++++++++++ data_model/device_types/SmokeCOAlarm.xml | 84 ++++++++ data_model/device_types/Speaker.xml | 73 +++++++ .../TemperatureControlledCabinet.xml | 106 ++++++++++ data_model/device_types/TemperatureSensor.xml | 79 ++++++++ data_model/device_types/Thermostat.xml | 157 +++++++++++++++ .../device_types/ThreadBorderRouter.xml | 80 ++++++++ .../device_types/ThreePhasePowerSource.xml | 77 +++++++ data_model/device_types/Valve.xml | 72 +++++++ .../device_types/VideoRemoteControl.xml | 106 ++++++++++ data_model/device_types/WaterHeater.xml | 100 +++++++++ data_model/device_types/WaterLeakDetector.xml | 80 ++++++++ data_model/device_types/WindowCovering.xml | 124 ++++++++++++ .../device_types/WindowCoveringController.xml | 101 ++++++++++ .../section_Application-Device-Types.xml | 58 ++++++ .../section_Utility-Device-Types.xml | 58 ++++++ data_model/device_types/section_actuators.xml | 58 ++++++ .../device_types/section_appliances.xml | 58 ++++++ data_model/device_types/section_base.xml | 58 ++++++ data_model/device_types/section_closures.xml | 58 ++++++ data_model/device_types/section_energy.xml | 58 ++++++ data_model/device_types/section_generic.xml | 58 ++++++ data_model/device_types/section_hvac.xml | 58 ++++++ data_model/device_types/section_lighting.xml | 58 ++++++ data_model/device_types/section_media.xml | 58 ++++++ .../section_network_infrastructure.xml | 58 ++++++ data_model/device_types/section_robots.xml | 58 ++++++ data_model/device_types/section_sensors.xml | 58 ++++++ data_model/device_types/section_switches.xml | 58 ++++++ data_model/spec_sha | 2 +- scripts/spec_xml/generate_spec_xml.py | 36 +++- 87 files changed, 7423 insertions(+), 8 deletions(-) create mode 100644 data_model/device_types/Aggregator.xml create mode 100644 data_model/device_types/AirPurifier.xml create mode 100644 data_model/device_types/AirQualitySensor.xml create mode 100644 data_model/device_types/BaseDeviceType.xml create mode 100644 data_model/device_types/BasicVideoPlayer.xml create mode 100644 data_model/device_types/BooleanSensor.xml create mode 100644 data_model/device_types/BridgedNode.xml create mode 100644 data_model/device_types/CastingVideoClient.xml create mode 100644 data_model/device_types/CastingVideoPlayer.xml create mode 100644 data_model/device_types/ColorDimmerSwitch.xml create mode 100644 data_model/device_types/ColorTemperatureLight.xml create mode 100644 data_model/device_types/ContactSensor.xml create mode 100644 data_model/device_types/ContentApp.xml create mode 100644 data_model/device_types/ControlBridge.xml create mode 100644 data_model/device_types/CookSurface.xml create mode 100644 data_model/device_types/Cooktop.xml create mode 100644 data_model/device_types/DimmableLight.xml create mode 100644 data_model/device_types/DimmablePlug-InUnit.xml create mode 100644 data_model/device_types/DimmerSwitch.xml create mode 100644 data_model/device_types/Dishwasher.xml create mode 100644 data_model/device_types/DoorLock.xml create mode 100644 data_model/device_types/DoorLockController.xml create mode 100644 data_model/device_types/EVSE.xml create mode 100644 data_model/device_types/EnergyTariff.xml create mode 100644 data_model/device_types/EnergyTariffCalendar.xml create mode 100644 data_model/device_types/ExtendedColorLight.xml create mode 100644 data_model/device_types/ExtractorHood.xml create mode 100644 data_model/device_types/Fan.xml create mode 100644 data_model/device_types/FlowSensor.xml create mode 100644 data_model/device_types/GenericSwitch.xml create mode 100644 data_model/device_types/HeatingCoolingUnit.xml create mode 100644 data_model/device_types/HumiditySensor.xml create mode 100644 data_model/device_types/LaundryDryer.xml create mode 100644 data_model/device_types/LaundryWasher.xml create mode 100644 data_model/device_types/LightSensor.xml create mode 100644 data_model/device_types/MicrowaveOven.xml create mode 100644 data_model/device_types/ModeSelectDeviceType.xml create mode 100644 data_model/device_types/NetworkInfraIntro.xml create mode 100644 data_model/device_types/NetworkInfraManager.xml create mode 100644 data_model/device_types/OccupancySensor.xml create mode 100644 data_model/device_types/OnOffLight.xml create mode 100644 data_model/device_types/OnOffLightSwitch.xml create mode 100644 data_model/device_types/OnOffPlug-inUnit.xml create mode 100644 data_model/device_types/OnOffSensor.xml create mode 100644 data_model/device_types/OtaProvider.xml create mode 100644 data_model/device_types/OtaRequestor.xml create mode 100644 data_model/device_types/Oven.xml create mode 100644 data_model/device_types/PowerSource.xml create mode 100644 data_model/device_types/PressureSensor.xml create mode 100644 data_model/device_types/Pump.xml create mode 100644 data_model/device_types/PumpController.xml create mode 100644 data_model/device_types/Refrigerator.xml create mode 100644 data_model/device_types/RoboticVacuumCleaner.xml create mode 100644 data_model/device_types/RoomAirConditioner.xml create mode 100644 data_model/device_types/RootNodeDeviceType.xml create mode 100644 data_model/device_types/SmokeCOAlarm.xml create mode 100644 data_model/device_types/Speaker.xml create mode 100644 data_model/device_types/TemperatureControlledCabinet.xml create mode 100644 data_model/device_types/TemperatureSensor.xml create mode 100644 data_model/device_types/Thermostat.xml create mode 100644 data_model/device_types/ThreadBorderRouter.xml create mode 100644 data_model/device_types/ThreePhasePowerSource.xml create mode 100644 data_model/device_types/Valve.xml create mode 100644 data_model/device_types/VideoRemoteControl.xml create mode 100644 data_model/device_types/WaterHeater.xml create mode 100644 data_model/device_types/WaterLeakDetector.xml create mode 100644 data_model/device_types/WindowCovering.xml create mode 100644 data_model/device_types/WindowCoveringController.xml create mode 100644 data_model/device_types/section_Application-Device-Types.xml create mode 100644 data_model/device_types/section_Utility-Device-Types.xml create mode 100644 data_model/device_types/section_actuators.xml create mode 100644 data_model/device_types/section_appliances.xml create mode 100644 data_model/device_types/section_base.xml create mode 100644 data_model/device_types/section_closures.xml create mode 100644 data_model/device_types/section_energy.xml create mode 100644 data_model/device_types/section_generic.xml create mode 100644 data_model/device_types/section_hvac.xml create mode 100644 data_model/device_types/section_lighting.xml create mode 100644 data_model/device_types/section_media.xml create mode 100644 data_model/device_types/section_network_infrastructure.xml create mode 100644 data_model/device_types/section_robots.xml create mode 100644 data_model/device_types/section_sensors.xml create mode 100644 data_model/device_types/section_switches.xml diff --git a/data_model/clusters/AlarmBase.xml b/data_model/clusters/AlarmBase.xml index b169d4fe9be24a..834089869b21da 100644 --- a/data_model/clusters/AlarmBase.xml +++ b/data_model/clusters/AlarmBase.xml @@ -115,13 +115,13 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml index 3227cf9a5a446e..b75540d94a6baf 100644 --- a/data_model/clusters/Channel.xml +++ b/data_model/clusters/Channel.xml @@ -129,8 +129,9 @@ Davis, CA 95616, USA - + + diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml new file mode 100644 index 00000000000000..3f70f3d78ccb4b --- /dev/null +++ b/data_model/device_types/Aggregator.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/AirPurifier.xml b/data_model/device_types/AirPurifier.xml new file mode 100644 index 00000000000000..9793cd1d36b215 --- /dev/null +++ b/data_model/device_types/AirPurifier.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/AirQualitySensor.xml b/data_model/device_types/AirQualitySensor.xml new file mode 100644 index 00000000000000..0c96fbd60515b7 --- /dev/null +++ b/data_model/device_types/AirQualitySensor.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/BaseDeviceType.xml b/data_model/device_types/BaseDeviceType.xml new file mode 100644 index 00000000000000..22cec956aa6061 --- /dev/null +++ b/data_model/device_types/BaseDeviceType.xml @@ -0,0 +1,65 @@ + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/BasicVideoPlayer.xml b/data_model/device_types/BasicVideoPlayer.xml new file mode 100644 index 00000000000000..f6b86091004bfe --- /dev/null +++ b/data_model/device_types/BasicVideoPlayer.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/BooleanSensor.xml b/data_model/device_types/BooleanSensor.xml new file mode 100644 index 00000000000000..185fdc47176813 --- /dev/null +++ b/data_model/device_types/BooleanSensor.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/BridgedNode.xml b/data_model/device_types/BridgedNode.xml new file mode 100644 index 00000000000000..a383ed2b541d6b --- /dev/null +++ b/data_model/device_types/BridgedNode.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/CastingVideoClient.xml b/data_model/device_types/CastingVideoClient.xml new file mode 100644 index 00000000000000..06ef2b5492f337 --- /dev/null +++ b/data_model/device_types/CastingVideoClient.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/CastingVideoPlayer.xml b/data_model/device_types/CastingVideoPlayer.xml new file mode 100644 index 00000000000000..fd26bb675cbdf6 --- /dev/null +++ b/data_model/device_types/CastingVideoPlayer.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ColorDimmerSwitch.xml b/data_model/device_types/ColorDimmerSwitch.xml new file mode 100644 index 00000000000000..dcd2ac18b1a912 --- /dev/null +++ b/data_model/device_types/ColorDimmerSwitch.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml new file mode 100644 index 00000000000000..5897f0ee0b796a --- /dev/null +++ b/data_model/device_types/ColorTemperatureLight.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ContactSensor.xml b/data_model/device_types/ContactSensor.xml new file mode 100644 index 00000000000000..e8a7c3f343a9f4 --- /dev/null +++ b/data_model/device_types/ContactSensor.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml new file mode 100644 index 00000000000000..8f927c48f44a35 --- /dev/null +++ b/data_model/device_types/ContentApp.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ControlBridge.xml b/data_model/device_types/ControlBridge.xml new file mode 100644 index 00000000000000..6ed528c0122d96 --- /dev/null +++ b/data_model/device_types/ControlBridge.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/CookSurface.xml b/data_model/device_types/CookSurface.xml new file mode 100644 index 00000000000000..34f5556234a6e5 --- /dev/null +++ b/data_model/device_types/CookSurface.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Cooktop.xml b/data_model/device_types/Cooktop.xml new file mode 100644 index 00000000000000..8288f38c8a87ba --- /dev/null +++ b/data_model/device_types/Cooktop.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/DimmableLight.xml b/data_model/device_types/DimmableLight.xml new file mode 100644 index 00000000000000..39f193f53e7553 --- /dev/null +++ b/data_model/device_types/DimmableLight.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml new file mode 100644 index 00000000000000..c262abf3741d7e --- /dev/null +++ b/data_model/device_types/DimmablePlug-InUnit.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/DimmerSwitch.xml b/data_model/device_types/DimmerSwitch.xml new file mode 100644 index 00000000000000..a3bae868a2498b --- /dev/null +++ b/data_model/device_types/DimmerSwitch.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Dishwasher.xml b/data_model/device_types/Dishwasher.xml new file mode 100644 index 00000000000000..429e96c149abe9 --- /dev/null +++ b/data_model/device_types/Dishwasher.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/DoorLock.xml b/data_model/device_types/DoorLock.xml new file mode 100644 index 00000000000000..d31aaad30d8d98 --- /dev/null +++ b/data_model/device_types/DoorLock.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml new file mode 100644 index 00000000000000..4f4efb3ea90d1c --- /dev/null +++ b/data_model/device_types/DoorLockController.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/EVSE.xml b/data_model/device_types/EVSE.xml new file mode 100644 index 00000000000000..b5e57c83aa3ac1 --- /dev/null +++ b/data_model/device_types/EVSE.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/EnergyTariff.xml b/data_model/device_types/EnergyTariff.xml new file mode 100644 index 00000000000000..9e6e0b4c12ab36 --- /dev/null +++ b/data_model/device_types/EnergyTariff.xml @@ -0,0 +1,64 @@ + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/EnergyTariffCalendar.xml b/data_model/device_types/EnergyTariffCalendar.xml new file mode 100644 index 00000000000000..3dca889b777e66 --- /dev/null +++ b/data_model/device_types/EnergyTariffCalendar.xml @@ -0,0 +1,64 @@ + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml new file mode 100644 index 00000000000000..4120226176e7a1 --- /dev/null +++ b/data_model/device_types/ExtendedColorLight.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ExtractorHood.xml b/data_model/device_types/ExtractorHood.xml new file mode 100644 index 00000000000000..5fdbc7c84a1583 --- /dev/null +++ b/data_model/device_types/ExtractorHood.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Fan.xml b/data_model/device_types/Fan.xml new file mode 100644 index 00000000000000..49538ec32097b6 --- /dev/null +++ b/data_model/device_types/Fan.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/FlowSensor.xml b/data_model/device_types/FlowSensor.xml new file mode 100644 index 00000000000000..8c604586481536 --- /dev/null +++ b/data_model/device_types/FlowSensor.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/GenericSwitch.xml b/data_model/device_types/GenericSwitch.xml new file mode 100644 index 00000000000000..7e13a7e18223ab --- /dev/null +++ b/data_model/device_types/GenericSwitch.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/HeatingCoolingUnit.xml b/data_model/device_types/HeatingCoolingUnit.xml new file mode 100644 index 00000000000000..244ff14b0a15fa --- /dev/null +++ b/data_model/device_types/HeatingCoolingUnit.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/HumiditySensor.xml b/data_model/device_types/HumiditySensor.xml new file mode 100644 index 00000000000000..d59ed7caf43abe --- /dev/null +++ b/data_model/device_types/HumiditySensor.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/LaundryDryer.xml b/data_model/device_types/LaundryDryer.xml new file mode 100644 index 00000000000000..a7d365f22e14fe --- /dev/null +++ b/data_model/device_types/LaundryDryer.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/LaundryWasher.xml b/data_model/device_types/LaundryWasher.xml new file mode 100644 index 00000000000000..07cd62a605fc9c --- /dev/null +++ b/data_model/device_types/LaundryWasher.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/LightSensor.xml b/data_model/device_types/LightSensor.xml new file mode 100644 index 00000000000000..618901b398b5f8 --- /dev/null +++ b/data_model/device_types/LightSensor.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/MicrowaveOven.xml b/data_model/device_types/MicrowaveOven.xml new file mode 100644 index 00000000000000..8e77925b4131fc --- /dev/null +++ b/data_model/device_types/MicrowaveOven.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ModeSelectDeviceType.xml b/data_model/device_types/ModeSelectDeviceType.xml new file mode 100644 index 00000000000000..748dc1bae2f0a3 --- /dev/null +++ b/data_model/device_types/ModeSelectDeviceType.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/NetworkInfraIntro.xml b/data_model/device_types/NetworkInfraIntro.xml new file mode 100644 index 00000000000000..22d91b6f459c6d --- /dev/null +++ b/data_model/device_types/NetworkInfraIntro.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/NetworkInfraManager.xml b/data_model/device_types/NetworkInfraManager.xml new file mode 100644 index 00000000000000..750a97f22cad86 --- /dev/null +++ b/data_model/device_types/NetworkInfraManager.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OccupancySensor.xml b/data_model/device_types/OccupancySensor.xml new file mode 100644 index 00000000000000..bef470cc1c9ec6 --- /dev/null +++ b/data_model/device_types/OccupancySensor.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OnOffLight.xml b/data_model/device_types/OnOffLight.xml new file mode 100644 index 00000000000000..1ce39e8545c84a --- /dev/null +++ b/data_model/device_types/OnOffLight.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OnOffLightSwitch.xml b/data_model/device_types/OnOffLightSwitch.xml new file mode 100644 index 00000000000000..c2c324c8ee5d2a --- /dev/null +++ b/data_model/device_types/OnOffLightSwitch.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml new file mode 100644 index 00000000000000..1847119e49426c --- /dev/null +++ b/data_model/device_types/OnOffPlug-inUnit.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OnOffSensor.xml b/data_model/device_types/OnOffSensor.xml new file mode 100644 index 00000000000000..d2c6553fc1140c --- /dev/null +++ b/data_model/device_types/OnOffSensor.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OtaProvider.xml b/data_model/device_types/OtaProvider.xml new file mode 100644 index 00000000000000..28c4e3c70b88e9 --- /dev/null +++ b/data_model/device_types/OtaProvider.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/OtaRequestor.xml b/data_model/device_types/OtaRequestor.xml new file mode 100644 index 00000000000000..7f5a8ca11c58c8 --- /dev/null +++ b/data_model/device_types/OtaRequestor.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Oven.xml b/data_model/device_types/Oven.xml new file mode 100644 index 00000000000000..5a13b0ec9ba053 --- /dev/null +++ b/data_model/device_types/Oven.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/PowerSource.xml b/data_model/device_types/PowerSource.xml new file mode 100644 index 00000000000000..05aaa56f88cf92 --- /dev/null +++ b/data_model/device_types/PowerSource.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/PressureSensor.xml b/data_model/device_types/PressureSensor.xml new file mode 100644 index 00000000000000..f472daaf4e39ff --- /dev/null +++ b/data_model/device_types/PressureSensor.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Pump.xml b/data_model/device_types/Pump.xml new file mode 100644 index 00000000000000..6f1b1f39aae53c --- /dev/null +++ b/data_model/device_types/Pump.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/PumpController.xml b/data_model/device_types/PumpController.xml new file mode 100644 index 00000000000000..070e3a5912942b --- /dev/null +++ b/data_model/device_types/PumpController.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Refrigerator.xml b/data_model/device_types/Refrigerator.xml new file mode 100644 index 00000000000000..19a9b568872e4a --- /dev/null +++ b/data_model/device_types/Refrigerator.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/RoboticVacuumCleaner.xml b/data_model/device_types/RoboticVacuumCleaner.xml new file mode 100644 index 00000000000000..4e02b17d772606 --- /dev/null +++ b/data_model/device_types/RoboticVacuumCleaner.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/RoomAirConditioner.xml b/data_model/device_types/RoomAirConditioner.xml new file mode 100644 index 00000000000000..86240698da6789 --- /dev/null +++ b/data_model/device_types/RoomAirConditioner.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml new file mode 100644 index 00000000000000..f4792a2e1f5a96 --- /dev/null +++ b/data_model/device_types/RootNodeDeviceType.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/SmokeCOAlarm.xml b/data_model/device_types/SmokeCOAlarm.xml new file mode 100644 index 00000000000000..5888e8148f0927 --- /dev/null +++ b/data_model/device_types/SmokeCOAlarm.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Speaker.xml b/data_model/device_types/Speaker.xml new file mode 100644 index 00000000000000..f8bc0ab150036e --- /dev/null +++ b/data_model/device_types/Speaker.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/TemperatureControlledCabinet.xml b/data_model/device_types/TemperatureControlledCabinet.xml new file mode 100644 index 00000000000000..93c09339a65a75 --- /dev/null +++ b/data_model/device_types/TemperatureControlledCabinet.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/TemperatureSensor.xml b/data_model/device_types/TemperatureSensor.xml new file mode 100644 index 00000000000000..19d3fef781c717 --- /dev/null +++ b/data_model/device_types/TemperatureSensor.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml new file mode 100644 index 00000000000000..ebc43e7dbf7203 --- /dev/null +++ b/data_model/device_types/Thermostat.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ThreadBorderRouter.xml b/data_model/device_types/ThreadBorderRouter.xml new file mode 100644 index 00000000000000..5a069e57e93243 --- /dev/null +++ b/data_model/device_types/ThreadBorderRouter.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/ThreePhasePowerSource.xml b/data_model/device_types/ThreePhasePowerSource.xml new file mode 100644 index 00000000000000..3a3d5a018223b4 --- /dev/null +++ b/data_model/device_types/ThreePhasePowerSource.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/Valve.xml b/data_model/device_types/Valve.xml new file mode 100644 index 00000000000000..4ce864b01ab246 --- /dev/null +++ b/data_model/device_types/Valve.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/VideoRemoteControl.xml b/data_model/device_types/VideoRemoteControl.xml new file mode 100644 index 00000000000000..c86fb3ba437a55 --- /dev/null +++ b/data_model/device_types/VideoRemoteControl.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WaterHeater.xml b/data_model/device_types/WaterHeater.xml new file mode 100644 index 00000000000000..2f2f7fae235e1b --- /dev/null +++ b/data_model/device_types/WaterHeater.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WaterLeakDetector.xml b/data_model/device_types/WaterLeakDetector.xml new file mode 100644 index 00000000000000..596a9cebb2ac04 --- /dev/null +++ b/data_model/device_types/WaterLeakDetector.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WindowCovering.xml b/data_model/device_types/WindowCovering.xml new file mode 100644 index 00000000000000..83f03a2a04e5ed --- /dev/null +++ b/data_model/device_types/WindowCovering.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WindowCoveringController.xml b/data_model/device_types/WindowCoveringController.xml new file mode 100644 index 00000000000000..c79d5a2279f6a8 --- /dev/null +++ b/data_model/device_types/WindowCoveringController.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/section_Application-Device-Types.xml b/data_model/device_types/section_Application-Device-Types.xml new file mode 100644 index 00000000000000..d1d3347d9b9a09 --- /dev/null +++ b/data_model/device_types/section_Application-Device-Types.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_Utility-Device-Types.xml b/data_model/device_types/section_Utility-Device-Types.xml new file mode 100644 index 00000000000000..5301efeee4af6d --- /dev/null +++ b/data_model/device_types/section_Utility-Device-Types.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_actuators.xml b/data_model/device_types/section_actuators.xml new file mode 100644 index 00000000000000..c765417fecabd7 --- /dev/null +++ b/data_model/device_types/section_actuators.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_appliances.xml b/data_model/device_types/section_appliances.xml new file mode 100644 index 00000000000000..57e7f957d42121 --- /dev/null +++ b/data_model/device_types/section_appliances.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_base.xml b/data_model/device_types/section_base.xml new file mode 100644 index 00000000000000..b27303abc475c0 --- /dev/null +++ b/data_model/device_types/section_base.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_closures.xml b/data_model/device_types/section_closures.xml new file mode 100644 index 00000000000000..59213ae32cb33b --- /dev/null +++ b/data_model/device_types/section_closures.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_energy.xml b/data_model/device_types/section_energy.xml new file mode 100644 index 00000000000000..3bb9912a75e078 --- /dev/null +++ b/data_model/device_types/section_energy.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_generic.xml b/data_model/device_types/section_generic.xml new file mode 100644 index 00000000000000..77276651023255 --- /dev/null +++ b/data_model/device_types/section_generic.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_hvac.xml b/data_model/device_types/section_hvac.xml new file mode 100644 index 00000000000000..afee5781c54c6c --- /dev/null +++ b/data_model/device_types/section_hvac.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_lighting.xml b/data_model/device_types/section_lighting.xml new file mode 100644 index 00000000000000..bf6c953f33daa2 --- /dev/null +++ b/data_model/device_types/section_lighting.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_media.xml b/data_model/device_types/section_media.xml new file mode 100644 index 00000000000000..b860229711f41b --- /dev/null +++ b/data_model/device_types/section_media.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_network_infrastructure.xml b/data_model/device_types/section_network_infrastructure.xml new file mode 100644 index 00000000000000..8800e3f1ea7e75 --- /dev/null +++ b/data_model/device_types/section_network_infrastructure.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_robots.xml b/data_model/device_types/section_robots.xml new file mode 100644 index 00000000000000..2af0ee8ac95305 --- /dev/null +++ b/data_model/device_types/section_robots.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_sensors.xml b/data_model/device_types/section_sensors.xml new file mode 100644 index 00000000000000..69efafea8b4ab8 --- /dev/null +++ b/data_model/device_types/section_sensors.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/device_types/section_switches.xml b/data_model/device_types/section_switches.xml new file mode 100644 index 00000000000000..e6c2a829c1f155 --- /dev/null +++ b/data_model/device_types/section_switches.xml @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/data_model/spec_sha b/data_model/spec_sha index d114fd3ddcace3..8f0fe93c130fdf 100644 --- a/data_model/spec_sha +++ b/data_model/spec_sha @@ -1 +1 @@ -17cfdc4a04397eec62f1bce7984cace268b28ab3 +aa5e85ba89d2de63cd9e205948f3ad0fe309d023 diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py index 1b3a767aa1c242..2989717a1d03a6 100755 --- a/scripts/spec_xml/generate_spec_xml.py +++ b/scripts/spec_xml/generate_spec_xml.py @@ -24,6 +24,11 @@ DEFAULT_OUTPUT_DIR = os.path.abspath(os.path.join(DEFAULT_CHIP_ROOT, 'data_model')) +def get_xml_path(filename, output_dir): + xml = os.path.basename(filename).replace('.adoc', '.xml') + return os.path.abspath(os.path.join(output_dir, xml)) + + @click.command() @click.option( '--scraper', @@ -45,8 +50,12 @@ is_flag=True, help='Flag for dry run') def main(scraper, spec_root, output_dir, dry_run): - # TODO: Add scrapers for device types + # Clusters need to be scraped first because the cluster directory is passed to the device type directory + scrape_clusters(scraper, spec_root, output_dir, dry_run) + scrape_device_types(scraper, spec_root, output_dir, dry_run) + +def scrape_clusters(scraper, spec_root, output_dir, dry_run): src_dir = os.path.abspath(os.path.join(spec_root, 'src')) sdm_clusters_dir = os.path.abspath(os.path.join(src_dir, 'service_device_management')) app_clusters_dir = os.path.abspath(os.path.join(src_dir, 'app_clusters')) @@ -65,8 +74,7 @@ def main(scraper, spec_root, output_dir, dry_run): os.makedirs(clusters_output_dir) def scrape_cluster(filename: str) -> None: - xml = os.path.basename(filename).replace('.adoc', '.xml') - xml_path = os.path.abspath(os.path.join(clusters_output_dir, xml)) + xml_path = get_xml_path(filename, clusters_output_dir) cmd = [scraper, 'cluster', filename, xml_path, '-nd'] if dry_run: print(cmd) @@ -94,5 +102,27 @@ def scrape_all_clusters(dir: str, exclude_list: list[str] = []) -> None: output.write(sha) +def scrape_device_types(scraper, spec_root, output_dir, dry_run): + device_type_dir = os.path.abspath(os.path.join(spec_root, 'src', 'device_types')) + device_types_output_dir = os.path.abspath(os.path.join(output_dir, 'device_types')) + clusters_output_dir = os.path.abspath(os.path.join(output_dir, 'clusters')) + + if not os.path.exists(device_types_output_dir): + os.makedirs(device_types_output_dir) + + def scrape_device_type(filename: str) -> None: + xml_path = get_xml_path(filename, device_types_output_dir) + print(xml_path) + cmd = [scraper, 'devicetype', '-c', clusters_output_dir, '-nd', filename, xml_path] + if dry_run: + print(cmd) + else: + print(' '.join(cmd)) + subprocess.run(cmd) + + for filename in glob.glob(f'{device_type_dir}/*.adoc'): + scrape_device_type(filename) + + if __name__ == '__main__': main() From 700bf480e05f7009a67cd7b658314faaf9784848 Mon Sep 17 00:00:00 2001 From: Cecille Freeman Date: Tue, 14 Nov 2023 09:21:30 -0500 Subject: [PATCH 2/3] Address review comments, use new scraper, add version --- data_model/clusters/ACL-Cluster.xml | 12 +-- data_model/clusters/AccountLogin.xml | 2 +- .../clusters/AdminCommissioningCluster.xml | 8 +- data_model/clusters/AirQuality.xml | 2 +- data_model/clusters/ApplicationBasic.xml | 2 +- data_model/clusters/ApplicationLauncher.xml | 6 +- data_model/clusters/AudioOutput.xml | 8 +- .../clusters/BasicInformationCluster.xml | 28 +++--- data_model/clusters/Binding-Cluster.xml | 5 +- data_model/clusters/Channel.xml | 7 +- data_model/clusters/ColorControl.xml | 30 +++--- .../clusters/ConcentrationMeasurement.xml | 15 ++- data_model/clusters/ContentControl.xml | 8 +- data_model/clusters/ContentLauncher.xml | 14 +-- .../clusters/DemandResponseLoadControl.xml | 31 +++---- data_model/clusters/Descriptor-Cluster.xml | 12 ++- .../clusters/DeviceEnergyManagement.xml | 25 +++-- data_model/clusters/DiagnosticLogsCluster.xml | 8 +- data_model/clusters/DiagnosticsGeneral.xml | 32 +++---- data_model/clusters/DiagnosticsSoftware.xml | 8 +- data_model/clusters/DiagnosticsThread.xml | 54 +++++------ data_model/clusters/DiagnosticsWiFi.xml | 8 +- data_model/clusters/DishwasherAlarm.xml | 2 +- data_model/clusters/DoorLock.xml | 66 +++++++------- .../clusters/ElectricalEnergyMeasurement.xml | 6 +- .../clusters/ElectricalPowerMeasurement.xml | 20 ++-- data_model/clusters/EnergyCalendar.xml | 32 ++----- data_model/clusters/EnergyPreference.xml | 13 ++- data_model/clusters/EnergyPrice.xml | 2 +- data_model/clusters/FanControl.xml | 4 +- .../clusters/Group-Key-Management-Cluster.xml | 26 +++--- .../clusters/Label-Cluster-FixedLabel.xml | 3 +- data_model/clusters/Label-Cluster-Label.xml | 3 +- .../clusters/Label-Cluster-UserLabel.xml | 5 +- data_model/clusters/LaundryDryerControls.xml | 4 +- data_model/clusters/LaundryWasherControls.xml | 5 +- data_model/clusters/LevelControl.xml | 4 +- .../clusters/LocalizationConfiguration.xml | 6 +- .../clusters/LocalizationTimeFormat.xml | 4 +- data_model/clusters/LocalizationUnit.xml | 2 +- data_model/clusters/MediaInput.xml | 3 +- data_model/clusters/MediaPlayback.xml | 4 +- data_model/clusters/Messages.xml | 21 +++-- data_model/clusters/MicrowaveOvenControl.xml | 2 +- data_model/clusters/ModeBase.xml | 10 +- data_model/clusters/Mode_LaundryWasher.xml | 91 ------------------- data_model/clusters/Mode_MicrowaveOven.xml | 2 +- .../clusters/NetworkCommissioningCluster.xml | 42 ++++----- .../clusters/NetworkIdentityManagement.xml | 24 ++--- .../clusters/OperationalCredentialCluster.xml | 54 +++++------ data_model/clusters/OperationalState.xml | 8 +- data_model/clusters/PowerSourceCluster.xml | 47 +++++----- .../PowerSourceConfigurationCluster.xml | 7 +- .../clusters/PumpConfigurationControl.xml | 12 +-- data_model/clusters/ResourceMonitoring.xml | 10 +- data_model/clusters/Scenes.xml | 23 +++-- data_model/clusters/SmokeCOAlarm.xml | 10 +- data_model/clusters/Switch.xml | 2 +- data_model/clusters/TargetNavigator.xml | 3 +- data_model/clusters/Thermostat.xml | 29 +++--- .../ThreadBorderRouterDiagnostics.xml | 2 +- data_model/clusters/TimeSync.xml | 22 ++--- .../clusters/WaterContentMeasurement.xml | 6 +- data_model/clusters/WaterHeaterManagement.xml | 2 +- data_model/clusters/WindowCovering.xml | 20 ++-- .../clusters/bridge-clusters-Actions.xml | 16 ++-- ...clusters-BridgedDeviceBasicInformation.xml | 12 +-- data_model/device_types/Aggregator.xml | 2 +- data_model/device_types/AirPurifier.xml | 2 +- data_model/device_types/AirQualitySensor.xml | 20 ++-- data_model/device_types/BasicVideoPlayer.xml | 2 +- data_model/device_types/BridgedNode.xml | 4 +- .../device_types/CastingVideoClient.xml | 10 +- .../device_types/CastingVideoPlayer.xml | 8 +- .../device_types/ColorTemperatureLight.xml | 2 +- data_model/device_types/ContentApp.xml | 8 +- .../device_types/DimmablePlug-InUnit.xml | 2 +- data_model/device_types/Dishwasher.xml | 2 +- data_model/device_types/DoorLock.xml | 4 +- .../device_types/DoorLockController.xml | 2 +- data_model/device_types/EnergyTariff.xml | 2 +- .../device_types/EnergyTariffCalendar.xml | 2 +- .../device_types/ExtendedColorLight.xml | 2 +- data_model/device_types/ExtractorHood.xml | 2 +- data_model/device_types/Fan.xml | 2 +- data_model/device_types/GenericSwitch.xml | 4 +- data_model/device_types/LaundryDryer.xml | 4 +- data_model/device_types/MicrowaveOven.xml | 4 +- data_model/device_types/OnOffPlug-inUnit.xml | 2 +- data_model/device_types/Oven.xml | 2 +- data_model/device_types/PowerSource.xml | 2 +- data_model/device_types/PumpController.xml | 2 +- .../device_types/RootNodeDeviceType.xml | 16 ++-- data_model/device_types/SmokeCOAlarm.xml | 4 +- data_model/device_types/Thermostat.xml | 4 +- .../device_types/ThreePhasePowerSource.xml | 4 +- .../device_types/VideoRemoteControl.xml | 10 +- .../section_Application-Device-Types.xml | 58 ------------ .../section_Utility-Device-Types.xml | 58 ------------ data_model/device_types/section_actuators.xml | 58 ------------ .../device_types/section_appliances.xml | 58 ------------ data_model/device_types/section_base.xml | 58 ------------ data_model/device_types/section_closures.xml | 58 ------------ data_model/device_types/section_energy.xml | 58 ------------ data_model/device_types/section_generic.xml | 58 ------------ data_model/device_types/section_hvac.xml | 58 ------------ data_model/device_types/section_lighting.xml | 58 ------------ data_model/device_types/section_media.xml | 58 ------------ .../section_network_infrastructure.xml | 58 ------------ data_model/device_types/section_robots.xml | 58 ------------ data_model/device_types/section_sensors.xml | 58 ------------ data_model/device_types/section_switches.xml | 58 ------------ data_model/scraper_version | 1 + data_model/spec_sha | 2 +- scripts/spec_xml/generate_spec_xml.py | 30 ++++-- 115 files changed, 560 insertions(+), 1495 deletions(-) delete mode 100644 data_model/clusters/Mode_LaundryWasher.xml delete mode 100644 data_model/device_types/section_Application-Device-Types.xml delete mode 100644 data_model/device_types/section_Utility-Device-Types.xml delete mode 100644 data_model/device_types/section_actuators.xml delete mode 100644 data_model/device_types/section_appliances.xml delete mode 100644 data_model/device_types/section_base.xml delete mode 100644 data_model/device_types/section_closures.xml delete mode 100644 data_model/device_types/section_energy.xml delete mode 100644 data_model/device_types/section_generic.xml delete mode 100644 data_model/device_types/section_hvac.xml delete mode 100644 data_model/device_types/section_lighting.xml delete mode 100644 data_model/device_types/section_media.xml delete mode 100644 data_model/device_types/section_network_infrastructure.xml delete mode 100644 data_model/device_types/section_robots.xml delete mode 100644 data_model/device_types/section_sensors.xml delete mode 100644 data_model/device_types/section_switches.xml create mode 100644 data_model/scraper_version diff --git a/data_model/clusters/ACL-Cluster.xml b/data_model/clusters/ACL-Cluster.xml index 2cbcbd01c9a11a..7f1fde71d6586a 100644 --- a/data_model/clusters/ACL-Cluster.xml +++ b/data_model/clusters/ACL-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -112,13 +112,13 @@ Davis, CA 95616, USA - + - + @@ -126,7 +126,7 @@ Davis, CA 95616, USA - + @@ -148,12 +148,12 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml index 3cd5c02590ea0a..91f675eaba693b 100644 --- a/data_model/clusters/AccountLogin.xml +++ b/data_model/clusters/AccountLogin.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/AdminCommissioningCluster.xml b/data_model/clusters/AdminCommissioningCluster.xml index b2cffacf87e121..b003452f0385a2 100644 --- a/data_model/clusters/AdminCommissioningCluster.xml +++ b/data_model/clusters/AdminCommissioningCluster.xml @@ -57,7 +57,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -92,7 +92,7 @@ Davis, CA 95616, USA - + @@ -106,7 +106,7 @@ Davis, CA 95616, USA - + @@ -117,7 +117,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/AirQuality.xml b/data_model/clusters/AirQuality.xml index dcaf38bc586cf5..59f7550236696f 100644 --- a/data_model/clusters/AirQuality.xml +++ b/data_model/clusters/AirQuality.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ApplicationBasic.xml b/data_model/clusters/ApplicationBasic.xml index 48ce9673675e1d..086839a2338cfc 100644 --- a/data_model/clusters/ApplicationBasic.xml +++ b/data_model/clusters/ApplicationBasic.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ApplicationLauncher.xml b/data_model/clusters/ApplicationLauncher.xml index 91ebf6b5937446..5d716981a55d38 100644 --- a/data_model/clusters/ApplicationLauncher.xml +++ b/data_model/clusters/ApplicationLauncher.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -120,7 +120,7 @@ Davis, CA 95616, USA - + @@ -150,7 +150,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/AudioOutput.xml b/data_model/clusters/AudioOutput.xml index 8ace3342ce2132..176e75b16c19c9 100644 --- a/data_model/clusters/AudioOutput.xml +++ b/data_model/clusters/AudioOutput.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -88,22 +88,20 @@ Davis, CA 95616, USA - - - - + + diff --git a/data_model/clusters/BasicInformationCluster.xml b/data_model/clusters/BasicInformationCluster.xml index ae4e6f6661a820..4938da502ed407 100644 --- a/data_model/clusters/BasicInformationCluster.xml +++ b/data_model/clusters/BasicInformationCluster.xml @@ -160,11 +160,9 @@ Davis, CA 95616, USA - - @@ -176,18 +174,18 @@ Davis, CA 95616, USA - + - + - + @@ -198,13 +196,13 @@ Davis, CA 95616, USA - + - + @@ -215,7 +213,7 @@ Davis, CA 95616, USA - + @@ -227,37 +225,37 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -272,7 +270,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Binding-Cluster.xml b/data_model/clusters/Binding-Cluster.xml index 02b2219fcd0331..51a5559b1142ba 100644 --- a/data_model/clusters/Binding-Cluster.xml +++ b/data_model/clusters/Binding-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -87,7 +87,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml index b75540d94a6baf..9ace62ca720a53 100644 --- a/data_model/clusters/Channel.xml +++ b/data_model/clusters/Channel.xml @@ -104,26 +104,23 @@ Davis, CA 95616, USA - - - - - + + diff --git a/data_model/clusters/ColorControl.xml b/data_model/clusters/ColorControl.xml index 142e1a58ab7a67..f695a63036db1c 100644 --- a/data_model/clusters/ColorControl.xml +++ b/data_model/clusters/ColorControl.xml @@ -173,7 +173,7 @@ Davis, CA 95616, USA - + @@ -230,13 +230,13 @@ Davis, CA 95616, USA - + - + @@ -287,7 +287,7 @@ Davis, CA 95616, USA - + @@ -332,17 +332,17 @@ Davis, CA 95616, USA - + - + - + @@ -407,26 +407,26 @@ Davis, CA 95616, USA - + - + - + - + @@ -753,7 +753,7 @@ Davis, CA 95616, USA - + @@ -878,7 +878,7 @@ Davis, CA 95616, USA - + @@ -957,7 +957,7 @@ Davis, CA 95616, USA - + @@ -986,7 +986,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ConcentrationMeasurement.xml b/data_model/clusters/ConcentrationMeasurement.xml index ad239e700eacf9..47835e6bc6e568 100644 --- a/data_model/clusters/ConcentrationMeasurement.xml +++ b/data_model/clusters/ConcentrationMeasurement.xml @@ -55,12 +55,23 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + + + + + + + + + + + @@ -242,7 +253,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ContentControl.xml b/data_model/clusters/ContentControl.xml index 3642777b46a76d..00f7c7d9600e52 100644 --- a/data_model/clusters/ContentControl.xml +++ b/data_model/clusters/ContentControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -96,7 +96,8 @@ Davis, CA 95616, USA - + + @@ -109,7 +110,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/ContentLauncher.xml b/data_model/clusters/ContentLauncher.xml index 32b47a77c233a3..2c310c6f2ccb3d 100644 --- a/data_model/clusters/ContentLauncher.xml +++ b/data_model/clusters/ContentLauncher.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -157,33 +157,28 @@ Davis, CA 95616, USA - - - - - - - + + @@ -206,7 +201,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml index 3a596905c8aa9d..efbb139eea4f54 100644 --- a/data_model/clusters/DemandResponseLoadControl.xml +++ b/data_model/clusters/DemandResponseLoadControl.xml @@ -207,57 +207,47 @@ Davis, CA 95616, USA - - - - - - - - - - - + @@ -290,12 +280,11 @@ Davis, CA 95616, USA - - + @@ -303,7 +292,7 @@ Davis, CA 95616, USA - + @@ -335,7 +324,8 @@ Davis, CA 95616, USA - + + @@ -346,7 +336,8 @@ Davis, CA 95616, USA - + + @@ -387,7 +378,7 @@ Davis, CA 95616, USA - + @@ -402,7 +393,7 @@ Davis, CA 95616, USA - + @@ -419,7 +410,7 @@ Davis, CA 95616, USA - + @@ -469,7 +460,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Descriptor-Cluster.xml b/data_model/clusters/Descriptor-Cluster.xml index 956fb411e91a22..9944d8a3f6ea4c 100644 --- a/data_model/clusters/Descriptor-Cluster.xml +++ b/data_model/clusters/Descriptor-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -76,11 +76,12 @@ Davis, CA 95616, USA - + + - + @@ -99,13 +100,14 @@ Davis, CA 95616, USA - + + - + \ No newline at end of file diff --git a/data_model/clusters/DeviceEnergyManagement.xml b/data_model/clusters/DeviceEnergyManagement.xml index f1c5c37d1ade35..3c1ae9e66e8e69 100644 --- a/data_model/clusters/DeviceEnergyManagement.xml +++ b/data_model/clusters/DeviceEnergyManagement.xml @@ -239,38 +239,31 @@ Davis, CA 95616, USA - - - - - - - @@ -316,10 +309,11 @@ Davis, CA 95616, USA - + + - + @@ -371,13 +365,14 @@ Davis, CA 95616, USA - + + - + @@ -434,7 +429,8 @@ Davis, CA 95616, USA - + + @@ -443,9 +439,10 @@ Davis, CA 95616, USA - + + - + diff --git a/data_model/clusters/DiagnosticLogsCluster.xml b/data_model/clusters/DiagnosticLogsCluster.xml index 2fb6fc298ac7b5..14f995ca1855a6 100644 --- a/data_model/clusters/DiagnosticLogsCluster.xml +++ b/data_model/clusters/DiagnosticLogsCluster.xml @@ -110,7 +110,7 @@ Davis, CA 95616, USA - + @@ -121,14 +121,14 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml index ea4ce75cd549d9..5c0125a5dbe083 100644 --- a/data_model/clusters/DiagnosticsGeneral.xml +++ b/data_model/clusters/DiagnosticsGeneral.xml @@ -175,7 +175,7 @@ Davis, CA 95616, USA - + @@ -198,12 +198,12 @@ Davis, CA 95616, USA - + - + @@ -215,7 +215,7 @@ Davis, CA 95616, USA - + @@ -239,17 +239,17 @@ Davis, CA 95616, USA - + - + - + @@ -263,7 +263,7 @@ Davis, CA 95616, USA - + @@ -278,10 +278,10 @@ Davis, CA 95616, USA - + - + @@ -291,11 +291,11 @@ Davis, CA 95616, USA - + - + @@ -303,11 +303,11 @@ Davis, CA 95616, USA - + - + @@ -315,11 +315,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsSoftware.xml b/data_model/clusters/DiagnosticsSoftware.xml index 4a4d5508be51d5..10574384ca1cda 100644 --- a/data_model/clusters/DiagnosticsSoftware.xml +++ b/data_model/clusters/DiagnosticsSoftware.xml @@ -72,7 +72,7 @@ Davis, CA 95616, USA - + @@ -88,7 +88,7 @@ Davis, CA 95616, USA - + @@ -123,11 +123,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsThread.xml b/data_model/clusters/DiagnosticsThread.xml index ddcf246e9c99c3..ea26c7822c4f35 100644 --- a/data_model/clusters/DiagnosticsThread.xml +++ b/data_model/clusters/DiagnosticsThread.xml @@ -291,11 +291,11 @@ Davis, CA 95616, USA - + - + @@ -304,38 +304,38 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -412,42 +412,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -524,42 +524,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -632,28 +632,28 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -678,11 +678,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml index 97c23efb96dbe3..51e2b0697635bb 100644 --- a/data_model/clusters/DiagnosticsWiFi.xml +++ b/data_model/clusters/DiagnosticsWiFi.xml @@ -138,7 +138,7 @@ Davis, CA 95616, USA - + @@ -200,19 +200,19 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/clusters/DishwasherAlarm.xml b/data_model/clusters/DishwasherAlarm.xml index 487a522a661af7..be10eea998cd4e 100644 --- a/data_model/clusters/DishwasherAlarm.xml +++ b/data_model/clusters/DishwasherAlarm.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/DoorLock.xml b/data_model/clusters/DoorLock.xml index a0c5f9e63be3d7..7a2068a10707db 100644 --- a/data_model/clusters/DoorLock.xml +++ b/data_model/clusters/DoorLock.xml @@ -215,10 +215,10 @@ Davis, CA 95616, USA - + - + @@ -486,11 +486,9 @@ Davis, CA 95616, USA - - @@ -659,14 +657,14 @@ Davis, CA 95616, USA - + - + @@ -684,7 +682,7 @@ Davis, CA 95616, USA - + @@ -799,17 +797,17 @@ than 0"> - + - + - + + PIN/RFID Code†" type="octstr"> @@ -1219,7 +1217,7 @@ User Status: default or status cleared."> + PIN/RFID Code†" type="octstr"> @@ -1240,7 +1238,7 @@ User Status: default or status cleared."> + PIN/RFID Code†" type="octstr"> @@ -1298,7 +1296,7 @@ User Status: default or status cleared."> - + @@ -1326,7 +1324,7 @@ User Status: default or status cleared."> - + @@ -1369,7 +1367,7 @@ User Status: default or status cleared."> - + @@ -1426,7 +1424,7 @@ User Status: default or status cleared."> - + @@ -1445,7 +1443,7 @@ User Status: default or status cleared."> - + @@ -1461,7 +1459,7 @@ User Status: default or status cleared."> - + @@ -1498,7 +1496,7 @@ User Status: default or status cleared."> - + @@ -1516,7 +1514,7 @@ User Status: default or status cleared."> - + @@ -1557,7 +1555,7 @@ User Status: default or status cleared."> - + @@ -1576,7 +1574,7 @@ User Status: default or status cleared."> - + @@ -1600,7 +1598,7 @@ User Status: default or status cleared."> - + @@ -1618,7 +1616,7 @@ User Status: default or status cleared."> - + @@ -1821,7 +1819,7 @@ User Status: default or status cleared."> - + @@ -1864,7 +1862,7 @@ User Status: default or status cleared."> - + @@ -1898,7 +1896,7 @@ User Status: default or status cleared."> - + @@ -1943,7 +1941,7 @@ User Status: default or status cleared."> - + @@ -1953,7 +1951,7 @@ User Status: default or status cleared."> - + @@ -2004,7 +2002,7 @@ User Status: default or status cleared."> - + @@ -2038,7 +2036,7 @@ User Status: default or status cleared."> - + @@ -2069,7 +2067,7 @@ User Status: default or status cleared."> - + @@ -2168,7 +2166,7 @@ User Status: default or status cleared."> - + diff --git a/data_model/clusters/ElectricalEnergyMeasurement.xml b/data_model/clusters/ElectricalEnergyMeasurement.xml index 0047f948298a95..9e9d7f05d6bf2f 100644 --- a/data_model/clusters/ElectricalEnergyMeasurement.xml +++ b/data_model/clusters/ElectricalEnergyMeasurement.xml @@ -190,7 +190,7 @@ Davis, CA 95616, USA - + @@ -200,7 +200,7 @@ Davis, CA 95616, USA - + @@ -210,7 +210,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ElectricalPowerMeasurement.xml b/data_model/clusters/ElectricalPowerMeasurement.xml index 0839bd569c8eb7..996fb0ce59ec11 100644 --- a/data_model/clusters/ElectricalPowerMeasurement.xml +++ b/data_model/clusters/ElectricalPowerMeasurement.xml @@ -228,12 +228,14 @@ Davis, CA 95616, USA - + + - + + @@ -280,7 +282,7 @@ Davis, CA 95616, USA - + @@ -288,7 +290,8 @@ Davis, CA 95616, USA - + + @@ -296,7 +299,8 @@ Davis, CA 95616, USA - + + @@ -304,13 +308,13 @@ Davis, CA 95616, USA - + - + @@ -318,7 +322,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/EnergyCalendar.xml b/data_model/clusters/EnergyCalendar.xml index 058019da1e9f8c..0f9cf3c087ecf8 100644 --- a/data_model/clusters/EnergyCalendar.xml +++ b/data_model/clusters/EnergyCalendar.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -153,67 +153,51 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - + + + @@ -260,22 +244,22 @@ Davis, CA 95616, USA - + - + - + - + diff --git a/data_model/clusters/EnergyPreference.xml b/data_model/clusters/EnergyPreference.xml index 710ab52291b85a..ee549aebd41360 100644 --- a/data_model/clusters/EnergyPreference.xml +++ b/data_model/clusters/EnergyPreference.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -97,13 +97,14 @@ Davis, CA 95616, USA - + + - + @@ -121,7 +122,8 @@ Davis, CA 95616, USA - + + @@ -129,7 +131,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/EnergyPrice.xml b/data_model/clusters/EnergyPrice.xml index 8be42c25061937..2fa268d97ac986 100644 --- a/data_model/clusters/EnergyPrice.xml +++ b/data_model/clusters/EnergyPrice.xml @@ -123,7 +123,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/FanControl.xml b/data_model/clusters/FanControl.xml index 121f954055bcfe..5be22ee6dae361 100644 --- a/data_model/clusters/FanControl.xml +++ b/data_model/clusters/FanControl.xml @@ -259,7 +259,7 @@ Davis, CA 95616, USA - + @@ -267,7 +267,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Group-Key-Management-Cluster.xml b/data_model/clusters/Group-Key-Management-Cluster.xml index 78db5376ebef14..73c2c1cc1b9b8f 100644 --- a/data_model/clusters/Group-Key-Management-Cluster.xml +++ b/data_model/clusters/Group-Key-Management-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -86,23 +86,23 @@ Davis, CA 95616, USA - + - + - + - + @@ -118,35 +118,35 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -161,13 +161,13 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/Label-Cluster-FixedLabel.xml b/data_model/clusters/Label-Cluster-FixedLabel.xml index 7087883e611edb..558664a5d69f72 100644 --- a/data_model/clusters/Label-Cluster-FixedLabel.xml +++ b/data_model/clusters/Label-Cluster-FixedLabel.xml @@ -62,7 +62,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/Label-Cluster-Label.xml b/data_model/clusters/Label-Cluster-Label.xml index 6b29c2cf44caad..ee64da775b05cd 100644 --- a/data_model/clusters/Label-Cluster-Label.xml +++ b/data_model/clusters/Label-Cluster-Label.xml @@ -73,7 +73,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/Label-Cluster-UserLabel.xml b/data_model/clusters/Label-Cluster-UserLabel.xml index e9d8dda4610b4f..bca4b1453f22de 100644 --- a/data_model/clusters/Label-Cluster-UserLabel.xml +++ b/data_model/clusters/Label-Cluster-UserLabel.xml @@ -62,11 +62,12 @@ Davis, CA 95616, USA - + + - + \ No newline at end of file diff --git a/data_model/clusters/LaundryDryerControls.xml b/data_model/clusters/LaundryDryerControls.xml index 70c985ae3fde74..8e67a5997fa976 100644 --- a/data_model/clusters/LaundryDryerControls.xml +++ b/data_model/clusters/LaundryDryerControls.xml @@ -55,13 +55,13 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + - + diff --git a/data_model/clusters/LaundryWasherControls.xml b/data_model/clusters/LaundryWasherControls.xml index 1e033da5dd88ab..8ba57ef6b22e56 100644 --- a/data_model/clusters/LaundryWasherControls.xml +++ b/data_model/clusters/LaundryWasherControls.xml @@ -118,12 +118,13 @@ Davis, CA 95616, USA - + + - + \ No newline at end of file diff --git a/data_model/clusters/LevelControl.xml b/data_model/clusters/LevelControl.xml index 7716ce228b3fad..b219527a783c0d 100644 --- a/data_model/clusters/LevelControl.xml +++ b/data_model/clusters/LevelControl.xml @@ -65,7 +65,7 @@ Davis, CA 95616, USA - + @@ -161,7 +161,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/LocalizationConfiguration.xml b/data_model/clusters/LocalizationConfiguration.xml index 2b1297fb8f8e0e..b264698b6d5393 100644 --- a/data_model/clusters/LocalizationConfiguration.xml +++ b/data_model/clusters/LocalizationConfiguration.xml @@ -55,19 +55,19 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - + - + diff --git a/data_model/clusters/LocalizationTimeFormat.xml b/data_model/clusters/LocalizationTimeFormat.xml index 1a7b6976a69ec6..204f145f9c8b07 100644 --- a/data_model/clusters/LocalizationTimeFormat.xml +++ b/data_model/clusters/LocalizationTimeFormat.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -132,7 +132,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/LocalizationUnit.xml b/data_model/clusters/LocalizationUnit.xml index 8a5179dafb0aff..5cae6df855b2c7 100644 --- a/data_model/clusters/LocalizationUnit.xml +++ b/data_model/clusters/LocalizationUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/MediaInput.xml b/data_model/clusters/MediaInput.xml index 8b6f4008f372f6..9ca0f351d1f59f 100644 --- a/data_model/clusters/MediaInput.xml +++ b/data_model/clusters/MediaInput.xml @@ -121,7 +121,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/MediaPlayback.xml b/data_model/clusters/MediaPlayback.xml index 21001d287f6120..57d8deeec19091 100644 --- a/data_model/clusters/MediaPlayback.xml +++ b/data_model/clusters/MediaPlayback.xml @@ -224,7 +224,7 @@ Davis, CA 95616, USA - + @@ -235,7 +235,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml index 71e522a92a959d..26ce06a91e9c1d 100644 --- a/data_model/clusters/Messages.xml +++ b/data_model/clusters/Messages.xml @@ -179,14 +179,12 @@ Davis, CA 95616, USA - - @@ -221,22 +219,25 @@ Davis, CA 95616, USA - + + - + - + + - + - + + @@ -245,14 +246,16 @@ Davis, CA 95616, USA - + + - + + diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml index e97821db771a77..9a5d437b48ff09 100644 --- a/data_model/clusters/MicrowaveOvenControl.xml +++ b/data_model/clusters/MicrowaveOvenControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml index 258708ba96908b..423eb3e4a7ca6c 100644 --- a/data_model/clusters/ModeBase.xml +++ b/data_model/clusters/ModeBase.xml @@ -83,10 +83,11 @@ Davis, CA 95616, USA - + + - + @@ -108,11 +109,12 @@ Davis, CA 95616, USA - + + - + diff --git a/data_model/clusters/Mode_LaundryWasher.xml b/data_model/clusters/Mode_LaundryWasher.xml deleted file mode 100644 index 96190a4009850c..00000000000000 --- a/data_model/clusters/Mode_LaundryWasher.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/Mode_MicrowaveOven.xml b/data_model/clusters/Mode_MicrowaveOven.xml index d1ac9458d71af8..cd98c189c12844 100644 --- a/data_model/clusters/Mode_MicrowaveOven.xml +++ b/data_model/clusters/Mode_MicrowaveOven.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml index 9f516bbfbb2e7b..8f06ac6e6d52db 100644 --- a/data_model/clusters/NetworkCommissioningCluster.xml +++ b/data_model/clusters/NetworkCommissioningCluster.xml @@ -171,7 +171,7 @@ Davis, CA 95616, USA - + @@ -191,7 +191,7 @@ Davis, CA 95616, USA - + @@ -229,13 +229,13 @@ Davis, CA 95616, USA - + - + @@ -265,7 +265,7 @@ Davis, CA 95616, USA - + @@ -302,7 +302,7 @@ Davis, CA 95616, USA - + @@ -313,7 +313,7 @@ Davis, CA 95616, USA - + @@ -328,7 +328,7 @@ Davis, CA 95616, USA - + @@ -345,7 +345,7 @@ Davis, CA 95616, USA - + @@ -368,17 +368,17 @@ Davis, CA 95616, USA - + - + - + @@ -390,11 +390,11 @@ Davis, CA 95616, USA - + - + @@ -407,7 +407,7 @@ Davis, CA 95616, USA - + @@ -423,7 +423,7 @@ Davis, CA 95616, USA - + @@ -443,13 +443,13 @@ Davis, CA 95616, USA - + - + @@ -460,7 +460,7 @@ Davis, CA 95616, USA - + @@ -479,7 +479,7 @@ Davis, CA 95616, USA - + @@ -495,7 +495,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/NetworkIdentityManagement.xml b/data_model/clusters/NetworkIdentityManagement.xml index 9ce28aa194426b..0466f4a26b56ab 100644 --- a/data_model/clusters/NetworkIdentityManagement.xml +++ b/data_model/clusters/NetworkIdentityManagement.xml @@ -67,13 +67,14 @@ Davis, CA 95616, USA - + - + + - + @@ -85,22 +86,23 @@ Davis, CA 95616, USA - + - + - + + - + @@ -113,11 +115,11 @@ Davis, CA 95616, USA - + - + @@ -125,7 +127,7 @@ Davis, CA 95616, USA - + @@ -139,7 +141,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/OperationalCredentialCluster.xml b/data_model/clusters/OperationalCredentialCluster.xml index a5d25d07d57ecc..ea1aa49647946e 100644 --- a/data_model/clusters/OperationalCredentialCluster.xml +++ b/data_model/clusters/OperationalCredentialCluster.xml @@ -57,7 +57,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -115,11 +115,11 @@ Davis, CA 95616, USA - + - + @@ -135,12 +135,12 @@ Davis, CA 95616, USA - + - + @@ -149,13 +149,13 @@ Davis, CA 95616, USA - + - + @@ -173,7 +173,7 @@ Davis, CA 95616, USA - + @@ -187,7 +187,7 @@ Davis, CA 95616, USA - + @@ -195,11 +195,11 @@ Davis, CA 95616, USA - + - + - + @@ -215,7 +215,7 @@ Davis, CA 95616, USA - + @@ -223,7 +223,7 @@ Davis, CA 95616, USA - + @@ -234,11 +234,11 @@ Davis, CA 95616, USA - + - + - + @@ -246,33 +246,33 @@ Davis, CA 95616, USA - + - + - + - + - + - + - + @@ -300,7 +300,7 @@ Davis, CA 95616, USA - + @@ -308,10 +308,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/OperationalState.xml b/data_model/clusters/OperationalState.xml index 5e969ff0793b5a..110ba6e05a530e 100644 --- a/data_model/clusters/OperationalState.xml +++ b/data_model/clusters/OperationalState.xml @@ -85,26 +85,21 @@ Davis, CA 95616, USA - - - - - @@ -131,7 +126,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/PowerSourceCluster.xml b/data_model/clusters/PowerSourceCluster.xml index f7b5da82ce20fc..b544bf4a729a6b 100644 --- a/data_model/clusters/PowerSourceCluster.xml +++ b/data_model/clusters/PowerSourceCluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -673,20 +673,21 @@ Davis, CA 95616, USA - + + - + - + @@ -694,21 +695,21 @@ Davis, CA 95616, USA - + - + - + @@ -727,7 +728,8 @@ Davis, CA 95616, USA - + + @@ -790,41 +792,42 @@ Davis, CA 95616, USA - + - + - + - + - + + - + - + @@ -896,7 +899,7 @@ Davis, CA 95616, USA - + @@ -951,11 +954,11 @@ Davis, CA 95616, USA - + - + @@ -965,11 +968,11 @@ Davis, CA 95616, USA - + - + @@ -979,11 +982,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/PowerSourceConfigurationCluster.xml b/data_model/clusters/PowerSourceConfigurationCluster.xml index d186842379aaf6..b2eb27fd4bd7cc 100644 --- a/data_model/clusters/PowerSourceConfigurationCluster.xml +++ b/data_model/clusters/PowerSourceConfigurationCluster.xml @@ -55,17 +55,18 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - + + - + \ No newline at end of file diff --git a/data_model/clusters/PumpConfigurationControl.xml b/data_model/clusters/PumpConfigurationControl.xml index 095004ff01bf7e..f3fc98a52cee9e 100644 --- a/data_model/clusters/PumpConfigurationControl.xml +++ b/data_model/clusters/PumpConfigurationControl.xml @@ -211,27 +211,27 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/clusters/ResourceMonitoring.xml b/data_model/clusters/ResourceMonitoring.xml index e5a178a5700f8c..29d01f0e50296c 100644 --- a/data_model/clusters/ResourceMonitoring.xml +++ b/data_model/clusters/ResourceMonitoring.xml @@ -55,10 +55,13 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + + + @@ -151,13 +154,14 @@ Davis, CA 95616, USA - + + - + diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml index 07a15de02bc7a4..c32c87f71ff432 100644 --- a/data_model/clusters/Scenes.xml +++ b/data_model/clusters/Scenes.xml @@ -137,7 +137,8 @@ Davis, CA 95616, USA - + + @@ -159,7 +160,8 @@ Davis, CA 95616, USA - + + @@ -244,7 +246,8 @@ Davis, CA 95616, USA - + + @@ -270,7 +273,8 @@ Davis, CA 95616, USA - + + @@ -318,7 +322,9 @@ Davis, CA 95616, USA - + + + @@ -443,7 +449,8 @@ Davis, CA 95616, USA - + + @@ -479,7 +486,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/clusters/SmokeCOAlarm.xml b/data_model/clusters/SmokeCOAlarm.xml index d24f696e3a3384..0db5c78f4e947f 100644 --- a/data_model/clusters/SmokeCOAlarm.xml +++ b/data_model/clusters/SmokeCOAlarm.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -207,19 +207,19 @@ Davis, CA 95616, USA - + - + - + @@ -295,7 +295,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Switch.xml b/data_model/clusters/Switch.xml index 141b32e782969d..30602c35bf794f 100644 --- a/data_model/clusters/Switch.xml +++ b/data_model/clusters/Switch.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/TargetNavigator.xml b/data_model/clusters/TargetNavigator.xml index ffb6955d27bf3c..343f1427176e41 100644 --- a/data_model/clusters/TargetNavigator.xml +++ b/data_model/clusters/TargetNavigator.xml @@ -83,7 +83,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/clusters/Thermostat.xml b/data_model/clusters/Thermostat.xml index 704d3a21a1df9a..b0387a3f907354 100644 --- a/data_model/clusters/Thermostat.xml +++ b/data_model/clusters/Thermostat.xml @@ -229,7 +229,7 @@ Davis, CA 95616, USA - + @@ -280,7 +280,7 @@ Davis, CA 95616, USA - + @@ -350,10 +350,10 @@ Davis, CA 95616, USA - + - + @@ -472,7 +472,7 @@ Davis, CA 95616, USA - + @@ -621,30 +621,30 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -767,7 +767,7 @@ Davis, CA 95616, USA - + @@ -851,9 +851,10 @@ Davis, CA 95616, USA - + + - + diff --git a/data_model/clusters/ThreadBorderRouterDiagnostics.xml b/data_model/clusters/ThreadBorderRouterDiagnostics.xml index 20215e275d2f00..29b5da9b8511f0 100644 --- a/data_model/clusters/ThreadBorderRouterDiagnostics.xml +++ b/data_model/clusters/ThreadBorderRouterDiagnostics.xml @@ -68,7 +68,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/TimeSync.xml b/data_model/clusters/TimeSync.xml index c7ad7b0032aaf7..55d2988a64c692 100644 --- a/data_model/clusters/TimeSync.xml +++ b/data_model/clusters/TimeSync.xml @@ -111,19 +111,19 @@ Davis, CA 95616, USA - + - + - + - + @@ -132,22 +132,22 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -177,9 +177,9 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/WaterContentMeasurement.xml b/data_model/clusters/WaterContentMeasurement.xml index 8b1ff6a9a049bc..38a78631c86fd8 100644 --- a/data_model/clusters/WaterContentMeasurement.xml +++ b/data_model/clusters/WaterContentMeasurement.xml @@ -55,12 +55,16 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + + + + diff --git a/data_model/clusters/WaterHeaterManagement.xml b/data_model/clusters/WaterHeaterManagement.xml index c55c6a1e09bf09..a4ed482c91816b 100644 --- a/data_model/clusters/WaterHeaterManagement.xml +++ b/data_model/clusters/WaterHeaterManagement.xml @@ -117,7 +117,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/WindowCovering.xml b/data_model/clusters/WindowCovering.xml index 7eefe853c91d0a..3ee6d43ded8bce 100644 --- a/data_model/clusters/WindowCovering.xml +++ b/data_model/clusters/WindowCovering.xml @@ -334,13 +334,13 @@ Davis, CA 95616, USA - + - + - + @@ -477,13 +477,13 @@ Davis, CA 95616, USA - + - + @@ -493,7 +493,7 @@ Davis, CA 95616, USA - + @@ -503,13 +503,13 @@ Davis, CA 95616, USA - + - + @@ -520,7 +520,7 @@ Davis, CA 95616, USA - + @@ -600,7 +600,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/bridge-clusters-Actions.xml b/data_model/clusters/bridge-clusters-Actions.xml index f9b17944739dca..ccacb56e8b2576 100644 --- a/data_model/clusters/bridge-clusters-Actions.xml +++ b/data_model/clusters/bridge-clusters-Actions.xml @@ -160,7 +160,7 @@ Davis, CA 95616, USA - + @@ -187,7 +187,7 @@ Davis, CA 95616, USA - + @@ -195,7 +195,7 @@ Davis, CA 95616, USA - + @@ -203,17 +203,17 @@ Davis, CA 95616, USA - + - + - + @@ -322,7 +322,7 @@ Davis, CA 95616, USA - + @@ -331,7 +331,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml index da2b311a5c2e53..00d4cda8fcfbb3 100644 --- a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml +++ b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml @@ -93,22 +93,22 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml index 3f70f3d78ccb4b..f9bff7aa27cd55 100644 --- a/data_model/device_types/Aggregator.xml +++ b/data_model/device_types/Aggregator.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/AirPurifier.xml b/data_model/device_types/AirPurifier.xml index 9793cd1d36b215..848ccdf8849bc6 100644 --- a/data_model/device_types/AirPurifier.xml +++ b/data_model/device_types/AirPurifier.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/AirQualitySensor.xml b/data_model/device_types/AirQualitySensor.xml index 0c96fbd60515b7..bf56eb754f24c6 100644 --- a/data_model/device_types/AirQualitySensor.xml +++ b/data_model/device_types/AirQualitySensor.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -65,7 +65,7 @@ Davis, CA 95616, USA - + @@ -74,10 +74,10 @@ Davis, CA 95616, USA - + - + @@ -86,22 +86,22 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/device_types/BasicVideoPlayer.xml b/data_model/device_types/BasicVideoPlayer.xml index f6b86091004bfe..75d54e18d1c33f 100644 --- a/data_model/device_types/BasicVideoPlayer.xml +++ b/data_model/device_types/BasicVideoPlayer.xml @@ -91,7 +91,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/BridgedNode.xml b/data_model/device_types/BridgedNode.xml index a383ed2b541d6b..29b7a59299c37b 100644 --- a/data_model/device_types/BridgedNode.xml +++ b/data_model/device_types/BridgedNode.xml @@ -64,7 +64,7 @@ Davis, CA 95616, USA - + @@ -72,7 +72,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/CastingVideoClient.xml b/data_model/device_types/CastingVideoClient.xml index 06ef2b5492f337..8089f57507dd18 100644 --- a/data_model/device_types/CastingVideoClient.xml +++ b/data_model/device_types/CastingVideoClient.xml @@ -90,19 +90,19 @@ Davis, CA 95616, USA - + - + - + - + - + diff --git a/data_model/device_types/CastingVideoPlayer.xml b/data_model/device_types/CastingVideoPlayer.xml index fd26bb675cbdf6..734be9bbfc2b47 100644 --- a/data_model/device_types/CastingVideoPlayer.xml +++ b/data_model/device_types/CastingVideoPlayer.xml @@ -94,13 +94,13 @@ launch Content Apps and represent these apps as separate endpoints."/> - + - + - + @@ -110,7 +110,7 @@ launch Content Apps and represent these apps as separate endpoints."/> - + diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml index 5897f0ee0b796a..531c78defb3b54 100644 --- a/data_model/device_types/ColorTemperatureLight.xml +++ b/data_model/device_types/ColorTemperatureLight.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml index 8f927c48f44a35..205fca92bbdc6a 100644 --- a/data_model/device_types/ContentApp.xml +++ b/data_model/device_types/ContentApp.xml @@ -75,10 +75,10 @@ Davis, CA 95616, USA - + - + @@ -86,10 +86,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml index c262abf3741d7e..0f085fdfc2a4de 100644 --- a/data_model/device_types/DimmablePlug-InUnit.xml +++ b/data_model/device_types/DimmablePlug-InUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Dishwasher.xml b/data_model/device_types/Dishwasher.xml index 429e96c149abe9..a07fdc9c3adddb 100644 --- a/data_model/device_types/Dishwasher.xml +++ b/data_model/device_types/Dishwasher.xml @@ -89,7 +89,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/DoorLock.xml b/data_model/device_types/DoorLock.xml index d31aaad30d8d98..08f7423519122d 100644 --- a/data_model/device_types/DoorLock.xml +++ b/data_model/device_types/DoorLock.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -85,7 +85,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml index 4f4efb3ea90d1c..413509de632c6e 100644 --- a/data_model/device_types/DoorLockController.xml +++ b/data_model/device_types/DoorLockController.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/EnergyTariff.xml b/data_model/device_types/EnergyTariff.xml index 9e6e0b4c12ab36..bf27554ff281db 100644 --- a/data_model/device_types/EnergyTariff.xml +++ b/data_model/device_types/EnergyTariff.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/EnergyTariffCalendar.xml b/data_model/device_types/EnergyTariffCalendar.xml index 3dca889b777e66..7b0becfc52e1c9 100644 --- a/data_model/device_types/EnergyTariffCalendar.xml +++ b/data_model/device_types/EnergyTariffCalendar.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml index 4120226176e7a1..47e9bf720b7e72 100644 --- a/data_model/device_types/ExtendedColorLight.xml +++ b/data_model/device_types/ExtendedColorLight.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ExtractorHood.xml b/data_model/device_types/ExtractorHood.xml index 5fdbc7c84a1583..9adf279add083b 100644 --- a/data_model/device_types/ExtractorHood.xml +++ b/data_model/device_types/ExtractorHood.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Fan.xml b/data_model/device_types/Fan.xml index 49538ec32097b6..f858edd89bc36b 100644 --- a/data_model/device_types/Fan.xml +++ b/data_model/device_types/Fan.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/GenericSwitch.xml b/data_model/device_types/GenericSwitch.xml index 7e13a7e18223ab..24645b511ea5e7 100644 --- a/data_model/device_types/GenericSwitch.xml +++ b/data_model/device_types/GenericSwitch.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -67,7 +67,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/LaundryDryer.xml b/data_model/device_types/LaundryDryer.xml index a7d365f22e14fe..27b98c7dac56cc 100644 --- a/data_model/device_types/LaundryDryer.xml +++ b/data_model/device_types/LaundryDryer.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + @@ -73,7 +73,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/MicrowaveOven.xml b/data_model/device_types/MicrowaveOven.xml index 8e77925b4131fc..460c8d971cd17b 100644 --- a/data_model/device_types/MicrowaveOven.xml +++ b/data_model/device_types/MicrowaveOven.xml @@ -65,10 +65,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml index 1847119e49426c..e7f55a966df2fc 100644 --- a/data_model/device_types/OnOffPlug-inUnit.xml +++ b/data_model/device_types/OnOffPlug-inUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Oven.xml b/data_model/device_types/Oven.xml index 5a13b0ec9ba053..5d24a61858c812 100644 --- a/data_model/device_types/Oven.xml +++ b/data_model/device_types/Oven.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/PowerSource.xml b/data_model/device_types/PowerSource.xml index 05aaa56f88cf92..3767d5c19ad025 100644 --- a/data_model/device_types/PowerSource.xml +++ b/data_model/device_types/PowerSource.xml @@ -62,7 +62,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/PumpController.xml b/data_model/device_types/PumpController.xml index 070e3a5912942b..1eb302399379fe 100644 --- a/data_model/device_types/PumpController.xml +++ b/data_model/device_types/PumpController.xml @@ -84,7 +84,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml index f4792a2e1f5a96..1efced2f423c64 100644 --- a/data_model/device_types/RootNodeDeviceType.xml +++ b/data_model/device_types/RootNodeDeviceType.xml @@ -63,7 +63,7 @@ Davis, CA 95616, USA - + @@ -71,25 +71,25 @@ Davis, CA 95616, USA - + - + - + - + @@ -148,15 +148,15 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/device_types/SmokeCOAlarm.xml b/data_model/device_types/SmokeCOAlarm.xml index 5888e8148f0927..518809d449e35a 100644 --- a/data_model/device_types/SmokeCOAlarm.xml +++ b/data_model/device_types/SmokeCOAlarm.xml @@ -68,7 +68,7 @@ Davis, CA 95616, USA - + @@ -77,7 +77,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml index ebc43e7dbf7203..e918c058f7ed1f 100644 --- a/data_model/device_types/Thermostat.xml +++ b/data_model/device_types/Thermostat.xml @@ -83,7 +83,7 @@ Davis, CA 95616, USA - + @@ -100,7 +100,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/ThreePhasePowerSource.xml b/data_model/device_types/ThreePhasePowerSource.xml index 3a3d5a018223b4..f1662639ce6955 100644 --- a/data_model/device_types/ThreePhasePowerSource.xml +++ b/data_model/device_types/ThreePhasePowerSource.xml @@ -61,10 +61,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/VideoRemoteControl.xml b/data_model/device_types/VideoRemoteControl.xml index c86fb3ba437a55..eafa4cd63780b2 100644 --- a/data_model/device_types/VideoRemoteControl.xml +++ b/data_model/device_types/VideoRemoteControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -90,16 +90,16 @@ Davis, CA 95616, USA - + - + - + - + diff --git a/data_model/device_types/section_Application-Device-Types.xml b/data_model/device_types/section_Application-Device-Types.xml deleted file mode 100644 index d1d3347d9b9a09..00000000000000 --- a/data_model/device_types/section_Application-Device-Types.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_Utility-Device-Types.xml b/data_model/device_types/section_Utility-Device-Types.xml deleted file mode 100644 index 5301efeee4af6d..00000000000000 --- a/data_model/device_types/section_Utility-Device-Types.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_actuators.xml b/data_model/device_types/section_actuators.xml deleted file mode 100644 index c765417fecabd7..00000000000000 --- a/data_model/device_types/section_actuators.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_appliances.xml b/data_model/device_types/section_appliances.xml deleted file mode 100644 index 57e7f957d42121..00000000000000 --- a/data_model/device_types/section_appliances.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_base.xml b/data_model/device_types/section_base.xml deleted file mode 100644 index b27303abc475c0..00000000000000 --- a/data_model/device_types/section_base.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_closures.xml b/data_model/device_types/section_closures.xml deleted file mode 100644 index 59213ae32cb33b..00000000000000 --- a/data_model/device_types/section_closures.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_energy.xml b/data_model/device_types/section_energy.xml deleted file mode 100644 index 3bb9912a75e078..00000000000000 --- a/data_model/device_types/section_energy.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_generic.xml b/data_model/device_types/section_generic.xml deleted file mode 100644 index 77276651023255..00000000000000 --- a/data_model/device_types/section_generic.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_hvac.xml b/data_model/device_types/section_hvac.xml deleted file mode 100644 index afee5781c54c6c..00000000000000 --- a/data_model/device_types/section_hvac.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_lighting.xml b/data_model/device_types/section_lighting.xml deleted file mode 100644 index bf6c953f33daa2..00000000000000 --- a/data_model/device_types/section_lighting.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_media.xml b/data_model/device_types/section_media.xml deleted file mode 100644 index b860229711f41b..00000000000000 --- a/data_model/device_types/section_media.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_network_infrastructure.xml b/data_model/device_types/section_network_infrastructure.xml deleted file mode 100644 index 8800e3f1ea7e75..00000000000000 --- a/data_model/device_types/section_network_infrastructure.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_robots.xml b/data_model/device_types/section_robots.xml deleted file mode 100644 index 2af0ee8ac95305..00000000000000 --- a/data_model/device_types/section_robots.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_sensors.xml b/data_model/device_types/section_sensors.xml deleted file mode 100644 index 69efafea8b4ab8..00000000000000 --- a/data_model/device_types/section_sensors.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/device_types/section_switches.xml b/data_model/device_types/section_switches.xml deleted file mode 100644 index e6c2a829c1f155..00000000000000 --- a/data_model/device_types/section_switches.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - \ No newline at end of file diff --git a/data_model/scraper_version b/data_model/scraper_version new file mode 100644 index 00000000000000..6085e946503a10 --- /dev/null +++ b/data_model/scraper_version @@ -0,0 +1 @@ +1.2.1 diff --git a/data_model/spec_sha b/data_model/spec_sha index 8f0fe93c130fdf..03c3b85baa2427 100644 --- a/data_model/spec_sha +++ b/data_model/spec_sha @@ -1 +1 @@ -aa5e85ba89d2de63cd9e205948f3ad0fe309d023 +49003c1b2337aa51dad227977981b763667d1f75 diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py index 2989717a1d03a6..d0b2635bcf3398 100755 --- a/scripts/spec_xml/generate_spec_xml.py +++ b/scripts/spec_xml/generate_spec_xml.py @@ -16,6 +16,7 @@ import glob import os +import re import subprocess import click @@ -53,6 +54,8 @@ def main(scraper, spec_root, output_dir, dry_run): # Clusters need to be scraped first because the cluster directory is passed to the device type directory scrape_clusters(scraper, spec_root, output_dir, dry_run) scrape_device_types(scraper, spec_root, output_dir, dry_run) + if not dry_run: + dump_versions(scraper, spec_root, output_dir) def scrape_clusters(scraper, spec_root, output_dir, dry_run): @@ -94,13 +97,6 @@ def scrape_all_clusters(dir: str, exclude_list: list[str] = []) -> None: filename = f'{dm_clusters_dir}/{f}' scrape_cluster(filename) - # Put the current spec sha into the cluster dir - sha_file = os.path.abspath(os.path.join(output_dir, 'spec_sha')) - out = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True, encoding="utf8", cwd=spec_root) - sha = out.stdout - with open(sha_file, 'wt', encoding='utf8') as output: - output.write(sha) - def scrape_device_types(scraper, spec_root, output_dir, dry_run): device_type_dir = os.path.abspath(os.path.join(spec_root, 'src', 'device_types')) @@ -112,7 +108,6 @@ def scrape_device_types(scraper, spec_root, output_dir, dry_run): def scrape_device_type(filename: str) -> None: xml_path = get_xml_path(filename, device_types_output_dir) - print(xml_path) cmd = [scraper, 'devicetype', '-c', clusters_output_dir, '-nd', filename, xml_path] if dry_run: print(cmd) @@ -120,8 +115,25 @@ def scrape_device_type(filename: str) -> None: print(' '.join(cmd)) subprocess.run(cmd) + exclude_list = [r"section_*"] for filename in glob.glob(f'{device_type_dir}/*.adoc'): - scrape_device_type(filename) + for exclude in exclude_list: + if not re.match(exclude, os.path.basename(filename)): + scrape_device_type(filename) + + +def dump_versions(scraper, spec_root, output_dir): + sha_file = os.path.abspath(os.path.join(output_dir, 'spec_sha')) + out = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True, encoding="utf8", cwd=spec_root) + sha = out.stdout + with open(sha_file, 'wt', encoding='utf8') as output: + output.write(sha) + + scraper_file = os.path.abspath(os.path.join(output_dir, 'scraper_version')) + out = subprocess.run([scraper, '--version'], capture_output=True, encoding="utf8") + version = out.stdout + with open(scraper_file, "wt", encoding='utf8') as output: + output.write(version) if __name__ == '__main__': From f290f132eac91bf39fc4a06ea0c3f3364a25db3f Mon Sep 17 00:00:00 2001 From: cecille Date: Wed, 15 Nov 2023 04:22:55 -0500 Subject: [PATCH 3/3] Use old scraper version --- data_model/clusters/ACL-Cluster.xml | 12 ++-- data_model/clusters/AccountLogin.xml | 2 +- .../clusters/AdminCommissioningCluster.xml | 8 +-- data_model/clusters/AirQuality.xml | 2 +- data_model/clusters/ApplicationBasic.xml | 2 +- data_model/clusters/ApplicationLauncher.xml | 6 +- data_model/clusters/AudioOutput.xml | 8 ++- .../clusters/BasicInformationCluster.xml | 28 ++++---- data_model/clusters/Binding-Cluster.xml | 5 +- data_model/clusters/Channel.xml | 7 +- data_model/clusters/ColorControl.xml | 30 ++++----- .../clusters/ConcentrationMeasurement.xml | 15 +---- data_model/clusters/ContentControl.xml | 8 +-- data_model/clusters/ContentLauncher.xml | 14 ++-- .../clusters/DemandResponseLoadControl.xml | 31 +++++---- data_model/clusters/Descriptor-Cluster.xml | 12 ++-- .../clusters/DeviceEnergyManagement.xml | 25 +++---- data_model/clusters/DiagnosticLogsCluster.xml | 8 +-- data_model/clusters/DiagnosticsGeneral.xml | 32 ++++----- data_model/clusters/DiagnosticsSoftware.xml | 8 +-- data_model/clusters/DiagnosticsThread.xml | 54 +++++++-------- data_model/clusters/DiagnosticsWiFi.xml | 8 +-- data_model/clusters/DishwasherAlarm.xml | 2 +- data_model/clusters/DoorLock.xml | 66 ++++++++++--------- .../clusters/ElectricalEnergyMeasurement.xml | 6 +- .../clusters/ElectricalPowerMeasurement.xml | 20 +++--- data_model/clusters/EnergyCalendar.xml | 32 ++++++--- data_model/clusters/EnergyPreference.xml | 13 ++-- data_model/clusters/EnergyPrice.xml | 2 +- data_model/clusters/FanControl.xml | 4 +- .../clusters/Group-Key-Management-Cluster.xml | 26 ++++---- .../clusters/Label-Cluster-FixedLabel.xml | 3 +- data_model/clusters/Label-Cluster-Label.xml | 3 +- .../clusters/Label-Cluster-UserLabel.xml | 5 +- data_model/clusters/LaundryDryerControls.xml | 4 +- data_model/clusters/LaundryWasherControls.xml | 5 +- data_model/clusters/LevelControl.xml | 4 +- .../clusters/LocalizationConfiguration.xml | 6 +- .../clusters/LocalizationTimeFormat.xml | 4 +- data_model/clusters/LocalizationUnit.xml | 2 +- data_model/clusters/MediaInput.xml | 3 +- data_model/clusters/MediaPlayback.xml | 4 +- data_model/clusters/Messages.xml | 21 +++--- data_model/clusters/MicrowaveOvenControl.xml | 2 +- data_model/clusters/ModeBase.xml | 10 ++- data_model/clusters/Mode_MicrowaveOven.xml | 2 +- .../clusters/NetworkCommissioningCluster.xml | 42 ++++++------ .../clusters/NetworkIdentityManagement.xml | 24 ++++--- .../clusters/OperationalCredentialCluster.xml | 54 +++++++-------- data_model/clusters/OperationalState.xml | 8 ++- data_model/clusters/PowerSourceCluster.xml | 47 +++++++------ .../PowerSourceConfigurationCluster.xml | 7 +- .../clusters/PumpConfigurationControl.xml | 12 ++-- data_model/clusters/ResourceMonitoring.xml | 10 +-- data_model/clusters/Scenes.xml | 23 ++----- data_model/clusters/SmokeCOAlarm.xml | 10 +-- data_model/clusters/Switch.xml | 2 +- data_model/clusters/TargetNavigator.xml | 3 +- data_model/clusters/Thermostat.xml | 29 ++++---- .../ThreadBorderRouterDiagnostics.xml | 2 +- data_model/clusters/TimeSync.xml | 22 +++---- .../clusters/WaterContentMeasurement.xml | 6 +- data_model/clusters/WaterHeaterManagement.xml | 2 +- data_model/clusters/WindowCovering.xml | 20 +++--- .../clusters/bridge-clusters-Actions.xml | 16 ++--- ...clusters-BridgedDeviceBasicInformation.xml | 12 ++-- data_model/device_types/Aggregator.xml | 2 +- data_model/device_types/AirPurifier.xml | 2 +- data_model/device_types/AirQualitySensor.xml | 20 +++--- data_model/device_types/BasicVideoPlayer.xml | 2 +- data_model/device_types/BridgedNode.xml | 4 +- .../device_types/CastingVideoClient.xml | 10 +-- .../device_types/CastingVideoPlayer.xml | 8 +-- .../device_types/ColorTemperatureLight.xml | 2 +- data_model/device_types/ContentApp.xml | 8 +-- .../device_types/DimmablePlug-InUnit.xml | 2 +- data_model/device_types/Dishwasher.xml | 2 +- data_model/device_types/DoorLock.xml | 4 +- .../device_types/DoorLockController.xml | 2 +- data_model/device_types/EnergyTariff.xml | 2 +- .../device_types/EnergyTariffCalendar.xml | 2 +- .../device_types/ExtendedColorLight.xml | 2 +- data_model/device_types/ExtractorHood.xml | 2 +- data_model/device_types/Fan.xml | 2 +- data_model/device_types/GenericSwitch.xml | 4 +- data_model/device_types/LaundryDryer.xml | 4 +- data_model/device_types/MicrowaveOven.xml | 4 +- data_model/device_types/OnOffPlug-inUnit.xml | 2 +- data_model/device_types/Oven.xml | 2 +- data_model/device_types/PowerSource.xml | 2 +- data_model/device_types/PumpController.xml | 2 +- .../device_types/RootNodeDeviceType.xml | 16 ++--- data_model/device_types/SmokeCOAlarm.xml | 4 +- data_model/device_types/Thermostat.xml | 4 +- .../device_types/ThreePhasePowerSource.xml | 4 +- .../device_types/VideoRemoteControl.xml | 10 +-- data_model/scraper_version | 2 +- 97 files changed, 525 insertions(+), 538 deletions(-) diff --git a/data_model/clusters/ACL-Cluster.xml b/data_model/clusters/ACL-Cluster.xml index 7f1fde71d6586a..2cbcbd01c9a11a 100644 --- a/data_model/clusters/ACL-Cluster.xml +++ b/data_model/clusters/ACL-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -112,13 +112,13 @@ Davis, CA 95616, USA - + - + @@ -126,7 +126,7 @@ Davis, CA 95616, USA - + @@ -148,12 +148,12 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml index 91f675eaba693b..3cd5c02590ea0a 100644 --- a/data_model/clusters/AccountLogin.xml +++ b/data_model/clusters/AccountLogin.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/AdminCommissioningCluster.xml b/data_model/clusters/AdminCommissioningCluster.xml index b003452f0385a2..b2cffacf87e121 100644 --- a/data_model/clusters/AdminCommissioningCluster.xml +++ b/data_model/clusters/AdminCommissioningCluster.xml @@ -57,7 +57,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -92,7 +92,7 @@ Davis, CA 95616, USA - + @@ -106,7 +106,7 @@ Davis, CA 95616, USA - + @@ -117,7 +117,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/AirQuality.xml b/data_model/clusters/AirQuality.xml index 59f7550236696f..dcaf38bc586cf5 100644 --- a/data_model/clusters/AirQuality.xml +++ b/data_model/clusters/AirQuality.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ApplicationBasic.xml b/data_model/clusters/ApplicationBasic.xml index 086839a2338cfc..48ce9673675e1d 100644 --- a/data_model/clusters/ApplicationBasic.xml +++ b/data_model/clusters/ApplicationBasic.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ApplicationLauncher.xml b/data_model/clusters/ApplicationLauncher.xml index 5d716981a55d38..91ebf6b5937446 100644 --- a/data_model/clusters/ApplicationLauncher.xml +++ b/data_model/clusters/ApplicationLauncher.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -120,7 +120,7 @@ Davis, CA 95616, USA - + @@ -150,7 +150,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/AudioOutput.xml b/data_model/clusters/AudioOutput.xml index 176e75b16c19c9..8ace3342ce2132 100644 --- a/data_model/clusters/AudioOutput.xml +++ b/data_model/clusters/AudioOutput.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -88,20 +88,22 @@ Davis, CA 95616, USA + + + - - + diff --git a/data_model/clusters/BasicInformationCluster.xml b/data_model/clusters/BasicInformationCluster.xml index 4938da502ed407..ae4e6f6661a820 100644 --- a/data_model/clusters/BasicInformationCluster.xml +++ b/data_model/clusters/BasicInformationCluster.xml @@ -160,9 +160,11 @@ Davis, CA 95616, USA + + @@ -174,18 +176,18 @@ Davis, CA 95616, USA - + - + - + @@ -196,13 +198,13 @@ Davis, CA 95616, USA - + - + @@ -213,7 +215,7 @@ Davis, CA 95616, USA - + @@ -225,37 +227,37 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -270,7 +272,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Binding-Cluster.xml b/data_model/clusters/Binding-Cluster.xml index 51a5559b1142ba..02b2219fcd0331 100644 --- a/data_model/clusters/Binding-Cluster.xml +++ b/data_model/clusters/Binding-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -87,8 +87,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml index 9ace62ca720a53..b75540d94a6baf 100644 --- a/data_model/clusters/Channel.xml +++ b/data_model/clusters/Channel.xml @@ -104,23 +104,26 @@ Davis, CA 95616, USA + + + + - - + diff --git a/data_model/clusters/ColorControl.xml b/data_model/clusters/ColorControl.xml index f695a63036db1c..142e1a58ab7a67 100644 --- a/data_model/clusters/ColorControl.xml +++ b/data_model/clusters/ColorControl.xml @@ -173,7 +173,7 @@ Davis, CA 95616, USA - + @@ -230,13 +230,13 @@ Davis, CA 95616, USA - + - + @@ -287,7 +287,7 @@ Davis, CA 95616, USA - + @@ -332,17 +332,17 @@ Davis, CA 95616, USA - + - + - + @@ -407,26 +407,26 @@ Davis, CA 95616, USA - + - + - + - + @@ -753,7 +753,7 @@ Davis, CA 95616, USA - + @@ -878,7 +878,7 @@ Davis, CA 95616, USA - + @@ -957,7 +957,7 @@ Davis, CA 95616, USA - + @@ -986,7 +986,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ConcentrationMeasurement.xml b/data_model/clusters/ConcentrationMeasurement.xml index 47835e6bc6e568..ad239e700eacf9 100644 --- a/data_model/clusters/ConcentrationMeasurement.xml +++ b/data_model/clusters/ConcentrationMeasurement.xml @@ -55,23 +55,12 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - - - - - - - - - - - @@ -253,7 +242,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ContentControl.xml b/data_model/clusters/ContentControl.xml index 00f7c7d9600e52..3642777b46a76d 100644 --- a/data_model/clusters/ContentControl.xml +++ b/data_model/clusters/ContentControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -96,8 +96,7 @@ Davis, CA 95616, USA - - + @@ -110,8 +109,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/ContentLauncher.xml b/data_model/clusters/ContentLauncher.xml index 2c310c6f2ccb3d..32b47a77c233a3 100644 --- a/data_model/clusters/ContentLauncher.xml +++ b/data_model/clusters/ContentLauncher.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -157,28 +157,33 @@ Davis, CA 95616, USA + + + + + + - - + @@ -201,8 +206,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml index efbb139eea4f54..3a596905c8aa9d 100644 --- a/data_model/clusters/DemandResponseLoadControl.xml +++ b/data_model/clusters/DemandResponseLoadControl.xml @@ -207,47 +207,57 @@ Davis, CA 95616, USA + + + + + + + + + + - + @@ -280,11 +290,12 @@ Davis, CA 95616, USA + - + @@ -292,7 +303,7 @@ Davis, CA 95616, USA - + @@ -324,8 +335,7 @@ Davis, CA 95616, USA - - + @@ -336,8 +346,7 @@ Davis, CA 95616, USA - - + @@ -378,7 +387,7 @@ Davis, CA 95616, USA - + @@ -393,7 +402,7 @@ Davis, CA 95616, USA - + @@ -410,7 +419,7 @@ Davis, CA 95616, USA - + @@ -460,7 +469,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Descriptor-Cluster.xml b/data_model/clusters/Descriptor-Cluster.xml index 9944d8a3f6ea4c..956fb411e91a22 100644 --- a/data_model/clusters/Descriptor-Cluster.xml +++ b/data_model/clusters/Descriptor-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -76,12 +76,11 @@ Davis, CA 95616, USA - - + - + @@ -100,14 +99,13 @@ Davis, CA 95616, USA - - + - + \ No newline at end of file diff --git a/data_model/clusters/DeviceEnergyManagement.xml b/data_model/clusters/DeviceEnergyManagement.xml index 3c1ae9e66e8e69..f1c5c37d1ade35 100644 --- a/data_model/clusters/DeviceEnergyManagement.xml +++ b/data_model/clusters/DeviceEnergyManagement.xml @@ -239,31 +239,38 @@ Davis, CA 95616, USA + + + + + + + @@ -309,11 +316,10 @@ Davis, CA 95616, USA - - + - + @@ -365,14 +371,13 @@ Davis, CA 95616, USA - - + - + @@ -429,8 +434,7 @@ Davis, CA 95616, USA - - + @@ -439,10 +443,9 @@ Davis, CA 95616, USA - - + - + diff --git a/data_model/clusters/DiagnosticLogsCluster.xml b/data_model/clusters/DiagnosticLogsCluster.xml index 14f995ca1855a6..2fb6fc298ac7b5 100644 --- a/data_model/clusters/DiagnosticLogsCluster.xml +++ b/data_model/clusters/DiagnosticLogsCluster.xml @@ -110,7 +110,7 @@ Davis, CA 95616, USA - + @@ -121,14 +121,14 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml index 5c0125a5dbe083..ea4ce75cd549d9 100644 --- a/data_model/clusters/DiagnosticsGeneral.xml +++ b/data_model/clusters/DiagnosticsGeneral.xml @@ -175,7 +175,7 @@ Davis, CA 95616, USA - + @@ -198,12 +198,12 @@ Davis, CA 95616, USA - + - + @@ -215,7 +215,7 @@ Davis, CA 95616, USA - + @@ -239,17 +239,17 @@ Davis, CA 95616, USA - + - + - + @@ -263,7 +263,7 @@ Davis, CA 95616, USA - + @@ -278,10 +278,10 @@ Davis, CA 95616, USA - + - + @@ -291,11 +291,11 @@ Davis, CA 95616, USA - + - + @@ -303,11 +303,11 @@ Davis, CA 95616, USA - + - + @@ -315,11 +315,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsSoftware.xml b/data_model/clusters/DiagnosticsSoftware.xml index 10574384ca1cda..4a4d5508be51d5 100644 --- a/data_model/clusters/DiagnosticsSoftware.xml +++ b/data_model/clusters/DiagnosticsSoftware.xml @@ -72,7 +72,7 @@ Davis, CA 95616, USA - + @@ -88,7 +88,7 @@ Davis, CA 95616, USA - + @@ -123,11 +123,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsThread.xml b/data_model/clusters/DiagnosticsThread.xml index ea26c7822c4f35..ddcf246e9c99c3 100644 --- a/data_model/clusters/DiagnosticsThread.xml +++ b/data_model/clusters/DiagnosticsThread.xml @@ -291,11 +291,11 @@ Davis, CA 95616, USA - + - + @@ -304,38 +304,38 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -412,42 +412,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -524,42 +524,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -632,28 +632,28 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -678,11 +678,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml index 51e2b0697635bb..97c23efb96dbe3 100644 --- a/data_model/clusters/DiagnosticsWiFi.xml +++ b/data_model/clusters/DiagnosticsWiFi.xml @@ -138,7 +138,7 @@ Davis, CA 95616, USA - + @@ -200,19 +200,19 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/clusters/DishwasherAlarm.xml b/data_model/clusters/DishwasherAlarm.xml index be10eea998cd4e..487a522a661af7 100644 --- a/data_model/clusters/DishwasherAlarm.xml +++ b/data_model/clusters/DishwasherAlarm.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/DoorLock.xml b/data_model/clusters/DoorLock.xml index 7a2068a10707db..a0c5f9e63be3d7 100644 --- a/data_model/clusters/DoorLock.xml +++ b/data_model/clusters/DoorLock.xml @@ -215,10 +215,10 @@ Davis, CA 95616, USA - + - + @@ -486,9 +486,11 @@ Davis, CA 95616, USA + + @@ -657,14 +659,14 @@ Davis, CA 95616, USA - + - + @@ -682,7 +684,7 @@ Davis, CA 95616, USA - + @@ -797,17 +799,17 @@ than 0"> - + - + - + + PIN/RFID Code†" type="octets"> @@ -1217,7 +1219,7 @@ User Status: default or status cleared."> + PIN/RFID Code†" type="octets"> @@ -1238,7 +1240,7 @@ User Status: default or status cleared."> + PIN/RFID Code†" type="octets"> @@ -1296,7 +1298,7 @@ User Status: default or status cleared."> - + @@ -1324,7 +1326,7 @@ User Status: default or status cleared."> - + @@ -1367,7 +1369,7 @@ User Status: default or status cleared."> - + @@ -1424,7 +1426,7 @@ User Status: default or status cleared."> - + @@ -1443,7 +1445,7 @@ User Status: default or status cleared."> - + @@ -1459,7 +1461,7 @@ User Status: default or status cleared."> - + @@ -1496,7 +1498,7 @@ User Status: default or status cleared."> - + @@ -1514,7 +1516,7 @@ User Status: default or status cleared."> - + @@ -1555,7 +1557,7 @@ User Status: default or status cleared."> - + @@ -1574,7 +1576,7 @@ User Status: default or status cleared."> - + @@ -1598,7 +1600,7 @@ User Status: default or status cleared."> - + @@ -1616,7 +1618,7 @@ User Status: default or status cleared."> - + @@ -1819,7 +1821,7 @@ User Status: default or status cleared."> - + @@ -1862,7 +1864,7 @@ User Status: default or status cleared."> - + @@ -1896,7 +1898,7 @@ User Status: default or status cleared."> - + @@ -1941,7 +1943,7 @@ User Status: default or status cleared."> - + @@ -1951,7 +1953,7 @@ User Status: default or status cleared."> - + @@ -2002,7 +2004,7 @@ User Status: default or status cleared."> - + @@ -2036,7 +2038,7 @@ User Status: default or status cleared."> - + @@ -2067,7 +2069,7 @@ User Status: default or status cleared."> - + @@ -2166,7 +2168,7 @@ User Status: default or status cleared."> - + diff --git a/data_model/clusters/ElectricalEnergyMeasurement.xml b/data_model/clusters/ElectricalEnergyMeasurement.xml index 9e9d7f05d6bf2f..0047f948298a95 100644 --- a/data_model/clusters/ElectricalEnergyMeasurement.xml +++ b/data_model/clusters/ElectricalEnergyMeasurement.xml @@ -190,7 +190,7 @@ Davis, CA 95616, USA - + @@ -200,7 +200,7 @@ Davis, CA 95616, USA - + @@ -210,7 +210,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ElectricalPowerMeasurement.xml b/data_model/clusters/ElectricalPowerMeasurement.xml index 996fb0ce59ec11..0839bd569c8eb7 100644 --- a/data_model/clusters/ElectricalPowerMeasurement.xml +++ b/data_model/clusters/ElectricalPowerMeasurement.xml @@ -228,14 +228,12 @@ Davis, CA 95616, USA - - + - - + @@ -282,7 +280,7 @@ Davis, CA 95616, USA - + @@ -290,8 +288,7 @@ Davis, CA 95616, USA - - + @@ -299,8 +296,7 @@ Davis, CA 95616, USA - - + @@ -308,13 +304,13 @@ Davis, CA 95616, USA - + - + @@ -322,7 +318,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/EnergyCalendar.xml b/data_model/clusters/EnergyCalendar.xml index 0f9cf3c087ecf8..058019da1e9f8c 100644 --- a/data_model/clusters/EnergyCalendar.xml +++ b/data_model/clusters/EnergyCalendar.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -153,51 +153,67 @@ Davis, CA 95616, USA + + + + + + + + + + - - - + + + + + + + + + @@ -244,22 +260,22 @@ Davis, CA 95616, USA - + - + - + - + diff --git a/data_model/clusters/EnergyPreference.xml b/data_model/clusters/EnergyPreference.xml index ee549aebd41360..710ab52291b85a 100644 --- a/data_model/clusters/EnergyPreference.xml +++ b/data_model/clusters/EnergyPreference.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -97,14 +97,13 @@ Davis, CA 95616, USA - - + - + @@ -122,8 +121,7 @@ Davis, CA 95616, USA - - + @@ -131,8 +129,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/EnergyPrice.xml b/data_model/clusters/EnergyPrice.xml index 2fa268d97ac986..8be42c25061937 100644 --- a/data_model/clusters/EnergyPrice.xml +++ b/data_model/clusters/EnergyPrice.xml @@ -123,7 +123,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/FanControl.xml b/data_model/clusters/FanControl.xml index 5be22ee6dae361..121f954055bcfe 100644 --- a/data_model/clusters/FanControl.xml +++ b/data_model/clusters/FanControl.xml @@ -259,7 +259,7 @@ Davis, CA 95616, USA - + @@ -267,7 +267,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Group-Key-Management-Cluster.xml b/data_model/clusters/Group-Key-Management-Cluster.xml index 73c2c1cc1b9b8f..78db5376ebef14 100644 --- a/data_model/clusters/Group-Key-Management-Cluster.xml +++ b/data_model/clusters/Group-Key-Management-Cluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -86,23 +86,23 @@ Davis, CA 95616, USA - + - + - + - + @@ -118,35 +118,35 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -161,13 +161,13 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/Label-Cluster-FixedLabel.xml b/data_model/clusters/Label-Cluster-FixedLabel.xml index 558664a5d69f72..7087883e611edb 100644 --- a/data_model/clusters/Label-Cluster-FixedLabel.xml +++ b/data_model/clusters/Label-Cluster-FixedLabel.xml @@ -62,8 +62,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/Label-Cluster-Label.xml b/data_model/clusters/Label-Cluster-Label.xml index ee64da775b05cd..6b29c2cf44caad 100644 --- a/data_model/clusters/Label-Cluster-Label.xml +++ b/data_model/clusters/Label-Cluster-Label.xml @@ -73,8 +73,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/Label-Cluster-UserLabel.xml b/data_model/clusters/Label-Cluster-UserLabel.xml index bca4b1453f22de..e9d8dda4610b4f 100644 --- a/data_model/clusters/Label-Cluster-UserLabel.xml +++ b/data_model/clusters/Label-Cluster-UserLabel.xml @@ -62,12 +62,11 @@ Davis, CA 95616, USA - - + - + \ No newline at end of file diff --git a/data_model/clusters/LaundryDryerControls.xml b/data_model/clusters/LaundryDryerControls.xml index 8e67a5997fa976..70c985ae3fde74 100644 --- a/data_model/clusters/LaundryDryerControls.xml +++ b/data_model/clusters/LaundryDryerControls.xml @@ -55,13 +55,13 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + - + diff --git a/data_model/clusters/LaundryWasherControls.xml b/data_model/clusters/LaundryWasherControls.xml index 8ba57ef6b22e56..1e033da5dd88ab 100644 --- a/data_model/clusters/LaundryWasherControls.xml +++ b/data_model/clusters/LaundryWasherControls.xml @@ -118,13 +118,12 @@ Davis, CA 95616, USA - - + - + \ No newline at end of file diff --git a/data_model/clusters/LevelControl.xml b/data_model/clusters/LevelControl.xml index b219527a783c0d..7716ce228b3fad 100644 --- a/data_model/clusters/LevelControl.xml +++ b/data_model/clusters/LevelControl.xml @@ -65,7 +65,7 @@ Davis, CA 95616, USA - + @@ -161,7 +161,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/LocalizationConfiguration.xml b/data_model/clusters/LocalizationConfiguration.xml index b264698b6d5393..2b1297fb8f8e0e 100644 --- a/data_model/clusters/LocalizationConfiguration.xml +++ b/data_model/clusters/LocalizationConfiguration.xml @@ -55,19 +55,19 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - + - + diff --git a/data_model/clusters/LocalizationTimeFormat.xml b/data_model/clusters/LocalizationTimeFormat.xml index 204f145f9c8b07..1a7b6976a69ec6 100644 --- a/data_model/clusters/LocalizationTimeFormat.xml +++ b/data_model/clusters/LocalizationTimeFormat.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -132,7 +132,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/LocalizationUnit.xml b/data_model/clusters/LocalizationUnit.xml index 5cae6df855b2c7..8a5179dafb0aff 100644 --- a/data_model/clusters/LocalizationUnit.xml +++ b/data_model/clusters/LocalizationUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/MediaInput.xml b/data_model/clusters/MediaInput.xml index 9ca0f351d1f59f..8b6f4008f372f6 100644 --- a/data_model/clusters/MediaInput.xml +++ b/data_model/clusters/MediaInput.xml @@ -121,8 +121,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/MediaPlayback.xml b/data_model/clusters/MediaPlayback.xml index 57d8deeec19091..21001d287f6120 100644 --- a/data_model/clusters/MediaPlayback.xml +++ b/data_model/clusters/MediaPlayback.xml @@ -224,7 +224,7 @@ Davis, CA 95616, USA - + @@ -235,7 +235,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml index 26ce06a91e9c1d..71e522a92a959d 100644 --- a/data_model/clusters/Messages.xml +++ b/data_model/clusters/Messages.xml @@ -179,12 +179,14 @@ Davis, CA 95616, USA + + @@ -219,25 +221,22 @@ Davis, CA 95616, USA - - + - + - - + - + - - + @@ -246,16 +245,14 @@ Davis, CA 95616, USA - - + - - + diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml index 9a5d437b48ff09..e97821db771a77 100644 --- a/data_model/clusters/MicrowaveOvenControl.xml +++ b/data_model/clusters/MicrowaveOvenControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml index 423eb3e4a7ca6c..258708ba96908b 100644 --- a/data_model/clusters/ModeBase.xml +++ b/data_model/clusters/ModeBase.xml @@ -83,11 +83,10 @@ Davis, CA 95616, USA - - + - + @@ -109,12 +108,11 @@ Davis, CA 95616, USA - - + - + diff --git a/data_model/clusters/Mode_MicrowaveOven.xml b/data_model/clusters/Mode_MicrowaveOven.xml index cd98c189c12844..d1ac9458d71af8 100644 --- a/data_model/clusters/Mode_MicrowaveOven.xml +++ b/data_model/clusters/Mode_MicrowaveOven.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml index 8f06ac6e6d52db..9f516bbfbb2e7b 100644 --- a/data_model/clusters/NetworkCommissioningCluster.xml +++ b/data_model/clusters/NetworkCommissioningCluster.xml @@ -171,7 +171,7 @@ Davis, CA 95616, USA - + @@ -191,7 +191,7 @@ Davis, CA 95616, USA - + @@ -229,13 +229,13 @@ Davis, CA 95616, USA - + - + @@ -265,7 +265,7 @@ Davis, CA 95616, USA - + @@ -302,7 +302,7 @@ Davis, CA 95616, USA - + @@ -313,7 +313,7 @@ Davis, CA 95616, USA - + @@ -328,7 +328,7 @@ Davis, CA 95616, USA - + @@ -345,7 +345,7 @@ Davis, CA 95616, USA - + @@ -368,17 +368,17 @@ Davis, CA 95616, USA - + - + - + @@ -390,11 +390,11 @@ Davis, CA 95616, USA - + - + @@ -407,7 +407,7 @@ Davis, CA 95616, USA - + @@ -423,7 +423,7 @@ Davis, CA 95616, USA - + @@ -443,13 +443,13 @@ Davis, CA 95616, USA - + - + @@ -460,7 +460,7 @@ Davis, CA 95616, USA - + @@ -479,7 +479,7 @@ Davis, CA 95616, USA - + @@ -495,7 +495,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/NetworkIdentityManagement.xml b/data_model/clusters/NetworkIdentityManagement.xml index 0466f4a26b56ab..9ce28aa194426b 100644 --- a/data_model/clusters/NetworkIdentityManagement.xml +++ b/data_model/clusters/NetworkIdentityManagement.xml @@ -67,14 +67,13 @@ Davis, CA 95616, USA - + - - + - + @@ -86,23 +85,22 @@ Davis, CA 95616, USA - + - + - - + - + @@ -115,11 +113,11 @@ Davis, CA 95616, USA - + - + @@ -127,7 +125,7 @@ Davis, CA 95616, USA - + @@ -141,7 +139,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/OperationalCredentialCluster.xml b/data_model/clusters/OperationalCredentialCluster.xml index ea1aa49647946e..a5d25d07d57ecc 100644 --- a/data_model/clusters/OperationalCredentialCluster.xml +++ b/data_model/clusters/OperationalCredentialCluster.xml @@ -57,7 +57,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -115,11 +115,11 @@ Davis, CA 95616, USA - + - + @@ -135,12 +135,12 @@ Davis, CA 95616, USA - + - + @@ -149,13 +149,13 @@ Davis, CA 95616, USA - + - + @@ -173,7 +173,7 @@ Davis, CA 95616, USA - + @@ -187,7 +187,7 @@ Davis, CA 95616, USA - + @@ -195,11 +195,11 @@ Davis, CA 95616, USA - + - + - + @@ -215,7 +215,7 @@ Davis, CA 95616, USA - + @@ -223,7 +223,7 @@ Davis, CA 95616, USA - + @@ -234,11 +234,11 @@ Davis, CA 95616, USA - + - + - + @@ -246,33 +246,33 @@ Davis, CA 95616, USA - + - + - + - + - + - + - + @@ -300,7 +300,7 @@ Davis, CA 95616, USA - + @@ -308,10 +308,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/OperationalState.xml b/data_model/clusters/OperationalState.xml index 110ba6e05a530e..5e969ff0793b5a 100644 --- a/data_model/clusters/OperationalState.xml +++ b/data_model/clusters/OperationalState.xml @@ -85,21 +85,26 @@ Davis, CA 95616, USA + + + + + @@ -126,8 +131,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/PowerSourceCluster.xml b/data_model/clusters/PowerSourceCluster.xml index b544bf4a729a6b..f7b5da82ce20fc 100644 --- a/data_model/clusters/PowerSourceCluster.xml +++ b/data_model/clusters/PowerSourceCluster.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -673,21 +673,20 @@ Davis, CA 95616, USA - - + - + - + @@ -695,21 +694,21 @@ Davis, CA 95616, USA - + - + - + @@ -728,8 +727,7 @@ Davis, CA 95616, USA - - + @@ -792,42 +790,41 @@ Davis, CA 95616, USA - + - + - + - + - - + - + - + @@ -899,7 +896,7 @@ Davis, CA 95616, USA - + @@ -954,11 +951,11 @@ Davis, CA 95616, USA - + - + @@ -968,11 +965,11 @@ Davis, CA 95616, USA - + - + @@ -982,11 +979,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/PowerSourceConfigurationCluster.xml b/data_model/clusters/PowerSourceConfigurationCluster.xml index b2eb27fd4bd7cc..d186842379aaf6 100644 --- a/data_model/clusters/PowerSourceConfigurationCluster.xml +++ b/data_model/clusters/PowerSourceConfigurationCluster.xml @@ -55,18 +55,17 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - - + - + \ No newline at end of file diff --git a/data_model/clusters/PumpConfigurationControl.xml b/data_model/clusters/PumpConfigurationControl.xml index f3fc98a52cee9e..095004ff01bf7e 100644 --- a/data_model/clusters/PumpConfigurationControl.xml +++ b/data_model/clusters/PumpConfigurationControl.xml @@ -211,27 +211,27 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/clusters/ResourceMonitoring.xml b/data_model/clusters/ResourceMonitoring.xml index 29d01f0e50296c..e5a178a5700f8c 100644 --- a/data_model/clusters/ResourceMonitoring.xml +++ b/data_model/clusters/ResourceMonitoring.xml @@ -55,13 +55,10 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - - - @@ -154,14 +151,13 @@ Davis, CA 95616, USA - - + - + diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml index c32c87f71ff432..07a15de02bc7a4 100644 --- a/data_model/clusters/Scenes.xml +++ b/data_model/clusters/Scenes.xml @@ -137,8 +137,7 @@ Davis, CA 95616, USA - - + @@ -160,8 +159,7 @@ Davis, CA 95616, USA - - + @@ -246,8 +244,7 @@ Davis, CA 95616, USA - - + @@ -273,8 +270,7 @@ Davis, CA 95616, USA - - + @@ -322,9 +318,7 @@ Davis, CA 95616, USA - - - + @@ -449,8 +443,7 @@ Davis, CA 95616, USA - - + @@ -486,9 +479,7 @@ Davis, CA 95616, USA - - - + diff --git a/data_model/clusters/SmokeCOAlarm.xml b/data_model/clusters/SmokeCOAlarm.xml index 0db5c78f4e947f..d24f696e3a3384 100644 --- a/data_model/clusters/SmokeCOAlarm.xml +++ b/data_model/clusters/SmokeCOAlarm.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -207,19 +207,19 @@ Davis, CA 95616, USA - + - + - + @@ -295,7 +295,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Switch.xml b/data_model/clusters/Switch.xml index 30602c35bf794f..141b32e782969d 100644 --- a/data_model/clusters/Switch.xml +++ b/data_model/clusters/Switch.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/clusters/TargetNavigator.xml b/data_model/clusters/TargetNavigator.xml index 343f1427176e41..ffb6955d27bf3c 100644 --- a/data_model/clusters/TargetNavigator.xml +++ b/data_model/clusters/TargetNavigator.xml @@ -83,8 +83,7 @@ Davis, CA 95616, USA - - + diff --git a/data_model/clusters/Thermostat.xml b/data_model/clusters/Thermostat.xml index b0387a3f907354..704d3a21a1df9a 100644 --- a/data_model/clusters/Thermostat.xml +++ b/data_model/clusters/Thermostat.xml @@ -229,7 +229,7 @@ Davis, CA 95616, USA - + @@ -280,7 +280,7 @@ Davis, CA 95616, USA - + @@ -350,10 +350,10 @@ Davis, CA 95616, USA - + - + @@ -472,7 +472,7 @@ Davis, CA 95616, USA - + @@ -621,30 +621,30 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -767,7 +767,7 @@ Davis, CA 95616, USA - + @@ -851,10 +851,9 @@ Davis, CA 95616, USA - - + - + diff --git a/data_model/clusters/ThreadBorderRouterDiagnostics.xml b/data_model/clusters/ThreadBorderRouterDiagnostics.xml index 29b5da9b8511f0..20215e275d2f00 100644 --- a/data_model/clusters/ThreadBorderRouterDiagnostics.xml +++ b/data_model/clusters/ThreadBorderRouterDiagnostics.xml @@ -68,7 +68,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/TimeSync.xml b/data_model/clusters/TimeSync.xml index 55d2988a64c692..c7ad7b0032aaf7 100644 --- a/data_model/clusters/TimeSync.xml +++ b/data_model/clusters/TimeSync.xml @@ -111,19 +111,19 @@ Davis, CA 95616, USA - + - + - + - + @@ -132,22 +132,22 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -177,9 +177,9 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/WaterContentMeasurement.xml b/data_model/clusters/WaterContentMeasurement.xml index 38a78631c86fd8..8b1ff6a9a049bc 100644 --- a/data_model/clusters/WaterContentMeasurement.xml +++ b/data_model/clusters/WaterContentMeasurement.xml @@ -55,16 +55,12 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - - - - diff --git a/data_model/clusters/WaterHeaterManagement.xml b/data_model/clusters/WaterHeaterManagement.xml index a4ed482c91816b..c55c6a1e09bf09 100644 --- a/data_model/clusters/WaterHeaterManagement.xml +++ b/data_model/clusters/WaterHeaterManagement.xml @@ -117,7 +117,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/WindowCovering.xml b/data_model/clusters/WindowCovering.xml index 3ee6d43ded8bce..7eefe853c91d0a 100644 --- a/data_model/clusters/WindowCovering.xml +++ b/data_model/clusters/WindowCovering.xml @@ -334,13 +334,13 @@ Davis, CA 95616, USA - + - + - + @@ -477,13 +477,13 @@ Davis, CA 95616, USA - + - + @@ -493,7 +493,7 @@ Davis, CA 95616, USA - + @@ -503,13 +503,13 @@ Davis, CA 95616, USA - + - + @@ -520,7 +520,7 @@ Davis, CA 95616, USA - + @@ -600,7 +600,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/bridge-clusters-Actions.xml b/data_model/clusters/bridge-clusters-Actions.xml index ccacb56e8b2576..f9b17944739dca 100644 --- a/data_model/clusters/bridge-clusters-Actions.xml +++ b/data_model/clusters/bridge-clusters-Actions.xml @@ -160,7 +160,7 @@ Davis, CA 95616, USA - + @@ -187,7 +187,7 @@ Davis, CA 95616, USA - + @@ -195,7 +195,7 @@ Davis, CA 95616, USA - + @@ -203,17 +203,17 @@ Davis, CA 95616, USA - + - + - + @@ -322,7 +322,7 @@ Davis, CA 95616, USA - + @@ -331,7 +331,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml index 00d4cda8fcfbb3..da2b311a5c2e53 100644 --- a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml +++ b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml @@ -93,22 +93,22 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml index f9bff7aa27cd55..3f70f3d78ccb4b 100644 --- a/data_model/device_types/Aggregator.xml +++ b/data_model/device_types/Aggregator.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/AirPurifier.xml b/data_model/device_types/AirPurifier.xml index 848ccdf8849bc6..9793cd1d36b215 100644 --- a/data_model/device_types/AirPurifier.xml +++ b/data_model/device_types/AirPurifier.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/AirQualitySensor.xml b/data_model/device_types/AirQualitySensor.xml index bf56eb754f24c6..0c96fbd60515b7 100644 --- a/data_model/device_types/AirQualitySensor.xml +++ b/data_model/device_types/AirQualitySensor.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -65,7 +65,7 @@ Davis, CA 95616, USA - + @@ -74,10 +74,10 @@ Davis, CA 95616, USA - + - + @@ -86,22 +86,22 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/device_types/BasicVideoPlayer.xml b/data_model/device_types/BasicVideoPlayer.xml index 75d54e18d1c33f..f6b86091004bfe 100644 --- a/data_model/device_types/BasicVideoPlayer.xml +++ b/data_model/device_types/BasicVideoPlayer.xml @@ -91,7 +91,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/BridgedNode.xml b/data_model/device_types/BridgedNode.xml index 29b7a59299c37b..a383ed2b541d6b 100644 --- a/data_model/device_types/BridgedNode.xml +++ b/data_model/device_types/BridgedNode.xml @@ -64,7 +64,7 @@ Davis, CA 95616, USA - + @@ -72,7 +72,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/CastingVideoClient.xml b/data_model/device_types/CastingVideoClient.xml index 8089f57507dd18..06ef2b5492f337 100644 --- a/data_model/device_types/CastingVideoClient.xml +++ b/data_model/device_types/CastingVideoClient.xml @@ -90,19 +90,19 @@ Davis, CA 95616, USA - + - + - + - + - + diff --git a/data_model/device_types/CastingVideoPlayer.xml b/data_model/device_types/CastingVideoPlayer.xml index 734be9bbfc2b47..fd26bb675cbdf6 100644 --- a/data_model/device_types/CastingVideoPlayer.xml +++ b/data_model/device_types/CastingVideoPlayer.xml @@ -94,13 +94,13 @@ launch Content Apps and represent these apps as separate endpoints."/> - + - + - + @@ -110,7 +110,7 @@ launch Content Apps and represent these apps as separate endpoints."/> - + diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml index 531c78defb3b54..5897f0ee0b796a 100644 --- a/data_model/device_types/ColorTemperatureLight.xml +++ b/data_model/device_types/ColorTemperatureLight.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml index 205fca92bbdc6a..8f927c48f44a35 100644 --- a/data_model/device_types/ContentApp.xml +++ b/data_model/device_types/ContentApp.xml @@ -75,10 +75,10 @@ Davis, CA 95616, USA - + - + @@ -86,10 +86,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml index 0f085fdfc2a4de..c262abf3741d7e 100644 --- a/data_model/device_types/DimmablePlug-InUnit.xml +++ b/data_model/device_types/DimmablePlug-InUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Dishwasher.xml b/data_model/device_types/Dishwasher.xml index a07fdc9c3adddb..429e96c149abe9 100644 --- a/data_model/device_types/Dishwasher.xml +++ b/data_model/device_types/Dishwasher.xml @@ -89,7 +89,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/DoorLock.xml b/data_model/device_types/DoorLock.xml index 08f7423519122d..d31aaad30d8d98 100644 --- a/data_model/device_types/DoorLock.xml +++ b/data_model/device_types/DoorLock.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -85,7 +85,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml index 413509de632c6e..4f4efb3ea90d1c 100644 --- a/data_model/device_types/DoorLockController.xml +++ b/data_model/device_types/DoorLockController.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/EnergyTariff.xml b/data_model/device_types/EnergyTariff.xml index bf27554ff281db..9e6e0b4c12ab36 100644 --- a/data_model/device_types/EnergyTariff.xml +++ b/data_model/device_types/EnergyTariff.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/EnergyTariffCalendar.xml b/data_model/device_types/EnergyTariffCalendar.xml index 7b0becfc52e1c9..3dca889b777e66 100644 --- a/data_model/device_types/EnergyTariffCalendar.xml +++ b/data_model/device_types/EnergyTariffCalendar.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml index 47e9bf720b7e72..4120226176e7a1 100644 --- a/data_model/device_types/ExtendedColorLight.xml +++ b/data_model/device_types/ExtendedColorLight.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/ExtractorHood.xml b/data_model/device_types/ExtractorHood.xml index 9adf279add083b..5fdbc7c84a1583 100644 --- a/data_model/device_types/ExtractorHood.xml +++ b/data_model/device_types/ExtractorHood.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Fan.xml b/data_model/device_types/Fan.xml index f858edd89bc36b..49538ec32097b6 100644 --- a/data_model/device_types/Fan.xml +++ b/data_model/device_types/Fan.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/GenericSwitch.xml b/data_model/device_types/GenericSwitch.xml index 24645b511ea5e7..7e13a7e18223ab 100644 --- a/data_model/device_types/GenericSwitch.xml +++ b/data_model/device_types/GenericSwitch.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -67,7 +67,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/LaundryDryer.xml b/data_model/device_types/LaundryDryer.xml index 27b98c7dac56cc..a7d365f22e14fe 100644 --- a/data_model/device_types/LaundryDryer.xml +++ b/data_model/device_types/LaundryDryer.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + @@ -73,7 +73,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/MicrowaveOven.xml b/data_model/device_types/MicrowaveOven.xml index 460c8d971cd17b..8e77925b4131fc 100644 --- a/data_model/device_types/MicrowaveOven.xml +++ b/data_model/device_types/MicrowaveOven.xml @@ -65,10 +65,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml index e7f55a966df2fc..1847119e49426c 100644 --- a/data_model/device_types/OnOffPlug-inUnit.xml +++ b/data_model/device_types/OnOffPlug-inUnit.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/Oven.xml b/data_model/device_types/Oven.xml index 5d24a61858c812..5a13b0ec9ba053 100644 --- a/data_model/device_types/Oven.xml +++ b/data_model/device_types/Oven.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + diff --git a/data_model/device_types/PowerSource.xml b/data_model/device_types/PowerSource.xml index 3767d5c19ad025..05aaa56f88cf92 100644 --- a/data_model/device_types/PowerSource.xml +++ b/data_model/device_types/PowerSource.xml @@ -62,7 +62,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/PumpController.xml b/data_model/device_types/PumpController.xml index 1eb302399379fe..070e3a5912942b 100644 --- a/data_model/device_types/PumpController.xml +++ b/data_model/device_types/PumpController.xml @@ -84,7 +84,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml index 1efced2f423c64..f4792a2e1f5a96 100644 --- a/data_model/device_types/RootNodeDeviceType.xml +++ b/data_model/device_types/RootNodeDeviceType.xml @@ -63,7 +63,7 @@ Davis, CA 95616, USA - + @@ -71,25 +71,25 @@ Davis, CA 95616, USA - + - + - + - + @@ -148,15 +148,15 @@ Davis, CA 95616, USA - + - + - + diff --git a/data_model/device_types/SmokeCOAlarm.xml b/data_model/device_types/SmokeCOAlarm.xml index 518809d449e35a..5888e8148f0927 100644 --- a/data_model/device_types/SmokeCOAlarm.xml +++ b/data_model/device_types/SmokeCOAlarm.xml @@ -68,7 +68,7 @@ Davis, CA 95616, USA - + @@ -77,7 +77,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml index e918c058f7ed1f..ebc43e7dbf7203 100644 --- a/data_model/device_types/Thermostat.xml +++ b/data_model/device_types/Thermostat.xml @@ -83,7 +83,7 @@ Davis, CA 95616, USA - + @@ -100,7 +100,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/ThreePhasePowerSource.xml b/data_model/device_types/ThreePhasePowerSource.xml index f1662639ce6955..3a3d5a018223b4 100644 --- a/data_model/device_types/ThreePhasePowerSource.xml +++ b/data_model/device_types/ThreePhasePowerSource.xml @@ -61,10 +61,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/VideoRemoteControl.xml b/data_model/device_types/VideoRemoteControl.xml index eafa4cd63780b2..c86fb3ba437a55 100644 --- a/data_model/device_types/VideoRemoteControl.xml +++ b/data_model/device_types/VideoRemoteControl.xml @@ -55,7 +55,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -90,16 +90,16 @@ Davis, CA 95616, USA - + - + - + - + diff --git a/data_model/scraper_version b/data_model/scraper_version index 6085e946503a10..26aaba0e86632e 100644 --- a/data_model/scraper_version +++ b/data_model/scraper_version @@ -1 +1 @@ -1.2.1 +1.2.0