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
Merged

Semantic Tags: Tweaks to tags #4708

Show file tree
Hide file tree
Changes from 6 commits
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
16 changes: 12 additions & 4 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 @@ -38,13 +38,10 @@ Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
Point,Alarm,,Alarm,,
Point,Control,,Control,,
Point,Switch,Control,Switch,,
Point,Forecast,,Forecast,,
Point,Measurement,,Measurement,,
Point,Setpoint,,Setpoint,,
Point,Status,,Status,,
Point,LowBattery,Status,LowBattery,,
Point,OpenLevel,Status,OpenLevel,,
Point,OpenState,Status,OpenState,,
Point,Tampered,Status,Tampered,,
Property,AirQuality,,Air Quality,,
Property,AQI,AirQuality,AQI,Air Quality Index,
Property,CO,AirQuality,CO,Carbon Monoxide,
Expand All @@ -59,6 +56,7 @@ Property,Airflow,,Airflow,,
Property,App,,App,Application,Software program
Property,Brightness,,Brightness,,
Property,Channel,,Channel,,
Property,Color,,Color,,
Property,ColorTemperature,,Color Temperature,,
Property,Current,,Current,,
Property,Duration,,Duration,,
Expand All @@ -70,14 +68,20 @@ Property,Humidity,,Humidity,Moisture,
Property,Illuminance,,Illuminance,,
Property,Level,,Level,,
Property,Light,,Light,"Lights, Lighting",
Property,LowBattery,,Low Battery,,
Property,MediaControl,,Media Control,,
Property,Mode,,Mode,,
Property,AutoManual,Mode,Auto Manual,,
Property,EnabledDisabled,Mode,Enabled Disabled,,
Property,Noise,,Noise,,
Property,Oil,,Oil,,
Property,OnOff,,On Off,,
Property,OpenClosed,,Open Closed,,
Property,OpenLevel,,Open Level,,
Property,OpenState,,Open State,,
Property,Opening,,Opening,,
Property,Position,,Position,,
Property,GeoLocation,Position,Geo Location,,
Property,Power,,Power,,
Property,Presence,,Presence,,
Property,Pressure,,Pressure,,
Expand All @@ -88,6 +92,7 @@ Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,
Property,Smoke,,Smoke,,
Property,SoundVolume,,Sound Volume,,
Property,Speed,,Speed,,
Property,Tampered,,Tampered,,
Property,Temperature,,Temperature,Temperatures,
Property,Tilt,,Tilt,,
Property,Timestamp,,Timestamp,,
Expand All @@ -97,6 +102,7 @@ Property,Vibration,,Vibration,,
Property,Voltage,,Voltage,,
Property,Water,,Water,,
Property,Wind,,Wind,,
Equipment,AlarmDevice,,Alarm Device,,
Equipment,AlarmSystem,,Alarm System,Alarm Systems,
Equipment,AudioVisual,,Audio Visual,,
Equipment,MediaPlayer,AudioVisual,Media Player,,
Expand All @@ -108,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
16 changes: 12 additions & 4 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 @@ -78,13 +78,10 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Point.ALARM);
defaultTags.add(DefaultSemanticTags.Point.CONTROL);
defaultTags.add(DefaultSemanticTags.Point.SWITCH);
defaultTags.add(DefaultSemanticTags.Point.FORECAST);
defaultTags.add(DefaultSemanticTags.Point.MEASUREMENT);
defaultTags.add(DefaultSemanticTags.Point.SETPOINT);
defaultTags.add(DefaultSemanticTags.Point.STATUS);
defaultTags.add(DefaultSemanticTags.Point.LOW_BATTERY);
defaultTags.add(DefaultSemanticTags.Point.OPEN_LEVEL);
defaultTags.add(DefaultSemanticTags.Point.OPEN_STATE);
defaultTags.add(DefaultSemanticTags.Point.TAMPERED);
defaultTags.add(DefaultSemanticTags.Property.AIR_QUALITY);
defaultTags.add(DefaultSemanticTags.Property.AQI);
defaultTags.add(DefaultSemanticTags.Property.CO);
Expand All @@ -99,6 +96,7 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Property.APP);
defaultTags.add(DefaultSemanticTags.Property.BRIGHTNESS);
defaultTags.add(DefaultSemanticTags.Property.CHANNEL);
defaultTags.add(DefaultSemanticTags.Property.COLOR);
defaultTags.add(DefaultSemanticTags.Property.COLOR_TEMPERATURE);
defaultTags.add(DefaultSemanticTags.Property.CURRENT);
defaultTags.add(DefaultSemanticTags.Property.DURATION);
Expand All @@ -110,14 +108,20 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE);
defaultTags.add(DefaultSemanticTags.Property.LEVEL);
defaultTags.add(DefaultSemanticTags.Property.LIGHT);
defaultTags.add(DefaultSemanticTags.Property.LOW_BATTERY);
defaultTags.add(DefaultSemanticTags.Property.MEDIA_CONTROL);
defaultTags.add(DefaultSemanticTags.Property.MODE);
defaultTags.add(DefaultSemanticTags.Property.AUTO_MANUAL);
defaultTags.add(DefaultSemanticTags.Property.ENABLED_DISABLED);
defaultTags.add(DefaultSemanticTags.Property.NOISE);
defaultTags.add(DefaultSemanticTags.Property.OIL);
defaultTags.add(DefaultSemanticTags.Property.ON_OFF);
defaultTags.add(DefaultSemanticTags.Property.OPEN_CLOSED);
defaultTags.add(DefaultSemanticTags.Property.OPEN_LEVEL);
defaultTags.add(DefaultSemanticTags.Property.OPEN_STATE);
defaultTags.add(DefaultSemanticTags.Property.OPENING);
defaultTags.add(DefaultSemanticTags.Property.POSITION);
defaultTags.add(DefaultSemanticTags.Property.GEO_LOCATION);
defaultTags.add(DefaultSemanticTags.Property.POWER);
defaultTags.add(DefaultSemanticTags.Property.PRESENCE);
defaultTags.add(DefaultSemanticTags.Property.PRESSURE);
Expand All @@ -128,6 +132,7 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Property.SMOKE);
defaultTags.add(DefaultSemanticTags.Property.SOUND_VOLUME);
defaultTags.add(DefaultSemanticTags.Property.SPEED);
defaultTags.add(DefaultSemanticTags.Property.TAMPERED);
defaultTags.add(DefaultSemanticTags.Property.TEMPERATURE);
defaultTags.add(DefaultSemanticTags.Property.TILT);
defaultTags.add(DefaultSemanticTags.Property.TIMESTAMP);
Expand All @@ -137,6 +142,7 @@ public DefaultSemanticTagProvider() {
defaultTags.add(DefaultSemanticTags.Property.VOLTAGE);
defaultTags.add(DefaultSemanticTags.Property.WATER);
defaultTags.add(DefaultSemanticTags.Property.WIND);
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE);
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM);
defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL);
defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER);
Expand All @@ -148,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
80 changes: 60 additions & 20 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 @@ -228,6 +228,11 @@ public static class Point {
"Switch", //
"", //
"");
public static final SemanticTag FORECAST = new SemanticTagImpl( //
"Point_Forecast", //
"Forecast", //
"", //
"");
public static final SemanticTag MEASUREMENT = new SemanticTagImpl( //
"Point_Measurement", //
"Measurement", //
Expand All @@ -243,26 +248,6 @@ public static class Point {
"Status", //
"", //
"");
public static final SemanticTag LOW_BATTERY = new SemanticTagImpl( //
"Point_Status_LowBattery", //
"LowBattery", //
"", //
"");
public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( //
"Point_Status_OpenLevel", //
"OpenLevel", //
"", //
"");
public static final SemanticTag OPEN_STATE = new SemanticTagImpl( //
"Point_Status_OpenState", //
"OpenState", //
"", //
"");
public static final SemanticTag TAMPERED = new SemanticTagImpl( //
"Point_Status_Tampered", //
"Tampered", //
"", //
"");
}

