diff --git a/data_model/ValveConfigurationControl.xml b/data_model/ValveConfigurationControl.xml new file mode 100644 index 00000000000000..2d1554df10df59 --- /dev/null +++ b/data_model/ValveConfigurationControl.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/ACL-Cluster.xml b/data_model/clusters/ACL-Cluster.xml index 2cbcbd01c9a11a..9ef2f500e96e01 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 --> - + @@ -76,7 +76,7 @@ Davis, CA 95616, USA - + @@ -112,25 +112,27 @@ Davis, CA 95616, USA - + - + + - + + @@ -148,13 +150,13 @@ Davis, CA 95616, USA - - + + - - + + diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml index cc7e74bf2256fd..91f675eaba693b 100644 --- a/data_model/clusters/AccountLogin.xml +++ b/data_model/clusters/AccountLogin.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/AdminCommissioningCluster.xml b/data_model/clusters/AdminCommissioningCluster.xml index b2cffacf87e121..b94b25ec5520c2 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 --> - + @@ -81,6 +81,7 @@ Davis, CA 95616, USA + @@ -92,7 +93,7 @@ Davis, CA 95616, USA - + @@ -106,7 +107,7 @@ Davis, CA 95616, USA - + @@ -117,7 +118,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/AlarmBase.xml b/data_model/clusters/AlarmBase.xml index 834089869b21da..9ba73c14ab6e63 100644 --- a/data_model/clusters/AlarmBase.xml +++ b/data_model/clusters/AlarmBase.xml @@ -66,25 +66,25 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -96,14 +96,14 @@ Davis, CA 95616, USA - + - + @@ -112,16 +112,16 @@ 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..87fa765f65b2f5 100644 --- a/data_model/clusters/BasicInformationCluster.xml +++ b/data_model/clusters/BasicInformationCluster.xml @@ -59,7 +59,7 @@ Davis, CA 95616, USA - + @@ -160,11 +160,9 @@ Davis, CA 95616, USA - - @@ -175,19 +173,20 @@ Davis, CA 95616, USA + - + - + - + @@ -198,13 +197,13 @@ Davis, CA 95616, USA - + - + @@ -215,7 +214,7 @@ Davis, CA 95616, USA - + @@ -227,37 +226,37 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -272,7 +271,7 @@ Davis, CA 95616, USA - + @@ -294,12 +293,6 @@ Davis, CA 95616, USA - - - - - - diff --git a/data_model/clusters/Binding-Cluster.xml b/data_model/clusters/Binding-Cluster.xml index 02b2219fcd0331..95f68f1d6ff995 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 --> - + @@ -84,11 +84,13 @@ Davis, CA 95616, USA + - - + + + diff --git a/data_model/clusters/BooleanStateConfiguration.xml b/data_model/clusters/BooleanStateConfiguration.xml new file mode 100644 index 00000000000000..0b60a3e6b9f557 --- /dev/null +++ b/data_model/clusters/BooleanStateConfiguration.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml index 0f9d546fef27fa..9ace62ca720a53 100644 --- a/data_model/clusters/Channel.xml +++ b/data_model/clusters/Channel.xml @@ -1,59 +1,59 @@ - @@ -67,12 +67,6 @@ Davis, CA 95616, USA - - - - - - @@ -91,161 +85,6 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -262,35 +101,26 @@ Davis, CA 95616, USA - - - - - - - - - - - + + @@ -357,94 +187,5 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/ColorControl.xml b/data_model/clusters/ColorControl.xml index 142e1a58ab7a67..c0b0655261b10b 100644 --- a/data_model/clusters/ColorControl.xml +++ b/data_model/clusters/ColorControl.xml @@ -126,16 +126,16 @@ Davis, CA 95616, USA - + - + - + - + @@ -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 - + - + - + - + @@ -460,10 +460,10 @@ Davis, CA 95616, USA - + - + @@ -753,7 +753,7 @@ Davis, CA 95616, USA - + @@ -878,7 +878,7 @@ Davis, CA 95616, USA - + @@ -899,13 +899,13 @@ Davis, CA 95616, USA - + - + - + @@ -914,10 +914,10 @@ 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..dbb8c53b5d951b 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/ContentAppObserver.xml b/data_model/clusters/ContentAppObserver.xml index 05d19307fc59ac..4d292cc3e6b2d7 100644 --- a/data_model/clusters/ContentAppObserver.xml +++ b/data_model/clusters/ContentAppObserver.xml @@ -59,7 +59,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/ContentControl.xml b/data_model/clusters/ContentControl.xml index ff38faf1f10909..b51bdff9397448 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 --> - + @@ -76,33 +76,119 @@ Davis, CA 95616, USA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - @@ -111,12 +197,12 @@ Davis, CA 95616, USA - + + - @@ -144,7 +230,28 @@ Davis, CA 95616, USA - + + + + + + + + + + + + + + + + + + + + + + @@ -196,7 +303,8 @@ Davis, CA 95616, USA - + + @@ -206,6 +314,7 @@ Davis, CA 95616, USA + @@ -230,7 +339,7 @@ Davis, CA 95616, USA - + @@ -240,6 +349,65 @@ Davis, CA 95616, USA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -248,5 +416,11 @@ Davis, CA 95616, USA + + + + + + \ No newline at end of file diff --git a/data_model/clusters/ContentLauncher.xml b/data_model/clusters/ContentLauncher.xml index 114c2e4d6e10b7..2c310c6f2ccb3d 100644 --- a/data_model/clusters/ContentLauncher.xml +++ b/data_model/clusters/ContentLauncher.xml @@ -1,61 +1,61 @@ - - + @@ -67,15 +67,6 @@ Davis, CA 95616, USA - - - - - - - - - @@ -134,15 +125,6 @@ Davis, CA 95616, USA - - - - - - - - - @@ -154,16 +136,6 @@ Davis, CA 95616, USA - - - - - - - - - - @@ -172,9 +144,6 @@ Davis, CA 95616, USA - - - @@ -188,69 +157,28 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -273,7 +201,8 @@ Davis, CA 95616, USA - + + @@ -329,12 +258,6 @@ Davis, CA 95616, USA - - - - - - @@ -350,9 +273,6 @@ Davis, CA 95616, USA - - - diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml index 3a596905c8aa9d..170cde68e8acff 100644 --- a/data_model/clusters/DemandResponseLoadControl.xml +++ b/data_model/clusters/DemandResponseLoadControl.xml @@ -207,57 +207,47 @@ Davis, CA 95616, USA - - - - - - - - - - - + @@ -287,15 +277,15 @@ Davis, CA 95616, USA + - - + @@ -303,7 +293,7 @@ Davis, CA 95616, USA - + @@ -327,6 +317,7 @@ Davis, CA 95616, USA + @@ -335,7 +326,8 @@ Davis, CA 95616, USA - + + @@ -346,7 +338,8 @@ Davis, CA 95616, USA - + + @@ -387,7 +380,7 @@ Davis, CA 95616, USA - + @@ -402,7 +395,7 @@ Davis, CA 95616, USA - + @@ -419,7 +412,7 @@ Davis, CA 95616, USA - + @@ -469,7 +462,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..fe2358e36854cb 100644 --- a/data_model/clusters/DeviceEnergyManagement.xml +++ b/data_model/clusters/DeviceEnergyManagement.xml @@ -55,33 +55,55 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + - - + - + - + - + + + + + + + + + - - + + - - + + + + + + + + + + + + + + @@ -96,7 +118,7 @@ Davis, CA 95616, USA - + @@ -110,17 +132,17 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -154,48 +176,70 @@ Davis, CA 95616, USA + + + + + + + + + - - - + + + + - - + + + - - - + + + + + + - - - - + + + + + + + + + + + - - + + - + - + - + - + + - + @@ -211,22 +255,22 @@ Davis, CA 95616, USA - + - + - + - + @@ -234,37 +278,34 @@ Davis, CA 95616, USA - + - - - + + + - - - + + - - - + + - - - - + + + - + - + @@ -298,209 +339,128 @@ 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 9200a44cf971c1..3ea1b41fc62a75 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 - + - + - + @@ -266,7 +266,7 @@ Davis, CA 95616, USA - + @@ -281,10 +281,10 @@ Davis, CA 95616, USA - + - + @@ -294,11 +294,11 @@ Davis, CA 95616, USA - + - + @@ -306,11 +306,11 @@ Davis, CA 95616, USA - + - + @@ -318,11 +318,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..7d301fef862216 100644 --- a/data_model/clusters/DiagnosticsThread.xml +++ b/data_model/clusters/DiagnosticsThread.xml @@ -57,9 +57,10 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + @@ -153,11 +154,11 @@ Davis, CA 95616, USA - + - + @@ -291,11 +292,11 @@ Davis, CA 95616, USA - + - + @@ -304,38 +305,38 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -412,42 +413,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -524,42 +525,42 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -632,28 +633,28 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -678,11 +679,11 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml index 97c23efb96dbe3..35c05235860a34 100644 --- a/data_model/clusters/DiagnosticsWiFi.xml +++ b/data_model/clusters/DiagnosticsWiFi.xml @@ -57,7 +57,7 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + @@ -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..7fda78ad163116 100644 --- a/data_model/clusters/DishwasherAlarm.xml +++ b/data_model/clusters/DishwasherAlarm.xml @@ -55,13 +55,13 @@ 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..4f84afca85ff1e 100644 --- a/data_model/clusters/DoorLock.xml +++ b/data_model/clusters/DoorLock.xml @@ -57,7 +57,7 @@ Davis, CA 95616, USA --> - + @@ -67,13 +67,13 @@ Davis, CA 95616, USA - + - + - + @@ -82,19 +82,19 @@ Davis, CA 95616, USA - + - + - + - + @@ -110,10 +110,10 @@ Davis, CA 95616, USA - + - + @@ -121,7 +121,6 @@ Davis, CA 95616, USA - @@ -214,14 +213,6 @@ Davis, CA 95616, USA - - - - - - - - @@ -254,6 +245,45 @@ Davis, CA 95616, USA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -322,6 +352,58 @@ Davis, CA 95616, USA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -370,7 +452,7 @@ Davis, CA 95616, USA - + @@ -401,49 +483,64 @@ Davis, CA 95616, USA + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -451,7 +548,7 @@ Davis, CA 95616, USA - + @@ -461,100 +558,186 @@ Davis, CA 95616, USA - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -563,7 +746,7 @@ Davis, CA 95616, USA - + @@ -659,32 +842,21 @@ Davis, CA 95616, USA - + - - - - - - - - - - - - + - + @@ -704,87 +876,33 @@ Davis, CA 95616, USA - + - - + - - + - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + @@ -799,39 +917,17 @@ than 0"> - + - + - - - - - - - - - - - - - - - + @@ -891,66 +987,12 @@ than 0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -960,102 +1002,21 @@ than 0"> - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1065,58 +1026,7 @@ than 0"> - - - - - - - - - - - - - - - - - - + @@ -1126,69 +1036,14 @@ User Status: default or status changed."> - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + @@ -1200,12 +1055,10 @@ User Status: default or status cleared."> - + - + @@ -1214,12 +1067,10 @@ User Status: default or status cleared."> - + - + @@ -1232,15 +1083,13 @@ User Status: default or status cleared."> - + - + @@ -1249,60 +1098,47 @@ User Status: default or status cleared."> - + - + - + - + - - - - - - - - - - - - + - - + - - + - + - + - + @@ -1312,25 +1148,24 @@ User Status: default or status cleared."> - + - + - + - + - - + - + @@ -1340,12 +1175,12 @@ User Status: default or status cleared."> - + - + @@ -1355,26 +1190,26 @@ User Status: default or status cleared."> - + - + - + - + - + - + - + @@ -1384,15 +1219,13 @@ User Status: default or status cleared."> - + - + @@ -1403,7 +1236,7 @@ User Status: default or status cleared."> - + @@ -1417,16 +1250,16 @@ User Status: default or status cleared."> - + - + - + - + @@ -1440,45 +1273,40 @@ User Status: default or status cleared."> - + - + - + - + - - + - + - + - + @@ -1498,38 +1326,30 @@ User Status: default or status cleared."> - + - + - + - + - + - + @@ -1537,7 +1357,7 @@ User Status: default or status cleared."> - + @@ -1557,39 +1377,31 @@ User Status: default or status cleared."> - + - + - + - + - + - + @@ -1600,38 +1412,30 @@ User Status: default or status cleared."> - + - + - + - + - + - + @@ -1646,33 +1450,27 @@ User Status: default or status cleared."> - + - + - + - + - + @@ -1686,26 +1484,22 @@ User Status: default or status cleared."> - + - + - + - + @@ -1726,20 +1520,18 @@ User Status: default or status cleared."> - + - + - + @@ -1753,16 +1545,15 @@ User Status: default or status cleared."> - + - + - - + @@ -1776,28 +1567,27 @@ User Status: default or status cleared."> - + - + - + - + - - + @@ -1807,25 +1597,25 @@ User Status: default or status cleared."> - + - + - + - + - + - + - + @@ -1835,12 +1625,12 @@ User Status: default or status cleared."> - + - + @@ -1850,26 +1640,26 @@ User Status: default or status cleared."> - + - + - + - + - + - + - + @@ -1879,15 +1669,13 @@ User Status: default or status cleared."> - + - + @@ -1898,7 +1686,7 @@ User Status: default or status cleared."> - + @@ -1943,7 +1731,7 @@ User Status: default or status cleared."> - + @@ -1953,7 +1741,7 @@ User Status: default or status cleared."> - + @@ -2004,7 +1792,7 @@ User Status: default or status cleared."> - + @@ -2015,37 +1803,37 @@ User Status: default or status cleared."> - + - + - + - + - + - + - + - + @@ -2056,7 +1844,7 @@ User Status: default or status cleared."> - + @@ -2069,7 +1857,7 @@ User Status: default or status cleared."> - + @@ -2096,7 +1884,7 @@ User Status: default or status cleared."> - + @@ -2116,7 +1904,7 @@ User Status: default or status cleared."> - + @@ -2125,7 +1913,7 @@ User Status: default or status cleared."> - + @@ -2152,7 +1940,7 @@ User Status: default or status cleared."> - + @@ -2163,12 +1951,12 @@ User Status: default or status cleared."> - + - + @@ -2186,7 +1974,7 @@ User Status: default or status cleared."> - + @@ -2195,7 +1983,7 @@ User Status: default or status cleared."> - + @@ -2225,7 +2013,7 @@ User Status: default or status cleared."> - + diff --git a/data_model/clusters/ElectricalEnergyMeasurement.xml b/data_model/clusters/ElectricalEnergyMeasurement.xml index 0047f948298a95..bcf229c0266009 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/EnergyEVSE.xml b/data_model/clusters/EnergyEVSE.xml new file mode 100644 index 00000000000000..52cf89fecee8a7 --- /dev/null +++ b/data_model/clusters/EnergyEVSE.xml @@ -0,0 +1,571 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/EnergyPreference.xml b/data_model/clusters/EnergyPreference.xml index 710ab52291b85a..fa50bbe839ae65 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 --> - + @@ -64,7 +64,7 @@ Davis, CA 95616, USA - + @@ -84,10 +84,9 @@ Davis, CA 95616, USA - + - @@ -97,13 +96,14 @@ Davis, CA 95616, USA - + + - + @@ -111,17 +111,9 @@ Davis, CA 95616, USA - - - - - - - - - - + + @@ -129,13 +121,21 @@ Davis, CA 95616, USA - + + - + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/EnergyPrice.xml b/data_model/clusters/EnergyPrice.xml index 8be42c25061937..b358e75ab53a5c 100644 --- a/data_model/clusters/EnergyPrice.xml +++ b/data_model/clusters/EnergyPrice.xml @@ -81,19 +81,19 @@ Davis, CA 95616, USA - + - + - + - + @@ -123,8 +123,9 @@ Davis, CA 95616, USA - + + @@ -160,6 +161,7 @@ Davis, CA 95616, USA + diff --git a/data_model/clusters/FanControl.xml b/data_model/clusters/FanControl.xml index 121f954055bcfe..e3ac9f85cc4c16 100644 --- a/data_model/clusters/FanControl.xml +++ b/data_model/clusters/FanControl.xml @@ -114,36 +114,36 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -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..ad86b24e3bd387 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,29 +86,31 @@ Davis, CA 95616, USA - + - + - + + - + + @@ -118,35 +120,35 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -161,14 +163,14 @@ Davis, CA 95616, USA - - + + - - + + diff --git a/data_model/clusters/ICDManagement.xml b/data_model/clusters/ICDManagement.xml index 711b98b49b104c..74c19edfdd08a7 100644 --- a/data_model/clusters/ICDManagement.xml +++ b/data_model/clusters/ICDManagement.xml @@ -55,18 +55,35 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - - + + + + - + + + + + + + + + + + + + + + + @@ -84,8 +101,9 @@ Davis, CA 95616, USA - - + + + @@ -120,17 +138,17 @@ Davis, CA 95616, USA - + - + - + @@ -146,7 +164,7 @@ Davis, CA 95616, USA - + @@ -155,7 +173,7 @@ Davis, CA 95616, USA - + @@ -167,7 +185,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/clusters/Identify.xml b/data_model/clusters/Identify.xml index cc9bf06b474eca..379e684e51297d 100644 --- a/data_model/clusters/Identify.xml +++ b/data_model/clusters/Identify.xml @@ -63,58 +63,53 @@ Davis, CA 95616, USA - - - - - - + - + - + - + - - + - + - + - + - + - + - + - @@ -139,21 +134,6 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - diff --git a/data_model/clusters/KeypadInput.xml b/data_model/clusters/KeypadInput.xml index 7179ae676b65fe..f0459e6b1bff1a 100644 --- a/data_model/clusters/KeypadInput.xml +++ b/data_model/clusters/KeypadInput.xml @@ -73,262 +73,262 @@ 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..461f08666093b8 100644 --- a/data_model/clusters/LaundryDryerControls.xml +++ b/data_model/clusters/LaundryDryerControls.xml @@ -55,22 +55,39 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + + + + + + + + + + + + + + + + + - + + - + - + - + \ No newline at end of file diff --git a/data_model/clusters/LaundryWasherControls.xml b/data_model/clusters/LaundryWasherControls.xml index 1e033da5dd88ab..5a9d108ccc1b01 100644 --- a/data_model/clusters/LaundryWasherControls.xml +++ b/data_model/clusters/LaundryWasherControls.xml @@ -70,22 +70,22 @@ Davis, CA 95616, USA - + - + - + - + @@ -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..8a348a2dc05cbd 100644 --- a/data_model/clusters/LevelControl.xml +++ b/data_model/clusters/LevelControl.xml @@ -65,7 +65,7 @@ Davis, CA 95616, USA - + @@ -75,9 +75,10 @@ Davis, CA 95616, USA - - + + @@ -89,6 +90,14 @@ Davis, CA 95616, USA + + + + + + + + @@ -161,7 +170,7 @@ Davis, CA 95616, USA - + @@ -212,7 +221,7 @@ Davis, CA 95616, USA - + @@ -232,7 +241,7 @@ Davis, CA 95616, USA - + @@ -244,7 +253,7 @@ Davis, CA 95616, USA - + @@ -255,7 +264,7 @@ Davis, CA 95616, USA - + @@ -267,7 +276,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..24c54638b4ffd7 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 --> - + @@ -79,9 +79,9 @@ 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 94987fbcfdb449..b01562cadf055a 100644 --- a/data_model/clusters/MediaPlayback.xml +++ b/data_model/clusters/MediaPlayback.xml @@ -1,59 +1,59 @@ - @@ -67,12 +67,6 @@ Davis, CA 95616, USA - - - - - - @@ -124,86 +118,6 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -258,38 +172,6 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -352,7 +234,7 @@ Davis, CA 95616, USA - + @@ -363,7 +245,7 @@ Davis, CA 95616, USA - + @@ -372,88 +254,5 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml index 71e522a92a959d..a976e7d260f0ff 100644 --- a/data_model/clusters/Messages.xml +++ b/data_model/clusters/Messages.xml @@ -96,7 +96,7 @@ Davis, CA 95616, USA - + @@ -179,14 +179,12 @@ Davis, CA 95616, USA - - @@ -195,106 +193,73 @@ Davis, CA 95616, USA - + - + - + - + - + - + - - + + + - + + - - + + + - + - + + + - + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml index 3f127cebd90367..dd60600c792beb 100644 --- a/data_model/clusters/MicrowaveOvenControl.xml +++ b/data_model/clusters/MicrowaveOvenControl.xml @@ -55,43 +55,82 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + + + + + + + + - + - + - + + + + + + + + + - - + + + + - - - - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + @@ -102,21 +141,32 @@ Davis, CA 95616, USA - + - + - + + + + + + + + + + + + - + diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml index 258708ba96908b..179a6ade6ab7fc 100644 --- a/data_model/clusters/ModeBase.xml +++ b/data_model/clusters/ModeBase.xml @@ -58,7 +58,8 @@ Davis, CA 95616, USA - + @@ -83,10 +84,11 @@ Davis, CA 95616, USA - + + - + @@ -102,17 +104,18 @@ Davis, CA 95616, USA - + - + - + + - + @@ -136,7 +139,13 @@ Davis, CA 95616, USA - + + + + + + + @@ -144,7 +153,7 @@ Davis, CA 95616, USA - + @@ -166,11 +175,5 @@ Davis, CA 95616, USA - - - - - - \ No newline at end of file diff --git a/data_model/clusters/Mode_LaundryWasher.xml b/data_model/clusters/Mode_LaundryWasher.xml new file mode 100644 index 00000000000000..e89778fa9ea579 --- /dev/null +++ b/data_model/clusters/Mode_LaundryWasher.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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/Mode_RVCRun.xml b/data_model/clusters/Mode_RVCRun.xml index f1b8b58c69e068..7ea4183603482c 100644 --- a/data_model/clusters/Mode_RVCRun.xml +++ b/data_model/clusters/Mode_RVCRun.xml @@ -75,5 +75,4 @@ Davis, CA 95616, USA - \ No newline at end of file diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml index 9f516bbfbb2e7b..0153146c149d26 100644 --- a/data_model/clusters/NetworkCommissioningCluster.xml +++ b/data_model/clusters/NetworkCommissioningCluster.xml @@ -160,18 +160,18 @@ 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..e43eeaa615ba9a 100644 --- a/data_model/clusters/NetworkIdentityManagement.xml +++ b/data_model/clusters/NetworkIdentityManagement.xml @@ -62,45 +62,54 @@ Davis, CA 95616, USA + + + + + + + + + + + + + - + - - - - - - - - - + + + - + - + - + - + - + + + - + @@ -110,22 +119,10 @@ Davis, CA 95616, USA - + - - - - - - - - - - - - - + @@ -133,16 +130,35 @@ Davis, CA 95616, USA - + - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/OTAProvider.xml b/data_model/clusters/OTAProvider.xml new file mode 100644 index 00000000000000..73157662cd6f6e --- /dev/null +++ b/data_model/clusters/OTAProvider.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/OTARequestor.xml b/data_model/clusters/OTARequestor.xml new file mode 100644 index 00000000000000..3871797b3211a7 --- /dev/null +++ b/data_model/clusters/OTARequestor.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/clusters/OnOff.xml b/data_model/clusters/OnOff.xml index bde1c4104ee5e6..0d64837ea57fbb 100644 --- a/data_model/clusters/OnOff.xml +++ b/data_model/clusters/OnOff.xml @@ -93,26 +93,26 @@ Davis, CA 95616, USA - + - + - + - + - + - + diff --git a/data_model/clusters/OperationalCredentialCluster.xml b/data_model/clusters/OperationalCredentialCluster.xml index a5d25d07d57ecc..ec523ba33671d1 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 - + - + @@ -133,30 +133,32 @@ Davis, CA 95616, USA + - + - + + - - + + - - + + @@ -173,7 +175,7 @@ Davis, CA 95616, USA - + @@ -187,7 +189,7 @@ Davis, CA 95616, USA - + @@ -195,11 +197,11 @@ Davis, CA 95616, USA - + - + - + @@ -215,7 +217,7 @@ Davis, CA 95616, USA - + @@ -223,7 +225,7 @@ Davis, CA 95616, USA - + @@ -234,11 +236,11 @@ Davis, CA 95616, USA - + - + - + @@ -246,33 +248,33 @@ Davis, CA 95616, USA - + - + - + - + - + - + - + @@ -300,7 +302,7 @@ Davis, CA 95616, USA - + @@ -308,10 +310,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/OperationalState.xml b/data_model/clusters/OperationalState.xml index 5e969ff0793b5a..97fae41a3aa2ad 100644 --- a/data_model/clusters/OperationalState.xml +++ b/data_model/clusters/OperationalState.xml @@ -55,9 +55,10 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + + @@ -85,26 +86,21 @@ Davis, CA 95616, USA - - - - - @@ -131,7 +127,8 @@ Davis, CA 95616, USA - + + @@ -146,56 +143,6 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data_model/clusters/OperationalState_Oven.xml b/data_model/clusters/OperationalState_Oven.xml index 785b72498b326d..947e93f8ec2348 100644 --- a/data_model/clusters/OperationalState_Oven.xml +++ b/data_model/clusters/OperationalState_Oven.xml @@ -60,23 +60,4 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/OperationalState_RVC.xml b/data_model/clusters/OperationalState_RVC.xml index 3a2fa80b2857e2..24166eb9fcd8dd 100644 --- a/data_model/clusters/OperationalState_RVC.xml +++ b/data_model/clusters/OperationalState_RVC.xml @@ -55,46 +55,47 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data_model/clusters/PowerSourceCluster.xml b/data_model/clusters/PowerSourceCluster.xml index 27caade3c634a3..16d6f0ac98cad5 100644 --- a/data_model/clusters/PowerSourceCluster.xml +++ b/data_model/clusters/PowerSourceCluster.xml @@ -55,10 +55,11 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + @@ -673,20 +674,22 @@ Davis, CA 95616, USA - + + + - + - + @@ -694,21 +697,21 @@ Davis, CA 95616, USA - + - + - + @@ -727,11 +730,13 @@ Davis, CA 95616, USA - + + + @@ -790,41 +795,42 @@ Davis, CA 95616, USA - + - + - + - + - + + - + - + @@ -896,7 +902,7 @@ Davis, CA 95616, USA - + @@ -951,11 +957,11 @@ Davis, CA 95616, USA - + - + @@ -965,11 +971,11 @@ Davis, CA 95616, USA - + - + @@ -979,11 +985,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/RefrigeratorAlarm.xml b/data_model/clusters/RefrigeratorAlarm.xml index 5c2ea3c6853c20..c987c3860a4f52 100644 --- a/data_model/clusters/RefrigeratorAlarm.xml +++ b/data_model/clusters/RefrigeratorAlarm.xml @@ -66,13 +66,12 @@ Davis, CA 95616, USA - + - diff --git a/data_model/clusters/ResourceMonitoring.xml b/data_model/clusters/ResourceMonitoring.xml index e5a178a5700f8c..d79c9a543f0a20 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 --> - + + + + @@ -97,13 +100,13 @@ 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..f82a470ca28eb5 100644 --- a/data_model/clusters/Scenes.xml +++ b/data_model/clusters/Scenes.xml @@ -61,7 +61,7 @@ Davis, CA 95616, USA - + @@ -137,7 +137,8 @@ Davis, CA 95616, USA - + + @@ -159,7 +160,8 @@ Davis, CA 95616, USA - + + @@ -191,6 +193,7 @@ Davis, CA 95616, USA + @@ -244,8 +247,9 @@ Davis, CA 95616, USA - - + + + @@ -270,7 +274,8 @@ Davis, CA 95616, USA - + + @@ -318,7 +323,9 @@ Davis, CA 95616, USA - + + + @@ -443,7 +450,8 @@ Davis, CA 95616, USA - + + @@ -479,7 +487,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 d93a7de1fc011c..343f1427176e41 100644 --- a/data_model/clusters/TargetNavigator.xml +++ b/data_model/clusters/TargetNavigator.xml @@ -1,59 +1,59 @@ - @@ -83,7 +83,8 @@ Davis, CA 95616, USA - + + @@ -115,21 +116,4 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data_model/clusters/Thermostat.xml b/data_model/clusters/Thermostat.xml index 704d3a21a1df9a..8a09ea37e8948c 100644 --- a/data_model/clusters/Thermostat.xml +++ b/data_model/clusters/Thermostat.xml @@ -174,51 +174,7 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -229,7 +185,7 @@ Davis, CA 95616, USA - + @@ -256,7 +212,43 @@ Davis, CA 95616, USA - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -280,12 +272,12 @@ Davis, CA 95616, USA - + - + @@ -295,6 +287,14 @@ Davis, CA 95616, USA + + + + + + + + @@ -323,57 +323,22 @@ Davis, CA 95616, USA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - + - + @@ -417,7 +382,41 @@ Davis, CA 95616, USA - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -445,7 +444,7 @@ Davis, CA 95616, USA - + @@ -472,7 +471,7 @@ Davis, CA 95616, USA - + @@ -621,37 +620,37 @@ Davis, CA 95616, USA - + - + - + - + - + - + - + @@ -673,7 +672,7 @@ Davis, CA 95616, USA - + @@ -767,7 +766,7 @@ Davis, CA 95616, USA - + @@ -821,7 +820,7 @@ Davis, CA 95616, USA - + @@ -843,17 +842,18 @@ Davis, CA 95616, USA - + - + - + + - + @@ -890,11 +890,11 @@ 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 4515d44012085e..096e0ff2798261 100644 --- a/data_model/clusters/TimeSync.xml +++ b/data_model/clusters/TimeSync.xml @@ -95,6 +95,7 @@ Davis, CA 95616, USA + @@ -111,19 +112,19 @@ Davis, CA 95616, USA - + - + - + - + @@ -132,22 +133,22 @@ Davis, CA 95616, USA - + - + - + - + - + @@ -177,9 +178,9 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/clusters/ValveConfigurationControl.xml b/data_model/clusters/ValveConfigurationControl.xml index 74ed2f4df40597..2d1554df10df59 100644 --- a/data_model/clusters/ValveConfigurationControl.xml +++ b/data_model/clusters/ValveConfigurationControl.xml @@ -61,19 +61,21 @@ Davis, CA 95616, USA - - - + + - + - + + + + @@ -87,42 +89,52 @@ Davis, CA 95616, USA + + + + + + + + + - + + + + + + + - + - + - + - + - + - + - + - - - - - @@ -137,9 +149,9 @@ Davis, CA 95616, USA - - - + + + @@ -155,27 +167,21 @@ Davis, CA 95616, USA + + + + + + + - - - - - - - - - - - - - @@ -184,6 +190,11 @@ Davis, CA 95616, USA + + + + + diff --git a/data_model/clusters/WaterContentMeasurement.xml b/data_model/clusters/WaterContentMeasurement.xml index 8b1ff6a9a049bc..d2e29bca2aac53 100644 --- a/data_model/clusters/WaterContentMeasurement.xml +++ b/data_model/clusters/WaterContentMeasurement.xml @@ -55,7 +55,7 @@ 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..073da0094b0b4b 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..5c4bd86b9ab7e4 100644 --- a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml +++ b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml @@ -59,7 +59,7 @@ Davis, CA 95616, USA - + @@ -93,22 +93,22 @@ Davis, CA 95616, USA - + - + - + - + - + - + @@ -129,9 +129,6 @@ 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..602781819d1696 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..9997b276a6af5e 100644 --- a/data_model/device_types/CastingVideoPlayer.xml +++ b/data_model/device_types/CastingVideoPlayer.xml @@ -94,23 +94,23 @@ 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..889f63db0de1f5 100644 --- a/data_model/device_types/ColorTemperatureLight.xml +++ b/data_model/device_types/ColorTemperatureLight.xml @@ -55,11 +55,12 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + @@ -131,6 +132,12 @@ Davis, CA 95616, USA + + + + + + @@ -144,5 +151,8 @@ Davis, CA 95616, USA + + + \ No newline at end of file diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml index 8f927c48f44a35..a6eb1a4ca0d424 100644 --- a/data_model/device_types/ContentApp.xml +++ b/data_model/device_types/ContentApp.xml @@ -75,21 +75,21 @@ Davis, CA 95616, USA - + - + - + - + - + diff --git a/data_model/device_types/Cooktop.xml b/data_model/device_types/Cooktop.xml index 8288f38c8a87ba..ea94653008d25a 100644 --- a/data_model/device_types/Cooktop.xml +++ b/data_model/device_types/Cooktop.xml @@ -73,8 +73,5 @@ Davis, CA 95616, USA - - - \ No newline at end of file diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml index c262abf3741d7e..012f752c7cc699 100644 --- a/data_model/device_types/DimmablePlug-InUnit.xml +++ b/data_model/device_types/DimmablePlug-InUnit.xml @@ -55,12 +55,12 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + - + @@ -138,5 +138,8 @@ Davis, CA 95616, USA + + + \ No newline at end of file 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..b322f991c3b6e4 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 - + @@ -98,7 +98,7 @@ Davis, CA 95616, USA - + @@ -107,12 +107,12 @@ Davis, CA 95616, USA - + - + @@ -125,7 +125,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..d0ad7936d3629d 100644 --- a/data_model/device_types/ExtendedColorLight.xml +++ b/data_model/device_types/ExtendedColorLight.xml @@ -55,11 +55,12 @@ Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA --> - + + @@ -131,6 +132,12 @@ Davis, CA 95616, USA + + + + + + @@ -156,5 +163,8 @@ Davis, CA 95616, USA + + + \ No newline at end of file diff --git a/data_model/device_types/ExtractorHood.xml b/data_model/device_types/ExtractorHood.xml index 5fdbc7c84a1583..9f86280510fedc 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 --> - + @@ -80,7 +80,7 @@ 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..78f9383800ad8c 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,10 +73,10 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/LaundryWasher.xml b/data_model/device_types/LaundryWasher.xml index 07cd62a605fc9c..f0f48212b8d062 100644 --- a/data_model/device_types/LaundryWasher.xml +++ b/data_model/device_types/LaundryWasher.xml @@ -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..933e1f896da484 100644 --- a/data_model/device_types/MicrowaveOven.xml +++ b/data_model/device_types/MicrowaveOven.xml @@ -65,25 +65,27 @@ Davis, CA 95616, USA - + - + + + + + + - - - - + diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml index 1847119e49426c..11bd17151d5e49 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/RainSensor.xml b/data_model/device_types/RainSensor.xml new file mode 100644 index 00000000000000..473de6e31d1598 --- /dev/null +++ b/data_model/device_types/RainSensor.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml index f4792a2e1f5a96..e1a9276a97fbd8 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 - + - + - + - + @@ -125,7 +125,7 @@ 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/TemperatureControlledCabinet.xml b/data_model/device_types/TemperatureControlledCabinet.xml index 93c09339a65a75..090931ace14f61 100644 --- a/data_model/device_types/TemperatureControlledCabinet.xml +++ b/data_model/device_types/TemperatureControlledCabinet.xml @@ -55,9 +55,10 @@ Connectivity Standards Alliance + 508 Second Street, Suite 206 + Davis, CA 95616, USA --> - + + diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml index ebc43e7dbf7203..117bf36aa8b025 100644 --- a/data_model/device_types/Thermostat.xml +++ b/data_model/device_types/Thermostat.xml @@ -83,7 +83,7 @@ Davis, CA 95616, USA - + @@ -100,13 +100,13 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/device_types/ThreePhasePowerSource.xml b/data_model/device_types/ThreePhasePowerSource.xml index 3a3d5a018223b4..726af1a16c10a4 100644 --- a/data_model/device_types/ThreePhasePowerSource.xml +++ b/data_model/device_types/ThreePhasePowerSource.xml @@ -61,10 +61,10 @@ Davis, CA 95616, USA - + - + @@ -72,6 +72,11 @@ Davis, CA 95616, USA + + + + + \ No newline at end of file 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/WaterFreezeDetector.xml b/data_model/device_types/WaterFreezeDetector.xml new file mode 100644 index 00000000000000..f3c5f0580af21f --- /dev/null +++ b/data_model/device_types/WaterFreezeDetector.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WaterLeakDetector.xml b/data_model/device_types/WaterLeakDetector.xml index 596a9cebb2ac04..0518d148910c78 100644 --- a/data_model/device_types/WaterLeakDetector.xml +++ b/data_model/device_types/WaterLeakDetector.xml @@ -59,7 +59,7 @@ Davis, CA 95616, USA - + @@ -73,8 +73,8 @@ Davis, CA 95616, USA - - + + \ No newline at end of file diff --git a/data_model/device_types/WaterValve.xml b/data_model/device_types/WaterValve.xml new file mode 100644 index 00000000000000..59a065243923f2 --- /dev/null +++ b/data_model/device_types/WaterValve.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data_model/device_types/WindowCovering.xml b/data_model/device_types/WindowCovering.xml index 83f03a2a04e5ed..aecac7e3b24052 100644 --- a/data_model/device_types/WindowCovering.xml +++ b/data_model/device_types/WindowCovering.xml @@ -87,7 +87,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/device_types/WindowCoveringController.xml b/data_model/device_types/WindowCoveringController.xml index c79d5a2279f6a8..f61f46f5132b4b 100644 --- a/data_model/device_types/WindowCoveringController.xml +++ b/data_model/device_types/WindowCoveringController.xml @@ -90,7 +90,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/scraper_version b/data_model/scraper_version index 26aaba0e86632e..0495c4a88caed0 100644 --- a/data_model/scraper_version +++ b/data_model/scraper_version @@ -1 +1 @@ -1.2.0 +1.2.3 diff --git a/data_model/spec_sha b/data_model/spec_sha index bc073c1d35bf52..6ef2b40b40b6be 100644 --- a/data_model/spec_sha +++ b/data_model/spec_sha @@ -1 +1 @@ -0267d8197ec5c00d0220fdef7950750b63e08c1f +1736656c4cb1b4f752dcd5b4c8b924b142ff29d4