Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add definitions for common HomeLocationStruct and types - see connect… #33569

Merged
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0a7ecbd
Add definitions for common HomeLocationStruct and types - see connect…
johnfierke May 22, 2024
08219ee
Fix Carport typo, remove IsGroundFloor field (spec change)
johnfierke May 23, 2024
b6bcd68
Update home location definitions per spec PR 8933 commit f04958166412…
johnfierke May 25, 2024
893333d
update generated files
johnfierke May 25, 2024
6f74d9d
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 3, 2024
8aaa2dc
Regenerated zap files after merge.
hicklin Jun 3, 2024
ca9d207
Moved the AreaTypeTag namespace definition to namespaces.xml.
hicklin Jun 3, 2024
9837b22
Moved the HomeLoc global struct into global-sturcts.xml.
hicklin Jun 3, 2024
71e6931
Updated the AreaTypeTag namespace to match the latest spec definition.
hicklin Jun 3, 2024
def38fc
Updated the AreaTypeTag namespace to match the latest spec definition.
hicklin Jun 3, 2024
d132cfb
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 3, 2024
3811e36
Updated the matterlint rules with the changes in the xml files.
hicklin Jun 3, 2024
568eb3f
Reverted changes to the rvc zap file.
hicklin Jun 3, 2024
a562e2b
Addded global xml files to relevant lists of xmls.
hicklin Jun 3, 2024
7d61a65
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 4, 2024
7d60124
Added the Position, Landmark and Floor Surface Namespaces.
hicklin Jun 4, 2024
abad92f
Explicitly set the conformance.
hicklin Jun 7, 2024
b827762
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 7, 2024
a9012f1
Added github issue to a comment.
hicklin Jun 18, 2024
b343f80
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 18, 2024
f6816f9
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 20, 2024
8fe8493
Renamed namespaces.xml to semantic-tag-namespace-enums.xml.
hicklin Jun 24, 2024
7d03706
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 24, 2024
12d2543
Missed some rename locations.
hicklin Jun 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
--log-level info \
src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
src/app/zap-templates/zcl/data-model/chip/namespaces.xml \
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml \
Expand Down
2 changes: 1 addition & 1 deletion scripts/rules.matterlint
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/namespaces.xml";
load "../src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml";
load "../src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml";
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/all.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<xi:include href="chip/messages-cluster.xml" />
<xi:include href="chip/mode-base-cluster.xml" />
<xi:include href="chip/mode-select-cluster.xml" />
<xi:include href="chip/namespaces.xml" />
<xi:include href="chip/semantic-tag-namespace-enums.xml" />
<xi:include href="chip/network-commissioning-cluster.xml" />
<xi:include href="chip/occupancy-sensing-cluster.xml" />
<xi:include href="chip/onoff-cluster.xml" />
Expand Down
7 changes: 4 additions & 3 deletions src/app/zap-templates/zcl/data-model/chip/global-structs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ limitations under the License.
<!--
TODO: Make these structures global rather than defining them for each cluster.
This depends on the ability to define global structs via XML tags.
see: https://github.com/project-chip/connectedhomeip/issues/29818
-->

<configurator>
Expand All @@ -26,8 +27,8 @@ TODO: Make these structures global rather than defining them for each cluster.
<cluster code="0x0150"/> <!-- Service Area Cluster -->
<!-- TODO: add Basic Information Cluster code="0x0028" -->