public static class Property {
Expand Down Expand Up @@ -336,6 +321,11 @@ public static class Property {
"Channel", //
"", //
"");
public static final SemanticTag COLOR = new SemanticTagImpl( //
"Property_Color", //
"Color", //
"", //
"");
public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( //
"Property_ColorTemperature", //
"Color Temperature", //
Expand Down Expand Up @@ -391,6 +381,16 @@ public static class Property {
"Light", //
"", //
"Lights, Lighting");
public static final SemanticTag LOW_BATTERY = new SemanticTagImpl( //
"Property_LowBattery", //
"Low Battery", //
"", //
"");
public static final SemanticTag MEDIA_CONTROL = new SemanticTagImpl( //
"Property_MediaControl", //
"Media Control", //
"", //
"");
public static final SemanticTag MODE = new SemanticTagImpl( //
"Property_Mode", //
"Mode", //
Expand Down Expand Up @@ -426,11 +426,31 @@ public static class Property {
"Open Closed", //
"", //
"");
public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( //
"Property_OpenLevel", //
"Open Level", //
"", //
"");
public static final SemanticTag OPEN_STATE = new SemanticTagImpl( //
"Property_OpenState", //
"Open State", //
"", //
"");
public static final SemanticTag OPENING = new SemanticTagImpl( //
"Property_Opening", //
"Opening", //
"", //
"");
public static final SemanticTag POSITION = new SemanticTagImpl( //
"Property_Position", //
"Position", //
"", //
"");
public static final SemanticTag GEO_LOCATION = new SemanticTagImpl( //
"Property_Position_GeoLocation", //
"Geo Location", //
"", //
"");
public static final SemanticTag POWER = new SemanticTagImpl( //
"Property_Power", //
"Power", //
Expand Down Expand Up @@ -481,6 +501,11 @@ public static class Property {
"Speed", //
"", //
"");
public static final SemanticTag TAMPERED = new SemanticTagImpl( //
"Property_Tampered", //
"Tampered", //
"", //
"");
public static final SemanticTag TEMPERATURE = new SemanticTagImpl( //
"Property_Temperature", //
"Temperature", //
Expand Down Expand Up @@ -529,6 +554,11 @@ public static class Property {
}

public static class Equipment {
public static final SemanticTag ALARM_DEVICE = new SemanticTagImpl( //
"Equipment_AlarmDevice", //
"Alarm Device", //
"", //
"");
public static final SemanticTag ALARM_SYSTEM = new SemanticTagImpl( //
"Equipment_AlarmSystem", //
"Alarm System", //
Expand Down Expand Up @@ -584,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
16 changes: 12 additions & 4 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 @@ -38,13 +38,10 @@ Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
Point_Alarm=Alarm
Point_Control=Control
Point_Control_Switch=Switch
Point_Forecast=Forecast
Point_Measurement=Measurement
Point_Setpoint=Setpoint
Point_Status=Status
Point_Status_LowBattery=LowBattery
Point_Status_OpenLevel=OpenLevel
Point_Status_OpenState=OpenState
Point_Status_Tampered=Tampered
Property_AirQuality=Air Quality
Property_AirQuality_AQI=AQI,Air Quality Index
Property_AirQuality_CO=CO,Carbon Monoxide
Expand All @@ -59,6 +56,7 @@ Property_Airflow=Airflow
Property_App=App,Application
Property_Brightness=Brightness
Property_Channel=Channel
Property_Color=Color
Property_ColorTemperature=Color Temperature
Property_Current=Current
Property_Duration=Duration
Expand All @@ -70,14 +68,20 @@ Property_Humidity=Humidity,Moisture
Property_Illuminance=Illuminance
Property_Level=Level
Property_Light=Light,Lights,Lighting
Property_LowBattery=Low Battery
Property_MediaControl=Media Control
Property_Mode=Mode
Property_Mode_AutoManual=Auto Manual
Property_Mode_EnabledDisabled=Enabled Disabled
Property_Noise=Noise
Property_Oil=Oil
Property_OnOff=On Off
Property_OpenClosed=Open Closed
Property_OpenLevel=Open Level
Property_OpenState=Open State
Property_Opening=Opening
Property_Position=Position
Property_Position_GeoLocation=Geo Location
Property_Power=Power
Property_Presence=Presence
Property_Pressure=Pressure
Expand All @@ -88,6 +92,7 @@ Property_SignalStrength_RSSI=RSSI,Received Signal Strength Indication
Property_Smoke=Smoke
Property_SoundVolume=Sound Volume
Property_Speed=Speed
Property_Tampered=Tampered
Property_Temperature=Temperature,Temperatures
Property_Tilt=Tilt
Property_Timestamp=Timestamp
Expand All @@ -97,6 +102,7 @@ Property_Vibration=Vibration
Property_Voltage=Voltage
Property_Water=Water
Property_Wind=Wind
Equipment_AlarmDevice=Alarm Device
Equipment_AlarmSystem=Alarm System,Alarm Systems
Equipment_AudioVisual=Audio Visual
Equipment_AudioVisual_MediaPlayer=Media Player
Expand All @@ -108,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
Loading