Skip to content

Semantic Tags: Tweaks to tags #4708

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.

Sign up for GitHub

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

Merged
holgerfriedrich merged 16 commits into from
Apr 13, 2025
+204 −114
Merged

Semantic Tags: Tweaks to tags #4708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ee2bc5
tweaks to Point and Property tags
andrewfg Apr 8, 2025
856d881
tweak
andrewfg Apr 8, 2025
ec624bd
run groovy script
andrewfg Apr 8, 2025
ff95dfd
add color property
andrewfg Apr 8, 2025
abeccf5
add alarm device
andrewfg Apr 8, 2025
1c50fd3
add cloud service and contact equipment tags
andrewfg Apr 10, 2025
85556ac
clean up open related tags
andrewfg Apr 10, 2025
f23bbaa
Oops remove cloudservice again.
andrewfg Apr 10, 2025
d0e9527
work in progress
andrewfg Apr 10, 2025
10ab973
work in progress
andrewfg Apr 10, 2025
0321e82
work in progress
andrewfg Apr 10, 2025
9fa771c
work in progress
andrewfg Apr 11, 2025
44c086d
add moisture property
andrewfg Apr 11, 2025
e3f15c9
adopt reviewer suggestions
andrewfg Apr 12, 2025
c48e5bf
delete a-or-b properties
andrewfg Apr 12, 2025
39afc7f
update with final version (again)
andrewfg Apr 13, 2025
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: 2 additions & 0 deletions bundles/org.openhab.core.semantics/model/SemanticTags.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ Equipment,Bed,,Bed,,
Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
Equipment,Camera,,Camera,Cameras,
Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
Equipment,CloudService,,Cloud Service,,
Equipment,Computer,,Computer,,
Equipment,Contact,,Contact,"Door Contact, Window Contact",
Equipment,ControlDevice,,Control Device,,
Equipment,Button,ControlDevice,Button,,
Equipment,Dial,ControlDevice,Dial,Rotary Dial,
Expand Down
2 changes: 2 additions & 0 deletions ....semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
defaultTags.add(DefaultSemanticTags.Equipment.CAMERA);
defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT);
defaultTags.add(DefaultSemanticTags.Equipment.CLOUD_SERVICE);
defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER);
defaultTags.add(DefaultSemanticTags.Equipment.CONTACT);
defaultTags.add(DefaultSemanticTags.Equipment.CONTROL_DEVICE);
defaultTags.add(DefaultSemanticTags.Equipment.BUTTON);
defaultTags.add(DefaultSemanticTags.Equipment.DIAL);
Expand Down
10 changes: 10 additions & 0 deletions ...ab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,11 +614,21 @@ public static class Equipment {
"Cleaning Robot", //
"", //
"Cleaning Robots, Vacuum robot, Vacuum robots");
public static final SemanticTag CLOUD_SERVICE = new SemanticTagImpl( //
"Equipment_CloudService", //
"Cloud Service", //
"", //
"");
public static final SemanticTag COMPUTER = new SemanticTagImpl( //
"Equipment_Computer", //
"Computer", //
"", //
"");
public static final SemanticTag CONTACT = new SemanticTagImpl( //
"Equipment_Contact", //
"Contact", //
"", //
"Door Contact, Window Contact");
public static final SemanticTag CONTROL_DEVICE = new SemanticTagImpl( //
"Equipment_ControlDevice", //
"Control Device", //
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.openhab.core.semantics/src/main/resources/tags.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ Equipment_Bed=Bed
Equipment_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
Equipment_Camera=Camera,Cameras
Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots
Equipment_CloudService=Cloud Service
Equipment_Computer=Computer
Equipment_Contact=Contact,Door Contact,Window Contact
Equipment_ControlDevice=Control Device
Equipment_ControlDevice_Button=Button
Equipment_ControlDevice_Dial=Dial,Rotary Dial
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,10 @@
<xs:enumeration value="Chandelier"/>
<xs:enumeration value="Chlorinator"/>
<xs:enumeration value="CleaningRobot"/>
<xs:enumeration value="CloudService"/>
<xs:enumeration value="CO2Sensor"/>
<xs:enumeration value="Computer"/>
<xs:enumeration value="Contact"/>
<xs:enumeration value="ControlDevice"/>
<xs:enumeration value="Cooktop"/>
<xs:enumeration value="COSensor"/>
Expand Down