<item fieldId="0" name="LocationName" type="char_string" length="128" isNullable="false"/>
<item fieldId="1" name="FloorNumber" type="int16s" isNullable="true"/>
<item fieldId="2" name="AreaType" type="AreaTypeTag" isNullable="true"/>
<item fieldId="0" name="LocationName" type="char_string" length="128" isNullable="false" optional="false"/>
<item fieldId="1" name="FloorNumber" type="int16s" isNullable="true" optional="false"/>
<item fieldId="2" name="AreaType" type="AreaTypeTag" isNullable="true" optional="false"/>
</struct>
</configurator>
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,29 @@ limitations under the License.
<!--
TODO: Make these namespace enums global rather than defining them for each cluster.
This depends on the ability to define global enums via XML tags.
See issue [#29818](https://github.com/project-chip/connectedhomeip/issues/29818).
-->


<configurator>
<enum name="PositionTag" type="enum8">
<cluster code="0x0150"/>
<item value="0x00" name="Left"/>
<item value="0x01" name="Right"/>
<item value="0x02" name="Top"/>
<item value="0x03" name="Bottom"/>
<item value="0x04" name="Middle"/>
<item value="0x05" name="Row"/>
<item value="0x06" name="Column"/>
<item value="0x07" name="Under"/>
<item value="0x08" name="Next To"/>
<item value="0x09" name="Around"/>
<item value="0x0A" name="On"/>
<item value="0x0B" name="Above"/>
<item value="0x0C" name="Front Of"/>
<item value="0x0D" name="Behind"/>
</enum>

<enum name="AreaTypeTag" type="enum8">
<cluster code="0x0150"/> <!-- Service Area Cluster -->
<!-- TODO: add Basic Information Cluster code="0x0028" -->
Expand Down Expand Up @@ -128,4 +147,93 @@ TODO: Make these namespace enums global rather than defining them for each clust
<item value="0x5D" name="Ward"/>
<item value="0x5E" name="Workshop"/>
</enum>

<enum name="LandmarkTag" type="enum8">
<cluster code="0x0150"/>
<item value="0x00" name="Air Conditioner"/>
<item value="0x01" name="Air Purifier"/>
<item value="0x02" name="Back Door"/>
<item value="0x03" name="Bar Stool"/>
<item value="0x04" name="Bath Mat"/>
<item value="0x05" name="Bathtub"/>
<item value="0x06" name="Bed"/>
<item value="0x07" name="Bookshelf"/>
<item value="0x08" name="Chair"/>
<item value="0x09" name="Christmas Tree"/>
<item value="0x0A" name="Coat Rack"/>
<item value="0x0B" name="Coffee Table"/>
<item value="0x0C" name="Cooking Range"/>
<item value="0x0D" name="Couch"/>
<item value="0x0E" name="Countertop"/>
<item value="0x0F" name="Cradle"/>

<item value="0x10" name="Crib"/>
<item value="0x11" name="Desk"/>
<item value="0x12" name="Dining Table"/>
<item value="0x13" name="Dishwasher"/>
<item value="0x14" name="Door"/>
<item value="0x15" name="Dresser"/>
<item value="0x16" name="Laundry Dryer"/>
<item value="0x17" name="Fan"/>
<item value="0x18" name="Fireplace"/>
<item value="0x19" name="Freezer"/>
<item value="0x1A" name="Front Door"/>
<item value="0x1B" name="High Chair"/>
<item value="0x1C" name="Kitchen Island"/>
<item value="0x1D" name="Lamp"/>
<item value="0x1E" name="Litter Box"/>
<item value="0x1F" name="Mirror"/>

<item value="0x20" name="Nightstand"/>
<item value="0x21" name="Oven"/>
<item value="0x22" name="Pet Bed"/>
<item value="0x23" name="Pet Bowl"/>
<item value="0x24" name="Pet Crate"/>
<item value="0x25" name="Refrigerator"/>
<item value="0x26" name="Scratching Post"/>
<item value="0x27" name="Shoe Rack"/>
<item value="0x28" name="Shower"/>
<item value="0x29" name="Side Door"/>
<item value="0x2A" name="Sink"/>
<item value="0x2B" name="Sofa"/>
<item value="0x2C" name="Stove"/>
<item value="0x2D" name="Table"/>
<item value="0x2E" name="Toilet"/>
<item value="0x2F" name="Trash Can"/>

<item value="0x30" name="Laundry Washer"/>
<item value="0x31" name="Window"/>
<item value="0x32" name="Wine Cooler"/>
</enum>

<enum name="FloorSurfaceTag" type="enum8">
<cluster code="0x0150"/>
<item value="0x00" name="Carpet"/>
<item value="0x01" name="Ceramic"/>
<item value="0x02" name="Concrete"/>
<item value="0x03" name="Cork"/>
<item value="0x04" name="Deep Carpet"/>
<item value="0x05" name="Dirt"/>
<item value="0x06" name="Engineered Wood"/>
<item value="0x07" name="Glass"/>
<item value="0x08" name="Grass"/>
<item value="0x09" name="Hardwood"/>
<item value="0x0A" name="Laminate"/>
<item value="0x0B" name="Linoleum"/>
<item value="0x0C" name="Mat"/>
<item value="0x0D" name="Metal"/>
<item value="0x0E" name="Plastic"/>
<item value="0x0F" name="Polished Concrete"/>

<item value="0x10" name="Rubber"/>
<item value="0x11" name="Rug"/>
<item value="0x12" name="Sand"/>
<item value="0x13" name="Stone"/>
<item value="0x14" name="Tatami"/>
<item value="0x15" name="Terrazzo"/>
<item value="0x16" name="Tile"/>
<item value="0x17" name="Vinyl"/>
</enum>


</configurator>
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"mode-base-cluster.xml",
"mode-select-cluster.xml",
"mode-select-extensions.xml",
"namespaces.xml",
"semantic-tag-namespace-enums.xml",
"network-commissioning-cluster.xml",
"occupancy-sensing-cluster.xml",
"onoff-cluster.xml",
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/zcl.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"messages-cluster.xml",
"mode-base-cluster.xml",
"mode-select-cluster.xml",
"namespaces.xml",
"semantic-tag-namespace-enums.xml",
"network-commissioning-cluster.xml",
"occupancy-sensing-cluster.xml",
"onoff-cluster.xml",
Expand Down
Loading