diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Area.xml b/data_model/1.4.1/namespaces/Namespace-Common-Area.xml new file mode 100644 index 00000000000000..db1f9a69627a0b --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Area.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + Also known as Restroom + + + + + A small room typically used for storage + + + + + + + + + + + + + A small, comfortable room for individual activities such as work or hobbies + + + + + + + + A bathroom directly accessible from a bedroom + + + + + + + + + + + + + + Also known as Guest Restroom + + + + + + + A cozy room containing a fireplace or other point heat source + + + + + + + + + + + + A space used to remove soiled garments prior to entering the domicile proper + + + + + + + + AKA a larder, a place where food is stored + + + + + + + + + + + + + + + + A utility space for cleaning dishes and laundry + + + + + + + + An informal space meant to be 'cozy', 'snug', relaxed, meant to share with family or friends + + + + + + + + + + + + A room dedicated to a toilet; a water closet / WC + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Closure.xml b/data_model/1.4.1/namespaces/Namespace-Common-Closure.xml new file mode 100644 index 00000000000000..6cc806308e300b --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Closure.xml @@ -0,0 +1,72 @@ + + + + + + Move toward open position + + + Move toward closed position + + + Stop any movement + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-CompassDirection.xml b/data_model/1.4.1/namespaces/Namespace-Common-CompassDirection.xml new file mode 100644 index 00000000000000..7366ae2da3cc7d --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-CompassDirection.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-CompassLocation.xml b/data_model/1.4.1/namespaces/Namespace-Common-CompassLocation.xml new file mode 100644 index 00000000000000..8623edf70ea09a --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-CompassLocation.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Direction.xml b/data_model/1.4.1/namespaces/Namespace-Common-Direction.xml new file mode 100644 index 00000000000000..8d888f32a1faaf --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Direction.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Landmark.xml b/data_model/1.4.1/namespaces/Namespace-Common-Landmark.xml new file mode 100644 index 00000000000000..c81c7e35bdd737 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Landmark.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Level.xml b/data_model/1.4.1/namespaces/Namespace-Common-Level.xml new file mode 100644 index 00000000000000..fb709116e8a788 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Level.xml @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Location.xml b/data_model/1.4.1/namespaces/Namespace-Common-Location.xml new file mode 100644 index 00000000000000..fce22bcb5126d8 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Location.xml @@ -0,0 +1,75 @@ + + + + + + Element is indoors or related to indoor equipment/conditions (e.g. the "indoor" temperature). + + + Element is outdoors or related to outdoor equipment/conditions (e.g. the "outdoor" temperature). + + + Element is located inside the equipment (e.g. a sensor "inside" a cabinet). + + + Element is located outside the equipment (e.g. a sensor "outside" a cabinet) + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-Number.xml b/data_model/1.4.1/namespaces/Namespace-Common-Number.xml new file mode 100644 index 00000000000000..53917dcb9cc42f --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-Number.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Common-RelativePosition.xml b/data_model/1.4.1/namespaces/Namespace-Common-RelativePosition.xml new file mode 100644 index 00000000000000..239229197b71a0 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Common-RelativePosition.xml @@ -0,0 +1,74 @@ + + + + + + + Area in proximity to the point of reference + + + The area surrounding the point the reference + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-ElectricalMeasurement.xml b/data_model/1.4.1/namespaces/Namespace-ElectricalMeasurement.xml new file mode 100644 index 00000000000000..84f8a192d8b485 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-ElectricalMeasurement.xml @@ -0,0 +1,78 @@ + + + + + + Indicates values measured for a DC load + + + Indicates values measured for a single-phase AC load, or values measured for the collective load on a polyphase AC power supply + + + Indicates values measured for an AC load on phase 1 of a polyphase power supply + + + Indicates values measured for an AC load on phase 2 of a polyphase power supply + + + Indicates values measured for an AC load on phase 3 of a polyphase power supply + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Laundry.xml b/data_model/1.4.1/namespaces/Namespace-Laundry.xml new file mode 100644 index 00000000000000..5922e66b6b1d4d --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Laundry.xml @@ -0,0 +1,67 @@ + + + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-PowerSource.xml b/data_model/1.4.1/namespaces/Namespace-PowerSource.xml new file mode 100644 index 00000000000000..37523a1a8b0bda --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-PowerSource.xml @@ -0,0 +1,78 @@ + + + + + + The Power Source cluster is related to power provided from an unknown source + + + The Power Source cluster is related to power provided from the electrical grid + + + The Power Source cluster is related to power provided from a solar panel array + + + The Power Source cluster is related to power provided from a battery + + + The Power Source cluster is related to power provided from an electric vehicle + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Refrigerator.xml b/data_model/1.4.1/namespaces/Namespace-Refrigerator.xml new file mode 100644 index 00000000000000..d823a0016cc4e7 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Refrigerator.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-RoomAirConditioner.xml b/data_model/1.4.1/namespaces/Namespace-RoomAirConditioner.xml new file mode 100644 index 00000000000000..9697586acf19f5 --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-RoomAirConditioner.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/1.4.1/namespaces/Namespace-Switches.xml b/data_model/1.4.1/namespaces/Namespace-Switches.xml new file mode 100644 index 00000000000000..2f1fffa1f78e7f --- /dev/null +++ b/data_model/1.4.1/namespaces/Namespace-Switches.xml @@ -0,0 +1,82 @@ + + + + + + + + + e.g. dim up (light) + + + e.g. dim down (light) + + + e.g. select next scene + + + e.g. select previous scene + + + + Textual description provided in Label field + + + diff --git a/data_model/1.4.1/scraper_version b/data_model/1.4.1/scraper_version index 03d9cee03ac4d6..797198e1799862 100644 --- a/data_model/1.4.1/scraper_version +++ b/data_model/1.4.1/scraper_version @@ -1 +1 @@ -alchemy version: 1.5.2 (4717a32) +alchemy version: 1.5.4 (404bf4f) diff --git a/data_model/1.4/clusters/ACL-Cluster.xml b/data_model/1.4/clusters/ACL-Cluster.xml index 4f397f5c6acdf4..730be018f3cf4d 100644 --- a/data_model/1.4/clusters/ACL-Cluster.xml +++ b/data_model/1.4/clusters/ACL-Cluster.xml @@ -143,8 +143,10 @@ Davis, CA 95616, USA - - + + + + @@ -152,8 +154,10 @@ Davis, CA 95616, USA - - + + + + @@ -162,7 +166,9 @@ Davis, CA 95616, USA - + + + @@ -193,7 +199,9 @@ Davis, CA 95616, USA - + + + @@ -216,7 +224,9 @@ Davis, CA 95616, USA - + + + @@ -225,7 +235,9 @@ Davis, CA 95616, USA - + + + @@ -233,25 +245,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -260,7 +280,9 @@ Davis, CA 95616, USA - + + + @@ -268,7 +290,9 @@ Davis, CA 95616, USA - + + + @@ -280,7 +304,9 @@ Davis, CA 95616, USA - + + + @@ -299,12 +325,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -322,12 +352,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -347,11 +381,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/AccountLogin.xml b/data_model/1.4/clusters/AccountLogin.xml index f409545b146c40..370c4d621c24d2 100644 --- a/data_model/1.4/clusters/AccountLogin.xml +++ b/data_model/1.4/clusters/AccountLogin.xml @@ -72,7 +72,12 @@ Davis, CA 95616, USA - + + + + + + @@ -80,7 +85,9 @@ Davis, CA 95616, USA - + + + @@ -88,11 +95,18 @@ Davis, CA 95616, USA - + + + + + + - + + + diff --git a/data_model/1.4/clusters/AdminCommissioningCluster.xml b/data_model/1.4/clusters/AdminCommissioningCluster.xml index ff34a2133da4f9..6a2f84956cfc80 100644 --- a/data_model/1.4/clusters/AdminCommissioningCluster.xml +++ b/data_model/1.4/clusters/AdminCommissioningCluster.xml @@ -118,22 +118,39 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + + + + - + + + + + + @@ -143,7 +160,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/AirQuality.xml b/data_model/1.4/clusters/AirQuality.xml index b2b3b7ee539d36..62a0842d15e027 100644 --- a/data_model/1.4/clusters/AirQuality.xml +++ b/data_model/1.4/clusters/AirQuality.xml @@ -116,7 +116,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ApplicationBasic.xml b/data_model/1.4/clusters/ApplicationBasic.xml index 5e5f2ad364746f..00eb9493bc46bc 100644 --- a/data_model/1.4/clusters/ApplicationBasic.xml +++ b/data_model/1.4/clusters/ApplicationBasic.xml @@ -94,7 +94,9 @@ Davis, CA 95616, USA - + + + @@ -105,7 +107,9 @@ Davis, CA 95616, USA - + + + @@ -116,18 +120,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/ApplicationLauncher.xml b/data_model/1.4/clusters/ApplicationLauncher.xml index 553328ddf7944f..2fc3ea8b62fec7 100644 --- a/data_model/1.4/clusters/ApplicationLauncher.xml +++ b/data_model/1.4/clusters/ApplicationLauncher.xml @@ -122,7 +122,9 @@ Davis, CA 95616, USA - + + + @@ -133,7 +135,9 @@ Davis, CA 95616, USA - + + + @@ -146,7 +150,9 @@ Davis, CA 95616, USA - + + + @@ -156,7 +162,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/AudioOutput.xml b/data_model/1.4/clusters/AudioOutput.xml index c2ccff03872d26..f5a6ddaf9021ef 100644 --- a/data_model/1.4/clusters/AudioOutput.xml +++ b/data_model/1.4/clusters/AudioOutput.xml @@ -97,7 +97,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/BallastConfiguration.xml b/data_model/1.4/clusters/BallastConfiguration.xml index 3b679b4a7de37b..d7b8ff210e2738 100644 --- a/data_model/1.4/clusters/BallastConfiguration.xml +++ b/data_model/1.4/clusters/BallastConfiguration.xml @@ -89,33 +89,47 @@ Davis, CA 95616, USA - + + + + + + - + + + + + + - + - - - + + + + + - + - - - + + + + + @@ -133,7 +147,12 @@ Davis, CA 95616, USA - + + + + + + @@ -142,12 +161,16 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/BasicInformationCluster.xml b/data_model/1.4/clusters/BasicInformationCluster.xml index 7c353543604a71..68daa48f5787b7 100644 --- a/data_model/1.4/clusters/BasicInformationCluster.xml +++ b/data_model/1.4/clusters/BasicInformationCluster.xml @@ -157,11 +157,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -179,13 +183,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -196,7 +204,9 @@ Davis, CA 95616, USA - + + + @@ -207,13 +217,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -224,49 +238,74 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + + + + - + + + + + + - + + + - + + + - + + + - + + + @@ -281,7 +320,9 @@ Davis, CA 95616, USA - + + + @@ -297,13 +338,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -323,7 +368,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Binding-Cluster.xml b/data_model/1.4/clusters/Binding-Cluster.xml index a6856c548db700..52717cfb055e58 100644 --- a/data_model/1.4/clusters/Binding-Cluster.xml +++ b/data_model/1.4/clusters/Binding-Cluster.xml @@ -78,7 +78,9 @@ Davis, CA 95616, USA - + + + @@ -99,7 +101,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/BooleanStateConfiguration.xml b/data_model/1.4/clusters/BooleanStateConfiguration.xml index 7be27159baec96..6ba5d22f57edc2 100644 --- a/data_model/1.4/clusters/BooleanStateConfiguration.xml +++ b/data_model/1.4/clusters/BooleanStateConfiguration.xml @@ -110,7 +110,9 @@ Davis, CA 95616, USA - + + + @@ -118,7 +120,12 @@ Davis, CA 95616, USA - + + + + + + @@ -126,7 +133,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Channel.xml b/data_model/1.4/clusters/Channel.xml index 22820d49e15f29..2106b4da0dc751 100644 --- a/data_model/1.4/clusters/Channel.xml +++ b/data_model/1.4/clusters/Channel.xml @@ -167,7 +167,9 @@ Davis, CA 95616, USA - + + + @@ -176,37 +178,51 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -219,47 +235,69 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -273,27 +311,37 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -311,13 +359,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -342,7 +394,9 @@ Davis, CA 95616, USA - + + + @@ -379,7 +433,9 @@ Davis, CA 95616, USA - + + + @@ -392,11 +448,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -421,7 +481,9 @@ Davis, CA 95616, USA - + + + @@ -429,11 +491,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -446,7 +512,9 @@ Davis, CA 95616, USA - + + + @@ -454,11 +522,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ColorControl.xml b/data_model/1.4/clusters/ColorControl.xml index c0a9f9c175ed5e..f284f5a33156f4 100644 --- a/data_model/1.4/clusters/ColorControl.xml +++ b/data_model/1.4/clusters/ColorControl.xml @@ -247,7 +247,9 @@ Davis, CA 95616, USA - + + + @@ -255,13 +257,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -269,7 +275,9 @@ Davis, CA 95616, USA - + + + @@ -277,7 +285,9 @@ Davis, CA 95616, USA - + + + @@ -286,7 +296,9 @@ Davis, CA 95616, USA - + + + @@ -294,7 +306,9 @@ Davis, CA 95616, USA - + + + @@ -304,13 +318,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -324,7 +342,9 @@ Davis, CA 95616, USA - + + + @@ -338,7 +358,9 @@ Davis, CA 95616, USA - + + + @@ -365,7 +387,9 @@ Davis, CA 95616, USA - + + + @@ -379,7 +403,9 @@ Davis, CA 95616, USA - + + + @@ -406,7 +432,9 @@ Davis, CA 95616, USA - + + + @@ -420,7 +448,9 @@ Davis, CA 95616, USA - + + + @@ -447,7 +477,9 @@ Davis, CA 95616, USA - + + + @@ -461,7 +493,9 @@ Davis, CA 95616, USA - + + + @@ -488,7 +522,9 @@ Davis, CA 95616, USA - + + + @@ -502,7 +538,9 @@ Davis, CA 95616, USA - + + + @@ -529,7 +567,9 @@ Davis, CA 95616, USA - + + + @@ -543,7 +583,9 @@ Davis, CA 95616, USA - + + + @@ -561,22 +603,30 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -586,12 +636,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -601,12 +655,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -631,7 +689,9 @@ Davis, CA 95616, USA - + + + @@ -639,7 +699,9 @@ Davis, CA 95616, USA - + + + @@ -663,21 +725,30 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + @@ -687,9 +758,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -701,7 +774,12 @@ Davis, CA 95616, USA - + + + + + + @@ -712,22 +790,30 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -743,11 +829,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -766,11 +856,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -780,19 +874,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -808,11 +910,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -831,11 +937,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -845,23 +955,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -871,23 +991,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -903,11 +1033,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -923,15 +1057,21 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -941,19 +1081,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -969,15 +1117,21 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -987,18 +1141,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1008,22 +1168,30 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -1036,19 +1204,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -1073,11 +1249,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -1091,11 +1271,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -1111,19 +1295,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -1139,23 +1331,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/CommissionerControlCluster.xml b/data_model/1.4/clusters/CommissionerControlCluster.xml index 942925a3481e9e..21609b36c1737a 100644 --- a/data_model/1.4/clusters/CommissionerControlCluster.xml +++ b/data_model/1.4/clusters/CommissionerControlCluster.xml @@ -93,7 +93,9 @@ Davis, CA 95616, USA - + + + @@ -104,29 +106,48 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + - + + + + + + - + + + + + + @@ -142,7 +163,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ConcentrationMeasurement.xml b/data_model/1.4/clusters/ConcentrationMeasurement.xml index ea6bc5461bd189..4a699cce0b7a27 100644 --- a/data_model/1.4/clusters/ConcentrationMeasurement.xml +++ b/data_model/1.4/clusters/ConcentrationMeasurement.xml @@ -187,9 +187,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -205,8 +207,10 @@ Davis, CA 95616, USA - - + + + + @@ -215,9 +219,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -226,7 +232,9 @@ Davis, CA 95616, USA - + + + @@ -234,9 +242,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -245,14 +255,18 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ContentAppObserver.xml b/data_model/1.4/clusters/ContentAppObserver.xml index f508049717eac2..18869d47740b71 100644 --- a/data_model/1.4/clusters/ContentAppObserver.xml +++ b/data_model/1.4/clusters/ContentAppObserver.xml @@ -81,11 +81,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -95,11 +99,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ContentControl.xml b/data_model/1.4/clusters/ContentControl.xml index dedc6176c0c100..2829734206adbf 100644 --- a/data_model/1.4/clusters/ContentControl.xml +++ b/data_model/1.4/clusters/ContentControl.xml @@ -175,29 +175,53 @@ Davis, CA 95616, USA - + + + - + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + @@ -207,12 +231,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -233,7 +261,9 @@ Davis, CA 95616, USA - + + + @@ -247,21 +277,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -289,7 +325,9 @@ Davis, CA 95616, USA - + + + @@ -300,11 +338,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -319,7 +361,9 @@ Davis, CA 95616, USA - + + + @@ -337,11 +381,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -351,7 +399,9 @@ Davis, CA 95616, USA - + + + @@ -373,7 +423,9 @@ Davis, CA 95616, USA - + + + @@ -383,7 +435,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ContentLauncher.xml b/data_model/1.4/clusters/ContentLauncher.xml index 83d6015fbb99cb..de973bf559aa7c 100644 --- a/data_model/1.4/clusters/ContentLauncher.xml +++ b/data_model/1.4/clusters/ContentLauncher.xml @@ -177,17 +177,23 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -228,7 +234,9 @@ Davis, CA 95616, USA - + + + @@ -259,12 +267,18 @@ Davis, CA 95616, USA - + + + - - + + + + + + @@ -273,7 +287,9 @@ Davis, CA 95616, USA - + + + @@ -291,14 +307,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -316,11 +336,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -330,7 +354,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Descriptor-Cluster.xml b/data_model/1.4/clusters/Descriptor-Cluster.xml index 2278e89f8933b9..782bf997e79463 100644 --- a/data_model/1.4/clusters/Descriptor-Cluster.xml +++ b/data_model/1.4/clusters/Descriptor-Cluster.xml @@ -76,7 +76,9 @@ Davis, CA 95616, USA - + + + @@ -86,7 +88,9 @@ Davis, CA 95616, USA - + + + @@ -112,7 +116,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/DeviceEnergyManagement.xml b/data_model/1.4/clusters/DeviceEnergyManagement.xml index 89b5cd7fdbd698..dfd44de70fb576 100644 --- a/data_model/1.4/clusters/DeviceEnergyManagement.xml +++ b/data_model/1.4/clusters/DeviceEnergyManagement.xml @@ -257,17 +257,23 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -292,7 +298,9 @@ Davis, CA 95616, USA - + + + @@ -326,7 +334,9 @@ Davis, CA 95616, USA - + + + @@ -337,7 +347,9 @@ Davis, CA 95616, USA - + + + @@ -349,30 +361,44 @@ Davis, CA 95616, USA - + + + + + - + + + + + - + + + - + + + - + + + @@ -434,7 +460,9 @@ Davis, CA 95616, USA - + + + @@ -465,7 +493,8 @@ Davis, CA 95616, USA - + + @@ -478,7 +507,9 @@ Davis, CA 95616, USA - + + + @@ -487,8 +518,10 @@ Davis, CA 95616, USA - - + + + + @@ -519,7 +552,9 @@ Davis, CA 95616, USA - + + + @@ -530,15 +565,21 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -554,7 +595,9 @@ Davis, CA 95616, USA - + + + @@ -567,7 +610,9 @@ Davis, CA 95616, USA - + + + @@ -590,7 +635,9 @@ Davis, CA 95616, USA - + + + @@ -604,7 +651,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/DiagnosticLogsCluster.xml b/data_model/1.4/clusters/DiagnosticLogsCluster.xml index 5adee11fd0310c..af7becd66e8d19 100644 --- a/data_model/1.4/clusters/DiagnosticLogsCluster.xml +++ b/data_model/1.4/clusters/DiagnosticLogsCluster.xml @@ -115,7 +115,9 @@ Davis, CA 95616, USA - + + + @@ -125,7 +127,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/DiagnosticsGeneral.xml b/data_model/1.4/clusters/DiagnosticsGeneral.xml index 9f2a48159c7e0b..f2c39ceb4243a8 100644 --- a/data_model/1.4/clusters/DiagnosticsGeneral.xml +++ b/data_model/1.4/clusters/DiagnosticsGeneral.xml @@ -185,7 +185,9 @@ Davis, CA 95616, USA - + + + @@ -200,18 +202,26 @@ Davis, CA 95616, USA - - + + + + + + - + + + - + + + @@ -223,7 +233,9 @@ Davis, CA 95616, USA - + + + @@ -248,19 +260,25 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -276,7 +294,9 @@ Davis, CA 95616, USA - + + + @@ -303,14 +323,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -319,7 +343,9 @@ Davis, CA 95616, USA - + + + @@ -330,12 +356,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -344,12 +374,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -358,12 +392,16 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/DiagnosticsSoftware.xml b/data_model/1.4/clusters/DiagnosticsSoftware.xml index 77f60ccfb7fcb9..6d5958bf1b798b 100644 --- a/data_model/1.4/clusters/DiagnosticsSoftware.xml +++ b/data_model/1.4/clusters/DiagnosticsSoftware.xml @@ -79,7 +79,9 @@ Davis, CA 95616, USA - + + + @@ -97,7 +99,9 @@ Davis, CA 95616, USA - + + + @@ -131,11 +135,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/DiagnosticsThread.xml b/data_model/1.4/clusters/DiagnosticsThread.xml index 1987e35201eebc..9804217b0818a3 100644 --- a/data_model/1.4/clusters/DiagnosticsThread.xml +++ b/data_model/1.4/clusters/DiagnosticsThread.xml @@ -147,25 +147,50 @@ Davis, CA 95616, USA - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + @@ -274,7 +299,9 @@ Davis, CA 95616, USA - + + + @@ -317,25 +344,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -655,7 +690,9 @@ Davis, CA 95616, USA - + + + @@ -666,7 +703,9 @@ Davis, CA 95616, USA - + + + @@ -707,12 +746,16 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/DiagnosticsWiFi.xml b/data_model/1.4/clusters/DiagnosticsWiFi.xml index 493d2876590942..f2bda597ccde9b 100644 --- a/data_model/1.4/clusters/DiagnosticsWiFi.xml +++ b/data_model/1.4/clusters/DiagnosticsWiFi.xml @@ -147,7 +147,9 @@ Davis, CA 95616, USA - + + + @@ -168,7 +170,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/DoorLock.xml b/data_model/1.4/clusters/DoorLock.xml index 69078a0bdb228b..d1986c4bd6208d 100644 --- a/data_model/1.4/clusters/DoorLock.xml +++ b/data_model/1.4/clusters/DoorLock.xml @@ -720,12 +720,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -737,7 +741,9 @@ Davis, CA 95616, USA - + + + @@ -784,7 +790,9 @@ Davis, CA 95616, USA - + + + @@ -792,7 +800,9 @@ Davis, CA 95616, USA - + + + @@ -800,7 +810,9 @@ Davis, CA 95616, USA - + + + @@ -848,7 +860,9 @@ Davis, CA 95616, USA - + + + @@ -869,7 +883,9 @@ Davis, CA 95616, USA - + + + @@ -915,7 +931,12 @@ Davis, CA 95616, USA - + + + + + + @@ -926,7 +947,12 @@ Davis, CA 95616, USA - + + + + + + @@ -960,7 +986,12 @@ Davis, CA 95616, USA - + + + + + + @@ -973,7 +1004,9 @@ Davis, CA 95616, USA - + + + @@ -981,7 +1014,9 @@ Davis, CA 95616, USA - + + + @@ -989,18 +1024,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1008,18 +1049,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1099,12 +1146,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -1126,7 +1177,9 @@ Davis, CA 95616, USA - + + + @@ -1140,17 +1193,23 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1169,11 +1228,14 @@ Davis, CA 95616, USA - - - + + + + + + + - @@ -1203,11 +1265,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -1226,7 +1292,9 @@ Davis, CA 95616, USA - + + + @@ -1237,7 +1305,9 @@ Davis, CA 95616, USA - + + + @@ -1250,16 +1320,18 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + @@ -1267,19 +1339,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -1289,16 +1369,18 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + @@ -1308,40 +1390,52 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + - + + + - + + + - + + + - + + + - + + + @@ -1351,17 +1445,21 @@ Davis, CA 95616, USA - - - + + + + + + + - - - - + + + + @@ -1372,16 +1470,18 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + @@ -1398,16 +1498,18 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + @@ -1417,21 +1519,25 @@ Davis, CA 95616, USA - - - + + + + - - - + + + + - + + + @@ -1444,17 +1550,21 @@ Davis, CA 95616, USA - - - + + + + + + + - - - - + + + + @@ -1465,9 +1575,10 @@ Davis, CA 95616, USA - - - + + + + @@ -1487,9 +1598,10 @@ Davis, CA 95616, USA - - - + + + + @@ -1499,14 +1611,17 @@ Davis, CA 95616, USA - - - + + + + - + + + @@ -1528,11 +1643,14 @@ Davis, CA 95616, USA - - - + + + + + + + - @@ -1551,7 +1669,9 @@ Davis, CA 95616, USA - + + + @@ -1573,7 +1693,9 @@ Davis, CA 95616, USA - + + + @@ -1584,7 +1706,9 @@ Davis, CA 95616, USA - + + + @@ -1602,17 +1726,23 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1630,7 +1760,9 @@ Davis, CA 95616, USA - + + + @@ -1644,17 +1776,23 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1673,11 +1811,14 @@ Davis, CA 95616, USA - - - + + + + + + + - @@ -1698,20 +1839,31 @@ Davis, CA 95616, USA - - + + + + + + + + + + - - - + + + + - + + + @@ -1720,19 +1872,55 @@ Davis, CA 95616, USA - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1746,9 +1934,10 @@ Davis, CA 95616, USA - - - + + + + @@ -1758,15 +1947,18 @@ Davis, CA 95616, USA - - - + + + + - + + + @@ -1783,15 +1975,18 @@ Davis, CA 95616, USA - + + + - - - + + + + @@ -1805,9 +2000,10 @@ Davis, CA 95616, USA - - - + + + + @@ -1818,11 +2014,14 @@ Davis, CA 95616, USA - - - + + + + + + + - @@ -1832,40 +2031,87 @@ Davis, CA 95616, USA - - + + + + + + + + + + - + + + - - - + + + + - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1874,20 +2120,25 @@ Davis, CA 95616, USA - + + + - - - + + + + - + + + @@ -1909,9 +2160,10 @@ Davis, CA 95616, USA - - - + + + + @@ -1925,14 +2177,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -1943,7 +2199,9 @@ Davis, CA 95616, USA - + + + @@ -1967,21 +2225,29 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -2035,9 +2301,10 @@ Davis, CA 95616, USA - - - + + + + @@ -2071,9 +2338,10 @@ Davis, CA 95616, USA - - - + + + + @@ -2090,10 +2358,26 @@ Davis, CA 95616, USA - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/data_model/1.4/clusters/EcosystemInformationCluster.xml b/data_model/1.4/clusters/EcosystemInformationCluster.xml index 95349f31a6f24d..615c6092e85f17 100644 --- a/data_model/1.4/clusters/EcosystemInformationCluster.xml +++ b/data_model/1.4/clusters/EcosystemInformationCluster.xml @@ -70,32 +70,44 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + @@ -107,7 +119,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ElectricalEnergyMeasurement.xml b/data_model/1.4/clusters/ElectricalEnergyMeasurement.xml index 0dcd875014847d..fc56b5171700f8 100644 --- a/data_model/1.4/clusters/ElectricalEnergyMeasurement.xml +++ b/data_model/1.4/clusters/ElectricalEnergyMeasurement.xml @@ -109,15 +109,24 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/clusters/ElectricalPowerMeasurement.xml b/data_model/1.4/clusters/ElectricalPowerMeasurement.xml index 07bc001884b43b..1dcc420d7a8f2d 100644 --- a/data_model/1.4/clusters/ElectricalPowerMeasurement.xml +++ b/data_model/1.4/clusters/ElectricalPowerMeasurement.xml @@ -103,12 +103,19 @@ Davis, CA 95616, USA - + + + - + + + + + + @@ -117,11 +124,21 @@ Davis, CA 95616, USA - + + + + + + - + + + + + + @@ -129,7 +146,9 @@ Davis, CA 95616, USA - + + + @@ -140,7 +159,9 @@ Davis, CA 95616, USA - + + + @@ -148,7 +169,9 @@ Davis, CA 95616, USA - + + + @@ -159,7 +182,9 @@ Davis, CA 95616, USA - + + + @@ -172,16 +197,19 @@ Davis, CA 95616, USA - + + + - - - + + + + @@ -189,22 +217,33 @@ Davis, CA 95616, USA - - - + + + + - + + + + + + - + + + + + + @@ -212,7 +251,12 @@ Davis, CA 95616, USA - + + + + + + @@ -220,13 +264,23 @@ Davis, CA 95616, USA - + + + + + + - + + + + + + @@ -234,7 +288,12 @@ Davis, CA 95616, USA - + + + + + + @@ -242,7 +301,12 @@ Davis, CA 95616, USA - + + + + + + @@ -250,7 +314,12 @@ Davis, CA 95616, USA - + + + + + + @@ -258,7 +327,12 @@ Davis, CA 95616, USA - + + + + + + @@ -266,7 +340,12 @@ Davis, CA 95616, USA - + + + + + + @@ -274,7 +353,12 @@ Davis, CA 95616, USA - + + + + + + @@ -283,7 +367,9 @@ Davis, CA 95616, USA - + + + @@ -292,7 +378,9 @@ Davis, CA 95616, USA - + + + @@ -300,7 +388,12 @@ Davis, CA 95616, USA - + + + + + + @@ -308,7 +401,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/EnergyEVSE.xml b/data_model/1.4/clusters/EnergyEVSE.xml index 63e4207d03752e..bb5423f59f4242 100644 --- a/data_model/1.4/clusters/EnergyEVSE.xml +++ b/data_model/1.4/clusters/EnergyEVSE.xml @@ -237,13 +237,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -260,7 +264,9 @@ Davis, CA 95616, USA - + + + @@ -294,19 +300,25 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -314,19 +326,25 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -348,7 +366,9 @@ Davis, CA 95616, USA - + + + @@ -363,7 +383,9 @@ Davis, CA 95616, USA - + + + @@ -378,7 +400,9 @@ Davis, CA 95616, USA - + + + @@ -386,7 +410,9 @@ Davis, CA 95616, USA - + + + @@ -402,7 +428,9 @@ Davis, CA 95616, USA - + + + @@ -410,7 +438,9 @@ Davis, CA 95616, USA - + + + @@ -421,7 +451,9 @@ Davis, CA 95616, USA - + + + @@ -437,11 +469,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -455,7 +491,9 @@ Davis, CA 95616, USA - + + + @@ -470,7 +508,9 @@ Davis, CA 95616, USA - + + + @@ -508,13 +548,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -528,13 +572,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -551,13 +599,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -584,7 +636,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/EnergyPreference.xml b/data_model/1.4/clusters/EnergyPreference.xml index 6bb1955359d189..4296fb628cf3ff 100644 --- a/data_model/1.4/clusters/EnergyPreference.xml +++ b/data_model/1.4/clusters/EnergyPreference.xml @@ -98,7 +98,9 @@ Davis, CA 95616, USA - + + + @@ -110,7 +112,12 @@ Davis, CA 95616, USA - + + + + + + @@ -126,7 +133,9 @@ Davis, CA 95616, USA - + + + @@ -135,7 +144,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/FanControl.xml b/data_model/1.4/clusters/FanControl.xml index 7d57f4b17033a9..d9339163bc93f5 100644 --- a/data_model/1.4/clusters/FanControl.xml +++ b/data_model/1.4/clusters/FanControl.xml @@ -199,12 +199,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -212,7 +216,12 @@ Davis, CA 95616, USA - + + + + + + @@ -220,8 +229,10 @@ Davis, CA 95616, USA - - + + + + @@ -230,8 +241,10 @@ Davis, CA 95616, USA - - + + + + @@ -240,7 +253,9 @@ Davis, CA 95616, USA - + + + @@ -248,7 +263,9 @@ Davis, CA 95616, USA - + + + @@ -256,7 +273,9 @@ Davis, CA 95616, USA - + + + @@ -264,7 +283,9 @@ Davis, CA 95616, USA - + + + @@ -272,7 +293,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/FlowMeasurement.xml b/data_model/1.4/clusters/FlowMeasurement.xml index f1660fc631c3c9..9650eecf30649f 100644 --- a/data_model/1.4/clusters/FlowMeasurement.xml +++ b/data_model/1.4/clusters/FlowMeasurement.xml @@ -72,27 +72,35 @@ Davis, CA 95616, USA - - - + + + + + - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/GeneralCommissioningCluster.xml b/data_model/1.4/clusters/GeneralCommissioningCluster.xml index 059e5b858e272f..7f2cb98185a127 100644 --- a/data_model/1.4/clusters/GeneralCommissioningCluster.xml +++ b/data_model/1.4/clusters/GeneralCommissioningCluster.xml @@ -121,7 +121,9 @@ Davis, CA 95616, USA - + + + @@ -134,14 +136,17 @@ Davis, CA 95616, USA - + + + - + - + + @@ -220,7 +225,9 @@ Davis, CA 95616, USA - + + + @@ -231,7 +238,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Group-Key-Management-Cluster.xml b/data_model/1.4/clusters/Group-Key-Management-Cluster.xml index 31aa2c14ad618f..4a295ec404b5f9 100644 --- a/data_model/1.4/clusters/Group-Key-Management-Cluster.xml +++ b/data_model/1.4/clusters/Group-Key-Management-Cluster.xml @@ -97,11 +97,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -111,7 +115,12 @@ Davis, CA 95616, USA - + + + + + + @@ -127,7 +136,9 @@ Davis, CA 95616, USA - + + + @@ -138,7 +149,9 @@ Davis, CA 95616, USA - + + + @@ -149,7 +162,9 @@ Davis, CA 95616, USA - + + + @@ -171,13 +186,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -188,7 +207,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Groups.xml b/data_model/1.4/clusters/Groups.xml index 2829d7598510a4..121ec51a0a8c13 100644 --- a/data_model/1.4/clusters/Groups.xml +++ b/data_model/1.4/clusters/Groups.xml @@ -85,7 +85,9 @@ Davis, CA 95616, USA - + + + @@ -94,22 +96,30 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -117,22 +127,30 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -140,7 +158,9 @@ Davis, CA 95616, USA - + + + @@ -153,7 +173,9 @@ Davis, CA 95616, USA - + + + @@ -163,18 +185,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -186,11 +214,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ICDManagement.xml b/data_model/1.4/clusters/ICDManagement.xml index a9d6724e7f0058..37ec4c5d6356e6 100644 --- a/data_model/1.4/clusters/ICDManagement.xml +++ b/data_model/1.4/clusters/ICDManagement.xml @@ -190,7 +190,12 @@ Davis, CA 95616, USA - + + + + + + @@ -209,7 +214,9 @@ Davis, CA 95616, USA - + + + @@ -224,7 +231,9 @@ Davis, CA 95616, USA - + + + @@ -232,12 +241,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -251,9 +264,10 @@ Davis, CA 95616, USA - - - + + + + @@ -271,11 +285,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -299,7 +317,9 @@ Davis, CA 95616, USA - + + + @@ -323,7 +343,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Identify.xml b/data_model/1.4/clusters/Identify.xml index 557d6e221c9aac..fb9b009d1353a8 100644 --- a/data_model/1.4/clusters/Identify.xml +++ b/data_model/1.4/clusters/Identify.xml @@ -124,7 +124,9 @@ Davis, CA 95616, USA - + + + @@ -140,11 +142,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/IlluminanceMeasurement.xml b/data_model/1.4/clusters/IlluminanceMeasurement.xml index e5388deb35c65c..2bfd018952deaf 100644 --- a/data_model/1.4/clusters/IlluminanceMeasurement.xml +++ b/data_model/1.4/clusters/IlluminanceMeasurement.xml @@ -82,28 +82,41 @@ Davis, CA 95616, USA - - - - + + + + + + + + - + + + + + + - + + + - + + + diff --git a/data_model/1.4/clusters/JointFabricDatastoreCluster.xml b/data_model/1.4/clusters/JointFabricDatastoreCluster.xml index 234985e45ded43..e6eecc50b23321 100644 --- a/data_model/1.4/clusters/JointFabricDatastoreCluster.xml +++ b/data_model/1.4/clusters/JointFabricDatastoreCluster.xml @@ -97,14 +97,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -114,7 +118,9 @@ Davis, CA 95616, USA - + + + @@ -130,7 +136,9 @@ Davis, CA 95616, USA - + + + @@ -160,19 +168,36 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + + + + - + + + + + + @@ -185,7 +210,9 @@ Davis, CA 95616, USA - + + + @@ -239,7 +266,9 @@ Davis, CA 95616, USA - + + + @@ -296,19 +325,36 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + + + + - + + + + + + @@ -323,22 +369,39 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + + + + - + + + + + + @@ -368,12 +431,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -391,7 +458,9 @@ Davis, CA 95616, USA - + + + @@ -409,7 +478,9 @@ Davis, CA 95616, USA - + + + @@ -430,7 +501,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/JointFabricPKICluster.xml b/data_model/1.4/clusters/JointFabricPKICluster.xml index 15917a0c16ef9a..0f9d09ad159015 100644 --- a/data_model/1.4/clusters/JointFabricPKICluster.xml +++ b/data_model/1.4/clusters/JointFabricPKICluster.xml @@ -112,7 +112,9 @@ Davis, CA 95616, USA - + + + @@ -122,7 +124,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Label-Cluster-LabelCluster.xml b/data_model/1.4/clusters/Label-Cluster-LabelCluster.xml index 3a04b25aa16065..617e9b2bd30350 100644 --- a/data_model/1.4/clusters/Label-Cluster-LabelCluster.xml +++ b/data_model/1.4/clusters/Label-Cluster-LabelCluster.xml @@ -69,11 +69,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/LaundryDryerControls.xml b/data_model/1.4/clusters/LaundryDryerControls.xml index 802a1339909430..5a57711de3801b 100644 --- a/data_model/1.4/clusters/LaundryDryerControls.xml +++ b/data_model/1.4/clusters/LaundryDryerControls.xml @@ -86,13 +86,20 @@ Davis, CA 95616, USA - + + + + + + - + + + diff --git a/data_model/1.4/clusters/LaundryWasherControls.xml b/data_model/1.4/clusters/LaundryWasherControls.xml index d79ac13361b8a5..29dfaee22caff7 100644 --- a/data_model/1.4/clusters/LaundryWasherControls.xml +++ b/data_model/1.4/clusters/LaundryWasherControls.xml @@ -101,13 +101,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -115,14 +119,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -130,7 +138,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/LevelControl.xml b/data_model/1.4/clusters/LevelControl.xml index 872eeb54ce9361..fc6fc7a8f12a67 100644 --- a/data_model/1.4/clusters/LevelControl.xml +++ b/data_model/1.4/clusters/LevelControl.xml @@ -119,9 +119,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -136,7 +138,12 @@ Davis, CA 95616, USA - + + + + + + @@ -145,14 +152,17 @@ Davis, CA 95616, USA - + + + - - - + + + + @@ -161,9 +171,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -177,14 +189,18 @@ Davis, CA 95616, USA - - + + + + - + + + @@ -194,9 +210,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -213,7 +231,9 @@ Davis, CA 95616, USA - + + + @@ -221,7 +241,9 @@ Davis, CA 95616, USA - + + + @@ -230,7 +252,9 @@ Davis, CA 95616, USA - + + + @@ -238,11 +262,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -250,7 +278,9 @@ Davis, CA 95616, USA - + + + @@ -258,11 +288,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -270,7 +304,9 @@ Davis, CA 95616, USA - + + + @@ -281,11 +317,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -293,11 +333,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/LocalizationConfiguration.xml b/data_model/1.4/clusters/LocalizationConfiguration.xml index 81e66f57c487cb..f3fd79c0195a0f 100644 --- a/data_model/1.4/clusters/LocalizationConfiguration.xml +++ b/data_model/1.4/clusters/LocalizationConfiguration.xml @@ -70,16 +70,22 @@ Davis, CA 95616, USA - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/LocalizationTimeFormat.xml b/data_model/1.4/clusters/LocalizationTimeFormat.xml index 4ac06048841acd..71f73196ae2d24 100644 --- a/data_model/1.4/clusters/LocalizationTimeFormat.xml +++ b/data_model/1.4/clusters/LocalizationTimeFormat.xml @@ -144,7 +144,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/MediaInput.xml b/data_model/1.4/clusters/MediaInput.xml index cc909cf9111748..2a26d6952dd276 100644 --- a/data_model/1.4/clusters/MediaInput.xml +++ b/data_model/1.4/clusters/MediaInput.xml @@ -115,7 +115,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/MediaPlayback.xml b/data_model/1.4/clusters/MediaPlayback.xml index 91aac58ef4f3f6..915592895f2134 100644 --- a/data_model/1.4/clusters/MediaPlayback.xml +++ b/data_model/1.4/clusters/MediaPlayback.xml @@ -190,7 +190,9 @@ Davis, CA 95616, USA - + + + @@ -200,13 +202,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -217,7 +223,9 @@ Davis, CA 95616, USA - + + + @@ -225,7 +233,9 @@ Davis, CA 95616, USA - + + + @@ -233,7 +243,9 @@ Davis, CA 95616, USA - + + + @@ -241,14 +253,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -256,7 +272,9 @@ Davis, CA 95616, USA - + + + @@ -264,7 +282,9 @@ Davis, CA 95616, USA - + + + @@ -272,7 +292,9 @@ Davis, CA 95616, USA - + + + @@ -281,7 +303,9 @@ Davis, CA 95616, USA - + + + @@ -289,7 +313,9 @@ Davis, CA 95616, USA - + + + @@ -298,7 +324,9 @@ Davis, CA 95616, USA - + + + @@ -366,7 +394,9 @@ Davis, CA 95616, USA - + + + @@ -388,7 +418,9 @@ Davis, CA 95616, USA - + + + @@ -404,7 +436,9 @@ Davis, CA 95616, USA - + + + @@ -420,53 +454,71 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/Messages.xml b/data_model/1.4/clusters/Messages.xml index b8910f555d6333..916f99505d7d1e 100644 --- a/data_model/1.4/clusters/Messages.xml +++ b/data_model/1.4/clusters/Messages.xml @@ -147,18 +147,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -181,7 +187,9 @@ Davis, CA 95616, USA - + + + @@ -189,7 +197,9 @@ Davis, CA 95616, USA - + + + @@ -199,13 +209,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -214,7 +228,9 @@ Davis, CA 95616, USA - + + + @@ -232,14 +248,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -248,7 +268,9 @@ Davis, CA 95616, USA - + + + @@ -258,7 +280,9 @@ Davis, CA 95616, USA - + + + @@ -266,7 +290,9 @@ Davis, CA 95616, USA - + + + @@ -274,7 +300,9 @@ Davis, CA 95616, USA - + + + @@ -287,7 +315,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/MicrowaveOvenControl.xml b/data_model/1.4/clusters/MicrowaveOvenControl.xml index aa0e1f15cfb1f7..8f790fa31d3242 100644 --- a/data_model/1.4/clusters/MicrowaveOvenControl.xml +++ b/data_model/1.4/clusters/MicrowaveOvenControl.xml @@ -85,23 +85,31 @@ Davis, CA 95616, USA - - - + + + + - + + + + + + - + + + @@ -109,7 +117,12 @@ Davis, CA 95616, USA - + + + + + + @@ -117,7 +130,12 @@ Davis, CA 95616, USA - + + + + + + @@ -125,7 +143,9 @@ Davis, CA 95616, USA - + + + @@ -137,7 +157,12 @@ Davis, CA 95616, USA - + + + + + + @@ -147,7 +172,9 @@ Davis, CA 95616, USA - + + + @@ -161,29 +188,36 @@ Davis, CA 95616, USA - + + + - - - + + + + - - - + + + + + - + + + @@ -194,9 +228,10 @@ Davis, CA 95616, USA - - - + + + + diff --git a/data_model/1.4/clusters/ModeBase.xml b/data_model/1.4/clusters/ModeBase.xml index a9eb66e762c833..d17938ea7f4da4 100644 --- a/data_model/1.4/clusters/ModeBase.xml +++ b/data_model/1.4/clusters/ModeBase.xml @@ -76,7 +76,9 @@ Davis, CA 95616, USA - + + + @@ -86,13 +88,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -105,19 +111,28 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + @@ -125,7 +140,9 @@ Davis, CA 95616, USA - + + + @@ -134,26 +151,32 @@ Davis, CA 95616, USA - + + + - + + + - + - + + + diff --git a/data_model/1.4/clusters/ModeSelect.xml b/data_model/1.4/clusters/ModeSelect.xml index 56d0a43a4ae8b2..6d5dfb5e74fa2d 100644 --- a/data_model/1.4/clusters/ModeSelect.xml +++ b/data_model/1.4/clusters/ModeSelect.xml @@ -76,7 +76,9 @@ Davis, CA 95616, USA - + + + @@ -86,14 +88,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -106,32 +112,42 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -139,7 +155,9 @@ Davis, CA 95616, USA - + + + @@ -148,7 +166,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml b/data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml index 742a136355c652..85195ebb669c4b 100644 --- a/data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml +++ b/data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml @@ -97,7 +97,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_Dishwasher.xml b/data_model/1.4/clusters/Mode_Dishwasher.xml index ebc10d0d54e419..c3cb5d3a0cea3c 100644 --- a/data_model/1.4/clusters/Mode_Dishwasher.xml +++ b/data_model/1.4/clusters/Mode_Dishwasher.xml @@ -97,7 +97,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_EVSE.xml b/data_model/1.4/clusters/Mode_EVSE.xml index b776028605dd11..5bae945025506d 100644 --- a/data_model/1.4/clusters/Mode_EVSE.xml +++ b/data_model/1.4/clusters/Mode_EVSE.xml @@ -97,7 +97,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_LaundryWasher.xml b/data_model/1.4/clusters/Mode_LaundryWasher.xml index 9a8b64b75e7b8d..e20a182d3adec9 100644 --- a/data_model/1.4/clusters/Mode_LaundryWasher.xml +++ b/data_model/1.4/clusters/Mode_LaundryWasher.xml @@ -98,7 +98,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_Oven.xml b/data_model/1.4/clusters/Mode_Oven.xml index 62e50c896f1e33..8b4f16843cfa0b 100644 --- a/data_model/1.4/clusters/Mode_Oven.xml +++ b/data_model/1.4/clusters/Mode_Oven.xml @@ -103,7 +103,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_RVCClean.xml b/data_model/1.4/clusters/Mode_RVCClean.xml index 6d78cbe3658ce0..ba0b115bfd4532 100644 --- a/data_model/1.4/clusters/Mode_RVCClean.xml +++ b/data_model/1.4/clusters/Mode_RVCClean.xml @@ -97,7 +97,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_RVCRun.xml b/data_model/1.4/clusters/Mode_RVCRun.xml index e5b0c0d7c94f93..f47b1da3b9a262 100644 --- a/data_model/1.4/clusters/Mode_RVCRun.xml +++ b/data_model/1.4/clusters/Mode_RVCRun.xml @@ -97,7 +97,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_Refrigerator.xml b/data_model/1.4/clusters/Mode_Refrigerator.xml index 6a786048c3bc2e..dc6893bf4404ef 100644 --- a/data_model/1.4/clusters/Mode_Refrigerator.xml +++ b/data_model/1.4/clusters/Mode_Refrigerator.xml @@ -96,7 +96,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/Mode_WaterHeater.xml b/data_model/1.4/clusters/Mode_WaterHeater.xml index 6d60836966d024..17dee3127b51b2 100644 --- a/data_model/1.4/clusters/Mode_WaterHeater.xml +++ b/data_model/1.4/clusters/Mode_WaterHeater.xml @@ -95,7 +95,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/NetworkCommissioningCluster.xml b/data_model/1.4/clusters/NetworkCommissioningCluster.xml index 25bf37ec110136..6082d4bad6488d 100644 --- a/data_model/1.4/clusters/NetworkCommissioningCluster.xml +++ b/data_model/1.4/clusters/NetworkCommissioningCluster.xml @@ -176,7 +176,12 @@ Davis, CA 95616, USA - + + + + + + @@ -187,7 +192,9 @@ Davis, CA 95616, USA - + + + @@ -198,7 +205,12 @@ Davis, CA 95616, USA - + + + + + + @@ -214,8 +226,12 @@ Davis, CA 95616, USA - - + + + + + + @@ -238,13 +254,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -268,14 +288,18 @@ Davis, CA 95616, USA - + + + - - + + + + @@ -287,7 +311,9 @@ Davis, CA 95616, USA - + + + @@ -298,7 +324,9 @@ Davis, CA 95616, USA - + + + @@ -314,7 +342,12 @@ Davis, CA 95616, USA - + + + + + + @@ -328,7 +361,9 @@ Davis, CA 95616, USA - + + + @@ -359,7 +394,12 @@ Davis, CA 95616, USA - + + + + + + @@ -374,25 +414,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -402,11 +450,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -419,7 +471,9 @@ Davis, CA 95616, USA - + + + @@ -435,7 +489,12 @@ Davis, CA 95616, USA - + + + + + + @@ -450,15 +509,21 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -471,7 +536,12 @@ Davis, CA 95616, USA - + + + + + + @@ -505,11 +575,18 @@ Davis, CA 95616, USA - + + + + + + - + + + diff --git a/data_model/1.4/clusters/OTAProvider.xml b/data_model/1.4/clusters/OTAProvider.xml index feef66814c5c85..b9d2a147f2e520 100644 --- a/data_model/1.4/clusters/OTAProvider.xml +++ b/data_model/1.4/clusters/OTAProvider.xml @@ -122,21 +122,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -149,25 +155,39 @@ Davis, CA 95616, USA - + + + - + + + + + + - + + + + + + - + + + @@ -175,7 +195,12 @@ Davis, CA 95616, USA - + + + + + + @@ -195,7 +220,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/OTARequestor.xml b/data_model/1.4/clusters/OTARequestor.xml index 9d88c518225387..bd9bf65a577763 100644 --- a/data_model/1.4/clusters/OTARequestor.xml +++ b/data_model/1.4/clusters/OTARequestor.xml @@ -139,13 +139,16 @@ Davis, CA 95616, USA - + + + - + + @@ -153,7 +156,12 @@ Davis, CA 95616, USA - + + + + + + @@ -171,7 +179,9 @@ Davis, CA 95616, USA - + + + @@ -218,7 +228,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/OccupancySensing.xml b/data_model/1.4/clusters/OccupancySensing.xml index 096614d2099942..2cd2b3b827f4cf 100644 --- a/data_model/1.4/clusters/OccupancySensing.xml +++ b/data_model/1.4/clusters/OccupancySensing.xml @@ -129,16 +129,29 @@ Davis, CA 95616, USA - + + + - - + + + + + + + + - + + + + + + @@ -147,7 +160,12 @@ Davis, CA 95616, USA - + + + + + + @@ -156,7 +174,9 @@ Davis, CA 95616, USA - + + + @@ -165,13 +185,20 @@ Davis, CA 95616, USA - + + + + + + - + + + @@ -301,7 +328,12 @@ Davis, CA 95616, USA - + + + + + + @@ -355,7 +387,12 @@ Davis, CA 95616, USA - + + + + + + @@ -409,7 +446,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/OnOff.xml b/data_model/1.4/clusters/OnOff.xml index 7151e61dfb9c90..a58d4fcdf653c1 100644 --- a/data_model/1.4/clusters/OnOff.xml +++ b/data_model/1.4/clusters/OnOff.xml @@ -168,7 +168,9 @@ Davis, CA 95616, USA - + + + @@ -199,11 +201,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -219,15 +225,24 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/clusters/OperationalCredentialCluster.xml b/data_model/1.4/clusters/OperationalCredentialCluster.xml index b59e905135412a..bcd709d8789493 100644 --- a/data_model/1.4/clusters/OperationalCredentialCluster.xml +++ b/data_model/1.4/clusters/OperationalCredentialCluster.xml @@ -115,11 +115,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -129,7 +133,9 @@ Davis, CA 95616, USA - + + + @@ -137,13 +143,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -154,8 +164,10 @@ Davis, CA 95616, USA - - + + + + @@ -163,33 +175,46 @@ Davis, CA 95616, USA - - + + + + - + + + + + + - - + + + + - + + + - - + + + + @@ -203,17 +228,26 @@ Davis, CA 95616, USA - + + + + + + + + - + + + @@ -221,14 +255,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -236,7 +274,9 @@ Davis, CA 95616, USA - + + + @@ -246,10 +286,17 @@ Davis, CA 95616, USA + + + + + - + + + @@ -257,15 +304,21 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -279,11 +332,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -293,11 +350,18 @@ Davis, CA 95616, USA - + + + + + + - + + + @@ -305,7 +369,9 @@ Davis, CA 95616, USA - + + + @@ -313,7 +379,12 @@ Davis, CA 95616, USA - + + + + + + @@ -321,7 +392,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/OperationalState.xml b/data_model/1.4/clusters/OperationalState.xml index be8fa18b9044d3..dc2a1ca60e9360 100644 --- a/data_model/1.4/clusters/OperationalState.xml +++ b/data_model/1.4/clusters/OperationalState.xml @@ -101,11 +101,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -113,37 +117,49 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + @@ -152,7 +168,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/PowerSourceCluster.xml b/data_model/1.4/clusters/PowerSourceCluster.xml index ca4b91403c6a23..e24b63b8a16c1a 100644 --- a/data_model/1.4/clusters/PowerSourceCluster.xml +++ b/data_model/1.4/clusters/PowerSourceCluster.xml @@ -555,7 +555,9 @@ Davis, CA 95616, USA - + + + @@ -566,7 +568,9 @@ Davis, CA 95616, USA - + + + @@ -588,7 +592,9 @@ Davis, CA 95616, USA - + + + @@ -623,7 +629,9 @@ Davis, CA 95616, USA - + + + @@ -638,7 +646,9 @@ Davis, CA 95616, USA - + + + @@ -652,7 +662,9 @@ Davis, CA 95616, USA - + + + @@ -679,7 +691,9 @@ Davis, CA 95616, USA - + + + @@ -687,7 +701,9 @@ Davis, CA 95616, USA - + + + @@ -695,7 +711,9 @@ Davis, CA 95616, USA - + + + @@ -703,7 +721,9 @@ Davis, CA 95616, USA - + + + @@ -711,7 +731,9 @@ Davis, CA 95616, USA - + + + @@ -719,7 +741,9 @@ Davis, CA 95616, USA - + + + @@ -743,7 +767,9 @@ Davis, CA 95616, USA - + + + @@ -771,7 +797,9 @@ Davis, CA 95616, USA - + + + @@ -788,12 +816,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -804,12 +836,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -820,12 +856,16 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/PowerSourceConfigurationCluster.xml b/data_model/1.4/clusters/PowerSourceConfigurationCluster.xml index d2f41b8977f023..11794842114c8e 100644 --- a/data_model/1.4/clusters/PowerSourceConfigurationCluster.xml +++ b/data_model/1.4/clusters/PowerSourceConfigurationCluster.xml @@ -71,7 +71,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/PowerTopology.xml b/data_model/1.4/clusters/PowerTopology.xml index 3c9e88254cb201..8cd5f530b255e4 100644 --- a/data_model/1.4/clusters/PowerTopology.xml +++ b/data_model/1.4/clusters/PowerTopology.xml @@ -89,7 +89,9 @@ Davis, CA 95616, USA - + + + @@ -98,7 +100,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/PressureMeasurement.xml b/data_model/1.4/clusters/PressureMeasurement.xml index a5ea5fe4432955..c9d657a1df8d82 100644 --- a/data_model/1.4/clusters/PressureMeasurement.xml +++ b/data_model/1.4/clusters/PressureMeasurement.xml @@ -77,27 +77,38 @@ Davis, CA 95616, USA - - - + + + + + - + + + - + + + + + + - + + + @@ -105,9 +116,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -116,7 +129,9 @@ Davis, CA 95616, USA - + + + @@ -124,21 +139,30 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/clusters/ProxyConfiguration-Cluster.xml b/data_model/1.4/clusters/ProxyConfiguration-Cluster.xml index 9356e7f55932b6..7b634b338aee50 100644 --- a/data_model/1.4/clusters/ProxyConfiguration-Cluster.xml +++ b/data_model/1.4/clusters/ProxyConfiguration-Cluster.xml @@ -71,12 +71,16 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ProxyDiscovery-Cluster.xml b/data_model/1.4/clusters/ProxyDiscovery-Cluster.xml index d87c7e67a73163..9c2cc8522f37f9 100644 --- a/data_model/1.4/clusters/ProxyDiscovery-Cluster.xml +++ b/data_model/1.4/clusters/ProxyDiscovery-Cluster.xml @@ -76,11 +76,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -90,11 +94,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/PumpConfigurationControl.xml b/data_model/1.4/clusters/PumpConfigurationControl.xml index d9b81833da5d20..48f1369788600b 100644 --- a/data_model/1.4/clusters/PumpConfigurationControl.xml +++ b/data_model/1.4/clusters/PumpConfigurationControl.xml @@ -297,7 +297,9 @@ Davis, CA 95616, USA - + + + @@ -310,25 +312,33 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -359,13 +369,17 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ResourceMonitoring.xml b/data_model/1.4/clusters/ResourceMonitoring.xml index d263bb53b8ba29..51833b13d88757 100644 --- a/data_model/1.4/clusters/ResourceMonitoring.xml +++ b/data_model/1.4/clusters/ResourceMonitoring.xml @@ -120,11 +120,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -141,7 +145,9 @@ Davis, CA 95616, USA - + + + @@ -163,7 +169,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Scenes.xml b/data_model/1.4/clusters/Scenes.xml index 53bea65b8f7067..d96355f6a719f7 100644 --- a/data_model/1.4/clusters/Scenes.xml +++ b/data_model/1.4/clusters/Scenes.xml @@ -114,7 +114,9 @@ Davis, CA 95616, USA - + + + @@ -124,7 +126,9 @@ Davis, CA 95616, USA - + + + @@ -136,7 +140,9 @@ Davis, CA 95616, USA - + + + @@ -151,13 +157,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -169,34 +179,46 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + @@ -207,27 +229,37 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -241,21 +273,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -269,7 +307,9 @@ Davis, CA 95616, USA - + + + @@ -283,21 +323,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -308,12 +354,16 @@ Davis, CA 95616, USA - + + + - + + + @@ -327,7 +377,9 @@ Davis, CA 95616, USA - + + + @@ -341,7 +393,7 @@ Davis, CA 95616, USA - + @@ -351,21 +403,27 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -374,14 +432,18 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/ServiceArea.xml b/data_model/1.4/clusters/ServiceArea.xml index 9f2c8b35844854..6b571761772b25 100644 --- a/data_model/1.4/clusters/ServiceArea.xml +++ b/data_model/1.4/clusters/ServiceArea.xml @@ -136,7 +136,9 @@ Davis, CA 95616, USA - + + + @@ -157,7 +159,9 @@ Davis, CA 95616, USA - + + + @@ -182,7 +186,9 @@ Davis, CA 95616, USA - + + + @@ -190,18 +196,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -216,7 +228,9 @@ Davis, CA 95616, USA - + + + @@ -226,7 +240,9 @@ Davis, CA 95616, USA - + + + @@ -236,14 +252,18 @@ Davis, CA 95616, USA - + + + - + + + @@ -255,7 +275,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/Switch.xml b/data_model/1.4/clusters/Switch.xml index def888d4f66b68..f3b53e3ee12809 100644 --- a/data_model/1.4/clusters/Switch.xml +++ b/data_model/1.4/clusters/Switch.xml @@ -118,13 +118,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -132,7 +136,9 @@ Davis, CA 95616, USA - + + + @@ -143,7 +149,12 @@ Davis, CA 95616, USA - + + + + + + @@ -153,7 +164,12 @@ Davis, CA 95616, USA - + + + + + + @@ -163,7 +179,12 @@ Davis, CA 95616, USA - + + + + + + @@ -173,7 +194,12 @@ Davis, CA 95616, USA - + + + + + + @@ -183,7 +209,12 @@ Davis, CA 95616, USA - + + + + + + @@ -198,13 +229,19 @@ Davis, CA 95616, USA - + + + + + + - - - + + + + @@ -215,12 +252,19 @@ Davis, CA 95616, USA - + + + + + + - - + + + + diff --git a/data_model/1.4/clusters/TargetNavigator.xml b/data_model/1.4/clusters/TargetNavigator.xml index 8cbe2d42829fd7..e7e53bcddb91e1 100644 --- a/data_model/1.4/clusters/TargetNavigator.xml +++ b/data_model/1.4/clusters/TargetNavigator.xml @@ -81,7 +81,9 @@ Davis, CA 95616, USA - + + + @@ -97,7 +99,9 @@ Davis, CA 95616, USA - + + + @@ -131,11 +135,15 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/TemperatureControl.xml b/data_model/1.4/clusters/TemperatureControl.xml index e7db3b6883d7d0..a8557ebf6f4913 100644 --- a/data_model/1.4/clusters/TemperatureControl.xml +++ b/data_model/1.4/clusters/TemperatureControl.xml @@ -84,9 +84,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -95,7 +97,9 @@ Davis, CA 95616, USA - + + + @@ -103,7 +107,9 @@ Davis, CA 95616, USA - + + + @@ -111,24 +117,32 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + @@ -139,13 +153,17 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/TemperatureMeasurement.xml b/data_model/1.4/clusters/TemperatureMeasurement.xml index 88e1f4cc080d1c..64dd11fd1ad6d5 100644 --- a/data_model/1.4/clusters/TemperatureMeasurement.xml +++ b/data_model/1.4/clusters/TemperatureMeasurement.xml @@ -73,27 +73,38 @@ Davis, CA 95616, USA - - - + + + + + - + + + + + + - + + + - + + + diff --git a/data_model/1.4/clusters/Thermostat.xml b/data_model/1.4/clusters/Thermostat.xml index c82c878be94ffa..257171beeb90c2 100644 --- a/data_model/1.4/clusters/Thermostat.xml +++ b/data_model/1.4/clusters/Thermostat.xml @@ -523,7 +523,9 @@ Davis, CA 95616, USA - + + + @@ -531,19 +533,25 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -565,26 +573,35 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - - - + + + + @@ -595,55 +612,75 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + - + + + - + + + - - + + + + - + + + - + + + @@ -678,7 +715,9 @@ Davis, CA 95616, USA - + + + @@ -686,7 +725,9 @@ Davis, CA 95616, USA - + + + @@ -694,7 +735,9 @@ Davis, CA 95616, USA - + + + @@ -702,7 +745,9 @@ Davis, CA 95616, USA - + + + @@ -710,7 +755,12 @@ Davis, CA 95616, USA - + + + + + + @@ -718,13 +768,20 @@ Davis, CA 95616, USA - + + + + + + - + + + @@ -741,7 +798,9 @@ Davis, CA 95616, USA - + + + @@ -749,7 +808,9 @@ Davis, CA 95616, USA - + + + @@ -760,7 +821,9 @@ Davis, CA 95616, USA - + + + @@ -771,43 +834,53 @@ Davis, CA 95616, USA - + + + - + - + + + - + - + + + - + - + + + - + - + + + @@ -815,7 +888,12 @@ Davis, CA 95616, USA - + + + + + + @@ -826,20 +904,26 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -847,7 +931,9 @@ Davis, CA 95616, USA - + + + @@ -867,29 +953,39 @@ Davis, CA 95616, USA - + + + - + + + - + + + - + + + - + + + @@ -906,9 +1002,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -917,8 +1015,10 @@ Davis, CA 95616, USA - - + + + + @@ -927,9 +1027,10 @@ Davis, CA 95616, USA - - - + + + + @@ -941,9 +1042,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -955,8 +1058,10 @@ Davis, CA 95616, USA - - + + + + @@ -968,9 +1073,10 @@ Davis, CA 95616, USA - - - + + + + @@ -982,7 +1088,9 @@ Davis, CA 95616, USA - + + + @@ -993,13 +1101,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -1009,7 +1121,9 @@ Davis, CA 95616, USA - + + + @@ -1020,7 +1134,9 @@ Davis, CA 95616, USA - + + + @@ -1029,7 +1145,9 @@ Davis, CA 95616, USA - + + + @@ -1038,7 +1156,9 @@ Davis, CA 95616, USA - + + + @@ -1074,7 +1194,9 @@ Davis, CA 95616, USA - + + + @@ -1082,7 +1204,9 @@ Davis, CA 95616, USA - + + + @@ -1091,8 +1215,10 @@ Davis, CA 95616, USA - - + + + + @@ -1102,7 +1228,9 @@ Davis, CA 95616, USA - + + + @@ -1116,7 +1244,9 @@ Davis, CA 95616, USA - + + + @@ -1131,16 +1261,22 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1153,16 +1289,22 @@ Davis, CA 95616, USA - + + + - + + + - + + + @@ -1172,11 +1314,15 @@ Davis, CA 95616, USA - + + + - + + + @@ -1192,7 +1338,9 @@ Davis, CA 95616, USA - + + + @@ -1203,7 +1351,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml b/data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml index a77c6c4fece947..4a348bbe81abd8 100644 --- a/data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml +++ b/data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml @@ -105,15 +105,18 @@ Davis, CA 95616, USA - + + - + + - + + diff --git a/data_model/1.4/clusters/ThreadBorderRouterManagement.xml b/data_model/1.4/clusters/ThreadBorderRouterManagement.xml index 4059db7ebd9bd3..0f553e31f39be1 100644 --- a/data_model/1.4/clusters/ThreadBorderRouterManagement.xml +++ b/data_model/1.4/clusters/ThreadBorderRouterManagement.xml @@ -74,12 +74,19 @@ Davis, CA 95616, USA - + + + + + + - + + + @@ -115,7 +122,9 @@ Davis, CA 95616, USA - + + + @@ -123,7 +132,9 @@ Davis, CA 95616, USA - + + + @@ -136,7 +147,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ThreadNetworkDirectory.xml b/data_model/1.4/clusters/ThreadNetworkDirectory.xml index c814ace82c56d1..550c7c9db0d48f 100644 --- a/data_model/1.4/clusters/ThreadNetworkDirectory.xml +++ b/data_model/1.4/clusters/ThreadNetworkDirectory.xml @@ -69,11 +69,18 @@ Davis, CA 95616, USA - + + + - + + + + + + @@ -88,22 +95,28 @@ Davis, CA 95616, USA - + + + - - + + + + - + + + @@ -112,7 +125,9 @@ Davis, CA 95616, USA - + + + @@ -120,7 +135,9 @@ Davis, CA 95616, USA - + + + @@ -128,14 +145,18 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/TimeSync.xml b/data_model/1.4/clusters/TimeSync.xml index 9a50063b750b7d..4911656beda88f 100644 --- a/data_model/1.4/clusters/TimeSync.xml +++ b/data_model/1.4/clusters/TimeSync.xml @@ -170,7 +170,9 @@ Davis, CA 95616, USA - + + + @@ -191,14 +193,24 @@ Davis, CA 95616, USA - + + + + + + - + + + + + + @@ -219,15 +231,21 @@ Davis, CA 95616, USA - + + - + + + - + + - + + + @@ -242,7 +260,9 @@ Davis, CA 95616, USA - + + + @@ -251,7 +271,12 @@ Davis, CA 95616, USA - + + + + + + @@ -268,7 +293,8 @@ Davis, CA 95616, USA - + + @@ -287,7 +313,12 @@ Davis, CA 95616, USA - + + + + + + @@ -295,7 +326,9 @@ Davis, CA 95616, USA - + + + @@ -337,7 +370,12 @@ Davis, CA 95616, USA - + + + + + + @@ -366,7 +404,9 @@ Davis, CA 95616, USA - + + + @@ -393,7 +433,12 @@ Davis, CA 95616, USA - + + + + + + diff --git a/data_model/1.4/clusters/ValidProxies-Cluster.xml b/data_model/1.4/clusters/ValidProxies-Cluster.xml index 518b4aad5715b7..678a71824401a6 100644 --- a/data_model/1.4/clusters/ValidProxies-Cluster.xml +++ b/data_model/1.4/clusters/ValidProxies-Cluster.xml @@ -81,7 +81,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/ValveConfigurationControl.xml b/data_model/1.4/clusters/ValveConfigurationControl.xml index 844eeb781eb869..14c16a48ff0b84 100644 --- a/data_model/1.4/clusters/ValveConfigurationControl.xml +++ b/data_model/1.4/clusters/ValveConfigurationControl.xml @@ -114,13 +114,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -164,7 +168,12 @@ Davis, CA 95616, USA - + + + + + + @@ -176,7 +185,12 @@ Davis, CA 95616, USA - + + + + + + @@ -186,13 +200,17 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/WakeOnLAN.xml b/data_model/1.4/clusters/WakeOnLAN.xml index a315346bfbbb8d..1998e34aac3d88 100644 --- a/data_model/1.4/clusters/WakeOnLAN.xml +++ b/data_model/1.4/clusters/WakeOnLAN.xml @@ -70,13 +70,17 @@ Davis, CA 95616, USA - + + + - + + + diff --git a/data_model/1.4/clusters/WaterContentMeasurement.xml b/data_model/1.4/clusters/WaterContentMeasurement.xml index 0f2bf36d84163c..e77741f1265a80 100644 --- a/data_model/1.4/clusters/WaterContentMeasurement.xml +++ b/data_model/1.4/clusters/WaterContentMeasurement.xml @@ -72,27 +72,38 @@ Davis, CA 95616, USA - - - + + + + + - + + + - + + + + + + - + + + diff --git a/data_model/1.4/clusters/WaterHeaterManagement.xml b/data_model/1.4/clusters/WaterHeaterManagement.xml index 6193fe7eee70ed..38901b77f6a91b 100644 --- a/data_model/1.4/clusters/WaterHeaterManagement.xml +++ b/data_model/1.4/clusters/WaterHeaterManagement.xml @@ -103,7 +103,9 @@ Davis, CA 95616, USA - + + + @@ -122,7 +124,9 @@ Davis, CA 95616, USA - + + + @@ -138,7 +142,11 @@ Davis, CA 95616, USA - + + + + + @@ -163,7 +171,9 @@ Davis, CA 95616, USA - + + + @@ -171,7 +181,8 @@ Davis, CA 95616, USA - + + diff --git a/data_model/1.4/clusters/WiFiNetworkManagement.xml b/data_model/1.4/clusters/WiFiNetworkManagement.xml index 59a11866f0edef..e79ed03b364052 100644 --- a/data_model/1.4/clusters/WiFiNetworkManagement.xml +++ b/data_model/1.4/clusters/WiFiNetworkManagement.xml @@ -70,7 +70,12 @@ Davis, CA 95616, USA - + + + + + + @@ -87,7 +92,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/WindowCovering.xml b/data_model/1.4/clusters/WindowCovering.xml index f421678aad0c02..0f1026b5a94472 100644 --- a/data_model/1.4/clusters/WindowCovering.xml +++ b/data_model/1.4/clusters/WindowCovering.xml @@ -407,7 +407,9 @@ Davis, CA 95616, USA - + + + @@ -441,9 +443,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -456,9 +460,11 @@ Davis, CA 95616, USA - - - + + + + + @@ -479,7 +485,9 @@ Davis, CA 95616, USA - + + + @@ -530,7 +538,9 @@ Davis, CA 95616, USA - + + + @@ -541,7 +551,9 @@ Davis, CA 95616, USA - + + + @@ -552,7 +564,9 @@ Davis, CA 95616, USA - + + + @@ -564,7 +578,9 @@ Davis, CA 95616, USA - + + + @@ -576,7 +592,9 @@ Davis, CA 95616, USA - + + + @@ -588,7 +606,9 @@ Davis, CA 95616, USA - + + + @@ -600,7 +620,9 @@ Davis, CA 95616, USA - + + + @@ -626,7 +648,9 @@ Davis, CA 95616, USA - + + + @@ -652,7 +676,9 @@ Davis, CA 95616, USA - + + + @@ -670,7 +696,9 @@ Davis, CA 95616, USA - + + + @@ -683,7 +711,9 @@ Davis, CA 95616, USA - + + + @@ -701,7 +731,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml b/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml index 868c40de2dacf2..8eae552fd2681d 100644 --- a/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml +++ b/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml @@ -166,8 +166,12 @@ Davis, CA 95616, USA - - + + + + + + @@ -177,7 +181,12 @@ Davis, CA 95616, USA - + + + + + + @@ -189,8 +198,12 @@ Davis, CA 95616, USA - - + + + + + + @@ -198,7 +211,9 @@ Davis, CA 95616, USA - + + + @@ -207,18 +222,24 @@ Davis, CA 95616, USA - + + + - + + + - + + + diff --git a/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml b/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml index b9847f4f417593..357b468f20f102 100644 --- a/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml +++ b/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml @@ -78,13 +78,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -95,7 +99,9 @@ Davis, CA 95616, USA - + + + @@ -105,13 +111,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -122,49 +132,74 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + + + + - + + + + + + - + + + - + + + - + + + - + + + @@ -179,7 +214,9 @@ Davis, CA 95616, USA - + + + @@ -195,13 +232,17 @@ Davis, CA 95616, USA - + + + - + + + @@ -215,7 +256,12 @@ Davis, CA 95616, USA - + + + + + + @@ -246,7 +292,9 @@ Davis, CA 95616, USA - + + + diff --git a/data_model/1.4/device_types/Aggregator.xml b/data_model/1.4/device_types/Aggregator.xml index 7e940b075a9694..76e872f300cf41 100644 --- a/data_model/1.4/device_types/Aggregator.xml +++ b/data_model/1.4/device_types/Aggregator.xml @@ -75,7 +75,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/BaseDeviceType.xml b/data_model/1.4/device_types/BaseDeviceType.xml index 676f12eec91548..306da33a72530b 100644 --- a/data_model/1.4/device_types/BaseDeviceType.xml +++ b/data_model/1.4/device_types/BaseDeviceType.xml @@ -54,20 +54,52 @@ This notice and disclaimer must be included on all copies of this document. Connectivity Standards Alliance 508 Second Street, Suite 206 Davis, CA 95616, USA + +:xrefstyle: basic --> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/data_model/1.4/device_types/BasicVideoPlayer.xml b/data_model/1.4/device_types/BasicVideoPlayer.xml index 79f2f4773ef153..9f33fedddf59ec 100644 --- a/data_model/1.4/device_types/BasicVideoPlayer.xml +++ b/data_model/1.4/device_types/BasicVideoPlayer.xml @@ -87,7 +87,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/BridgedNode.xml b/data_model/1.4/device_types/BridgedNode.xml index 1b308650c807ee..a459834e59e0a5 100644 --- a/data_model/1.4/device_types/BridgedNode.xml +++ b/data_model/1.4/device_types/BridgedNode.xml @@ -86,13 +86,13 @@ Davis, CA 95616, USA - + - + diff --git a/data_model/1.4/device_types/CastingVideoPlayer.xml b/data_model/1.4/device_types/CastingVideoPlayer.xml index 77e5f5725a80e1..934717e7609127 100644 --- a/data_model/1.4/device_types/CastingVideoPlayer.xml +++ b/data_model/1.4/device_types/CastingVideoPlayer.xml @@ -88,7 +88,7 @@ Davis, CA 95616, USA - + @@ -105,7 +105,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/ColorTemperatureLight.xml b/data_model/1.4/device_types/ColorTemperatureLight.xml index 4e7a37ac8c665b..ddd435ade1f885 100644 --- a/data_model/1.4/device_types/ColorTemperatureLight.xml +++ b/data_model/1.4/device_types/ColorTemperatureLight.xml @@ -97,13 +97,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/ContentApp.xml b/data_model/1.4/device_types/ContentApp.xml index c32856e567f2d9..95f74796d7cc99 100644 --- a/data_model/1.4/device_types/ContentApp.xml +++ b/data_model/1.4/device_types/ContentApp.xml @@ -69,7 +69,7 @@ Davis, CA 95616, USA - + @@ -103,7 +103,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/DeviceEnergyManagement.xml b/data_model/1.4/device_types/DeviceEnergyManagement.xml index ae832a8330a8c6..fe221e6305c7c8 100644 --- a/data_model/1.4/device_types/DeviceEnergyManagement.xml +++ b/data_model/1.4/device_types/DeviceEnergyManagement.xml @@ -80,7 +80,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/DimmableLight.xml b/data_model/1.4/device_types/DimmableLight.xml index 7d6fdd016aad20..f6e4f0f7b5b69e 100644 --- a/data_model/1.4/device_types/DimmableLight.xml +++ b/data_model/1.4/device_types/DimmableLight.xml @@ -96,13 +96,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/DimmablePlug-InUnit.xml b/data_model/1.4/device_types/DimmablePlug-InUnit.xml index bf49f0cc471c7f..a9ea86df3f0e5e 100644 --- a/data_model/1.4/device_types/DimmablePlug-InUnit.xml +++ b/data_model/1.4/device_types/DimmablePlug-InUnit.xml @@ -97,13 +97,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/ExtendedColorLight.xml b/data_model/1.4/device_types/ExtendedColorLight.xml index 0c6a880d1f8549..1962407075052d 100644 --- a/data_model/1.4/device_types/ExtendedColorLight.xml +++ b/data_model/1.4/device_types/ExtendedColorLight.xml @@ -97,13 +97,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/MountedDimmableLoadControl.xml b/data_model/1.4/device_types/MountedDimmableLoadControl.xml index d282009d99f867..48f496ceeeddce 100644 --- a/data_model/1.4/device_types/MountedDimmableLoadControl.xml +++ b/data_model/1.4/device_types/MountedDimmableLoadControl.xml @@ -94,13 +94,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/MountedOnOffControl.xml b/data_model/1.4/device_types/MountedOnOffControl.xml index 2a6b568889df9b..f1e6828b85d3ac 100644 --- a/data_model/1.4/device_types/MountedOnOffControl.xml +++ b/data_model/1.4/device_types/MountedOnOffControl.xml @@ -94,13 +94,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/OnOffLight.xml b/data_model/1.4/device_types/OnOffLight.xml index ce841e89775ee2..345eacdedbed9f 100644 --- a/data_model/1.4/device_types/OnOffLight.xml +++ b/data_model/1.4/device_types/OnOffLight.xml @@ -96,13 +96,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/OnOffPlug-inUnit.xml b/data_model/1.4/device_types/OnOffPlug-inUnit.xml index b8bc8bc5c6987e..4fed5e744ef154 100644 --- a/data_model/1.4/device_types/OnOffPlug-inUnit.xml +++ b/data_model/1.4/device_types/OnOffPlug-inUnit.xml @@ -96,13 +96,22 @@ Davis, CA 95616, USA - + + + + + + - + + + - + + + diff --git a/data_model/1.4/device_types/RootNodeDeviceType.xml b/data_model/1.4/device_types/RootNodeDeviceType.xml index 304c62b10ec8d4..fd8f2bf654bb91 100644 --- a/data_model/1.4/device_types/RootNodeDeviceType.xml +++ b/data_model/1.4/device_types/RootNodeDeviceType.xml @@ -75,7 +75,7 @@ Davis, CA 95616, USA - + @@ -116,7 +116,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/device_types/TemperatureControlledCabinet.xml b/data_model/1.4/device_types/TemperatureControlledCabinet.xml index 45e7f43df144b0..b8e1b9a8fa1dc7 100644 --- a/data_model/1.4/device_types/TemperatureControlledCabinet.xml +++ b/data_model/1.4/device_types/TemperatureControlledCabinet.xml @@ -71,7 +71,7 @@ Davis, CA 95616, USA - + @@ -84,7 +84,7 @@ Davis, CA 95616, USA - + @@ -99,7 +99,7 @@ Davis, CA 95616, USA - + diff --git a/data_model/1.4/namespaces/Namespace-Common-Area.xml b/data_model/1.4/namespaces/Namespace-Common-Area.xml new file mode 100644 index 00000000000000..db1f9a69627a0b --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Area.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + Also known as Restroom + + + + + A small room typically used for storage + + + + + + + + + + + + + A small, comfortable room for individual activities such as work or hobbies + + + + + + + + A bathroom directly accessible from a bedroom + + + + + + + + + + + + + + Also known as Guest Restroom + + + + + + + A cozy room containing a fireplace or other point heat source + + + + + + + + + + + + A space used to remove soiled garments prior to entering the domicile proper + + + + + + + + AKA a larder, a place where food is stored + + + + + + + + + + + + + + + + A utility space for cleaning dishes and laundry + + + + + + + + An informal space meant to be 'cozy', 'snug', relaxed, meant to share with family or friends + + + + + + + + + + + + A room dedicated to a toilet; a water closet / WC + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Closure.xml b/data_model/1.4/namespaces/Namespace-Common-Closure.xml new file mode 100644 index 00000000000000..6cc806308e300b --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Closure.xml @@ -0,0 +1,72 @@ + + + + + + Move toward open position + + + Move toward closed position + + + Stop any movement + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-CompassDirection.xml b/data_model/1.4/namespaces/Namespace-Common-CompassDirection.xml new file mode 100644 index 00000000000000..7366ae2da3cc7d --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-CompassDirection.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-CompassLocation.xml b/data_model/1.4/namespaces/Namespace-Common-CompassLocation.xml new file mode 100644 index 00000000000000..8623edf70ea09a --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-CompassLocation.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Direction.xml b/data_model/1.4/namespaces/Namespace-Common-Direction.xml new file mode 100644 index 00000000000000..8d888f32a1faaf --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Direction.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Landmark.xml b/data_model/1.4/namespaces/Namespace-Common-Landmark.xml new file mode 100644 index 00000000000000..c81c7e35bdd737 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Landmark.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Level.xml b/data_model/1.4/namespaces/Namespace-Common-Level.xml new file mode 100644 index 00000000000000..fb709116e8a788 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Level.xml @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Location.xml b/data_model/1.4/namespaces/Namespace-Common-Location.xml new file mode 100644 index 00000000000000..fce22bcb5126d8 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Location.xml @@ -0,0 +1,75 @@ + + + + + + Element is indoors or related to indoor equipment/conditions (e.g. the "indoor" temperature). + + + Element is outdoors or related to outdoor equipment/conditions (e.g. the "outdoor" temperature). + + + Element is located inside the equipment (e.g. a sensor "inside" a cabinet). + + + Element is located outside the equipment (e.g. a sensor "outside" a cabinet) + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-Number.xml b/data_model/1.4/namespaces/Namespace-Common-Number.xml new file mode 100644 index 00000000000000..53917dcb9cc42f --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-Number.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Common-RelativePosition.xml b/data_model/1.4/namespaces/Namespace-Common-RelativePosition.xml new file mode 100644 index 00000000000000..239229197b71a0 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Common-RelativePosition.xml @@ -0,0 +1,74 @@ + + + + + + + Area in proximity to the point of reference + + + The area surrounding the point the reference + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-ElectricalMeasurement.xml b/data_model/1.4/namespaces/Namespace-ElectricalMeasurement.xml new file mode 100644 index 00000000000000..84f8a192d8b485 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-ElectricalMeasurement.xml @@ -0,0 +1,78 @@ + + + + + + Indicates values measured for a DC load + + + Indicates values measured for a single-phase AC load, or values measured for the collective load on a polyphase AC power supply + + + Indicates values measured for an AC load on phase 1 of a polyphase power supply + + + Indicates values measured for an AC load on phase 2 of a polyphase power supply + + + Indicates values measured for an AC load on phase 3 of a polyphase power supply + + + diff --git a/data_model/1.4/namespaces/Namespace-Laundry.xml b/data_model/1.4/namespaces/Namespace-Laundry.xml new file mode 100644 index 00000000000000..5922e66b6b1d4d --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Laundry.xml @@ -0,0 +1,67 @@ + + + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-PowerSource.xml b/data_model/1.4/namespaces/Namespace-PowerSource.xml new file mode 100644 index 00000000000000..37523a1a8b0bda --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-PowerSource.xml @@ -0,0 +1,78 @@ + + + + + + The Power Source cluster is related to power provided from an unknown source + + + The Power Source cluster is related to power provided from the electrical grid + + + The Power Source cluster is related to power provided from a solar panel array + + + The Power Source cluster is related to power provided from a battery + + + The Power Source cluster is related to power provided from an electric vehicle + + + diff --git a/data_model/1.4/namespaces/Namespace-Refrigerator.xml b/data_model/1.4/namespaces/Namespace-Refrigerator.xml new file mode 100644 index 00000000000000..d823a0016cc4e7 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Refrigerator.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-RoomAirConditioner.xml b/data_model/1.4/namespaces/Namespace-RoomAirConditioner.xml new file mode 100644 index 00000000000000..9697586acf19f5 --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-RoomAirConditioner.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/1.4/namespaces/Namespace-Switches.xml b/data_model/1.4/namespaces/Namespace-Switches.xml new file mode 100644 index 00000000000000..2f1fffa1f78e7f --- /dev/null +++ b/data_model/1.4/namespaces/Namespace-Switches.xml @@ -0,0 +1,82 @@ + + + + + + + + + e.g. dim up (light) + + + e.g. dim down (light) + + + e.g. select next scene + + + e.g. select previous scene + + + + Textual description provided in Label field + + + diff --git a/data_model/1.4/scraper_version b/data_model/1.4/scraper_version index 0705c7f52f2253..797198e1799862 100644 --- a/data_model/1.4/scraper_version +++ b/data_model/1.4/scraper_version @@ -1 +1 @@ -alchemy version: 1.5.0 (585e1dc) +alchemy version: 1.5.4 (404bf4f) diff --git a/data_model/master/clusters/ThreadBorderRouterDiagnostics.xml b/data_model/master/clusters/ThreadBorderRouterDiagnostics.xml new file mode 100644 index 00000000000000..a62d41572ccad2 --- /dev/null +++ b/data_model/master/clusters/ThreadBorderRouterDiagnostics.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-Area.xml b/data_model/master/namespaces/Namespace-Common-Area.xml new file mode 100644 index 00000000000000..60dab7a443c4ca --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Area.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + Also known as Restroom + + + + + A small room typically used for storage + + + + + + + A small room for storing clothing, linens, and other items. + + + + + + + + A small, comfortable room for individual activities such as work or hobbies + + + + + + + + A bathroom directly accessible from a bedroom + + + + + + + + + + + + + + Also known as Guest Restroom + + + + Also known as Guest Bedroom + + + + + A cozy room containing a fireplace or other point heat source + + + + + + + + + + + + A space used to remove soiled garments prior to entering the domicile proper + + + + + + + + AKA a larder, a place where food is stored + + + + + + + A room centered around a pool/billiards table + + + + + + + + + + + A utility space for cleaning dishes and laundry + + + + + + + + An informal space meant to be 'cozy', 'snug', relaxed, meant to share with family or friends + + + + + + + + + + + + + The innermost area of a large home + + + + A room dedicated to a toilet; a water closet / WC + + + diff --git a/data_model/master/namespaces/Namespace-Common-Closure.xml b/data_model/master/namespaces/Namespace-Common-Closure.xml new file mode 100644 index 00000000000000..6cc806308e300b --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Closure.xml @@ -0,0 +1,72 @@ + + + + + + Move toward open position + + + Move toward closed position + + + Stop any movement + + + diff --git a/data_model/master/namespaces/Namespace-Common-CompassDirection.xml b/data_model/master/namespaces/Namespace-Common-CompassDirection.xml new file mode 100644 index 00000000000000..7366ae2da3cc7d --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-CompassDirection.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-CompassLocation.xml b/data_model/master/namespaces/Namespace-Common-CompassLocation.xml new file mode 100644 index 00000000000000..8623edf70ea09a --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-CompassLocation.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-Direction.xml b/data_model/master/namespaces/Namespace-Common-Direction.xml new file mode 100644 index 00000000000000..8d888f32a1faaf --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Direction.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-Landmark.xml b/data_model/master/namespaces/Namespace-Common-Landmark.xml new file mode 100644 index 00000000000000..5df0a292c1f66a --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Landmark.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An indoor furnishing for pets to rest or sleep inside + + + + + + An area where a showerhead dispenses water for people to shower + + + + + + + + + + + + A type of refrigerator that is shelved to hold wine bottles and (typically) display them through a glass front + + + diff --git a/data_model/master/namespaces/Namespace-Common-Level.xml b/data_model/master/namespaces/Namespace-Common-Level.xml new file mode 100644 index 00000000000000..fb709116e8a788 --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Level.xml @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-Location.xml b/data_model/master/namespaces/Namespace-Common-Location.xml new file mode 100644 index 00000000000000..fce22bcb5126d8 --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Location.xml @@ -0,0 +1,75 @@ + + + + + + Element is indoors or related to indoor equipment/conditions (e.g. the "indoor" temperature). + + + Element is outdoors or related to outdoor equipment/conditions (e.g. the "outdoor" temperature). + + + Element is located inside the equipment (e.g. a sensor "inside" a cabinet). + + + Element is located outside the equipment (e.g. a sensor "outside" a cabinet) + + + diff --git a/data_model/master/namespaces/Namespace-Common-Number.xml b/data_model/master/namespaces/Namespace-Common-Number.xml new file mode 100644 index 00000000000000..53917dcb9cc42f --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-Number.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Common-RelativePosition.xml b/data_model/master/namespaces/Namespace-Common-RelativePosition.xml new file mode 100644 index 00000000000000..239229197b71a0 --- /dev/null +++ b/data_model/master/namespaces/Namespace-Common-RelativePosition.xml @@ -0,0 +1,74 @@ + + + + + + + Area in proximity to the point of reference + + + The area surrounding the point the reference + + + + + + + diff --git a/data_model/master/namespaces/Namespace-ElectricalMeasurement.xml b/data_model/master/namespaces/Namespace-ElectricalMeasurement.xml new file mode 100644 index 00000000000000..84f8a192d8b485 --- /dev/null +++ b/data_model/master/namespaces/Namespace-ElectricalMeasurement.xml @@ -0,0 +1,78 @@ + + + + + + Indicates values measured for a DC load + + + Indicates values measured for a single-phase AC load, or values measured for the collective load on a polyphase AC power supply + + + Indicates values measured for an AC load on phase 1 of a polyphase power supply + + + Indicates values measured for an AC load on phase 2 of a polyphase power supply + + + Indicates values measured for an AC load on phase 3 of a polyphase power supply + + + diff --git a/data_model/master/namespaces/Namespace-EnergyTariff-Chronology.xml b/data_model/master/namespaces/Namespace-EnergyTariff-Chronology.xml new file mode 100644 index 00000000000000..294d04b15d437c --- /dev/null +++ b/data_model/master/namespaces/Namespace-EnergyTariff-Chronology.xml @@ -0,0 +1,72 @@ + + + + + + Represents the current energy tariff + + + Represents the previous energy tariff + + + Represents the upcoming energy tariff + + + diff --git a/data_model/master/namespaces/Namespace-EnergyTariff-Commodity.xml b/data_model/master/namespaces/Namespace-EnergyTariff-Commodity.xml new file mode 100644 index 00000000000000..c311ddfbc5fe53 --- /dev/null +++ b/data_model/master/namespaces/Namespace-EnergyTariff-Commodity.xml @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-EnergyTariff-Flow.xml b/data_model/master/namespaces/Namespace-EnergyTariff-Flow.xml new file mode 100644 index 00000000000000..019eef1729445f --- /dev/null +++ b/data_model/master/namespaces/Namespace-EnergyTariff-Flow.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Laundry.xml b/data_model/master/namespaces/Namespace-Laundry.xml new file mode 100644 index 00000000000000..5922e66b6b1d4d --- /dev/null +++ b/data_model/master/namespaces/Namespace-Laundry.xml @@ -0,0 +1,67 @@ + + + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-PowerSource.xml b/data_model/master/namespaces/Namespace-PowerSource.xml new file mode 100644 index 00000000000000..37523a1a8b0bda --- /dev/null +++ b/data_model/master/namespaces/Namespace-PowerSource.xml @@ -0,0 +1,78 @@ + + + + + + The Power Source cluster is related to power provided from an unknown source + + + The Power Source cluster is related to power provided from the electrical grid + + + The Power Source cluster is related to power provided from a solar panel array + + + The Power Source cluster is related to power provided from a battery + + + The Power Source cluster is related to power provided from an electric vehicle + + + diff --git a/data_model/master/namespaces/Namespace-Refrigerator.xml b/data_model/master/namespaces/Namespace-Refrigerator.xml new file mode 100644 index 00000000000000..d823a0016cc4e7 --- /dev/null +++ b/data_model/master/namespaces/Namespace-Refrigerator.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-RoomAirConditioner.xml b/data_model/master/namespaces/Namespace-RoomAirConditioner.xml new file mode 100644 index 00000000000000..9697586acf19f5 --- /dev/null +++ b/data_model/master/namespaces/Namespace-RoomAirConditioner.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/data_model/master/namespaces/Namespace-Switches.xml b/data_model/master/namespaces/Namespace-Switches.xml new file mode 100644 index 00000000000000..2f1fffa1f78e7f --- /dev/null +++ b/data_model/master/namespaces/Namespace-Switches.xml @@ -0,0 +1,82 @@ + + + + + + + + + e.g. dim up (light) + + + e.g. dim down (light) + + + e.g. select next scene + + + e.g. select previous scene + + + + Textual description provided in Label field + + + diff --git a/data_model/master/scraper_version b/data_model/master/scraper_version index 03d9cee03ac4d6..797198e1799862 100644 --- a/data_model/master/scraper_version +++ b/data_model/master/scraper_version @@ -1 +1 @@ -alchemy version: 1.5.2 (4717a32) +alchemy version: 1.5.4 (404bf4f) diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py index 48f75b87985107..b116880422c22f 100755 --- a/scripts/spec_xml/generate_spec_xml.py +++ b/scripts/spec_xml/generate_spec_xml.py @@ -125,6 +125,7 @@ def scrape_all(scraper, spec_root, output_dir, dry_run, include_in_progress): cluster_out = make_asciidoc('pdf-appclusters-book', include_in_progress, spec_root, dry_run) print('Generating device type library to get file include list - this may take a few minutes') device_type_files = make_asciidoc('pdf-devicelibrary-book', include_in_progress, spec_root, dry_run) + namespace_files = make_asciidoc('pdf-standardnamespaces-book', include_in_progress, spec_root, dry_run) cluster_files = main_out + cluster_out cmd = [scraper, 'dm', '--dmRoot', output_dir, '--specRoot', spec_root] @@ -142,6 +143,7 @@ def scrape_all(scraper, spec_root, output_dir, dry_run, include_in_progress): # Remove all the files that weren't compiled into the spec clusters_output_dir = os.path.join(output_dir, 'clusters') device_types_output_dir = os.path.abspath(os.path.join(output_dir, 'device_types')) + namespaces_output_dir = os.path.abspath(os.path.join(output_dir, 'namespaces')) for filename in os.listdir(clusters_output_dir): # There are a couple of clusters that appear in the same adoc file and they have prefixes. # Look for these specifically. @@ -162,6 +164,12 @@ def scrape_all(scraper, spec_root, output_dir, dry_run, include_in_progress): print(f'Removing {adoc} as it was not in the generated spec document') os.remove(os.path.join(device_types_output_dir, filename)) + for filename in os.listdir(namespaces_output_dir): + adoc = os.path.basename(filename).replace('.xml', '.adoc') + if adoc not in namespace_files: + print(f'Removing {adoc} as it was not in the generated spec document') + os.remove(os.path.join(namespaces_output_dir, filename)) + def scrape_clusters(scraper, spec_root, output_dir, dry_run, include_in_progress): src_dir = os.path.abspath(os.path.join(spec_root, 'src')) diff --git a/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni b/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni index d9b0fc256e6159..99dbbc856cfcfb 100644 --- a/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni +++ b/src/python_testing/matter_testing_infrastructure/data_model_xmls.gni @@ -371,6 +371,22 @@ data_model_XMLS_1_4 = [ "${chip_root}/data_model/1.4/device_types/WaterValve.xml", "${chip_root}/data_model/1.4/device_types/WindowCovering.xml", "${chip_root}/data_model/1.4/device_types/WindowCoveringController.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Area.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Closure.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-CompassDirection.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-CompassLocation.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Direction.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Landmark.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Level.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Location.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-Number.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Common-RelativePosition.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-ElectricalMeasurement.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Laundry.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-PowerSource.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Refrigerator.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-RoomAirConditioner.xml", + "${chip_root}/data_model/1.4/namespaces/Namespace-Switches.xml", ] data_model_XMLS_1_4_1 = [ @@ -558,6 +574,22 @@ data_model_XMLS_1_4_1 = [ "${chip_root}/data_model/1.4.1/device_types/WaterValve.xml", "${chip_root}/data_model/1.4.1/device_types/WindowCovering.xml", "${chip_root}/data_model/1.4.1/device_types/WindowCoveringController.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Area.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Closure.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-CompassDirection.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-CompassLocation.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Direction.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Landmark.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Level.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Location.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-Number.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Common-RelativePosition.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-ElectricalMeasurement.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Laundry.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-PowerSource.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Refrigerator.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-RoomAirConditioner.xml", + "${chip_root}/data_model/1.4.1/namespaces/Namespace-Switches.xml", ] data_model_XMLS_master = [ @@ -671,6 +703,7 @@ data_model_XMLS_master = [ "${chip_root}/data_model/master/clusters/TemperatureMeasurement.xml", "${chip_root}/data_model/master/clusters/Thermostat.xml", "${chip_root}/data_model/master/clusters/ThermostatUserInterfaceConfiguration.xml", + "${chip_root}/data_model/master/clusters/ThreadBorderRouterDiagnostics.xml", "${chip_root}/data_model/master/clusters/ThreadBorderRouterManagement.xml", "${chip_root}/data_model/master/clusters/ThreadNetworkDirectory.xml", "${chip_root}/data_model/master/clusters/TimeSync.xml", @@ -786,4 +819,23 @@ data_model_XMLS_master = [ "${chip_root}/data_model/master/device_types/WaterValve.xml", "${chip_root}/data_model/master/device_types/WindowCovering.xml", "${chip_root}/data_model/master/device_types/WindowCoveringController.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Area.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Closure.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-CompassDirection.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-CompassLocation.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Direction.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Landmark.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Level.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Location.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-Number.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Common-RelativePosition.xml", + "${chip_root}/data_model/master/namespaces/Namespace-ElectricalMeasurement.xml", + "${chip_root}/data_model/master/namespaces/Namespace-EnergyTariff-Chronology.xml", + "${chip_root}/data_model/master/namespaces/Namespace-EnergyTariff-Commodity.xml", + "${chip_root}/data_model/master/namespaces/Namespace-EnergyTariff-Flow.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Laundry.xml", + "${chip_root}/data_model/master/namespaces/Namespace-PowerSource.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Refrigerator.xml", + "${chip_root}/data_model/master/namespaces/Namespace-RoomAirConditioner.xml", + "${chip_root}/data_model/master/namespaces/Namespace-Switches.xml", ]