Skip to content

Commit ad7612d

Browse files
andrewfgandrewfg
authored
Semantic Tags: Tweaks to tags (#4708)
* Tweaks to Point and Property tags Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
1 parent 788b40f commit ad7612d

File tree

5 files changed

+204
-114
lines changed

5 files changed

+204
-114
lines changed

‎bundles/org.openhab.core.semantics/model/SemanticTags.csv‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,10 @@ Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
3838
Point,Alarm,,Alarm,,
3939
Point,Control,,Control,,
4040
Point,Switch,Control,Switch,,
41+
Point,Forecast,,Forecast,,
4142
Point,Measurement,,Measurement,,
4243
Point,Setpoint,,Setpoint,,
4344
Point,Status,,Status,,
44-
Point,LowBattery,Status,LowBattery,,
45-
Point,OpenLevel,Status,OpenLevel,,
46-
Point,OpenState,Status,OpenState,,
47-
Point,Tampered,Status,Tampered,,
4845
Property,AirQuality,,Air Quality,,
4946
Property,AQI,AirQuality,AQI,Air Quality Index,
5047
Property,CO,AirQuality,CO,Carbon Monoxide,
@@ -59,9 +56,11 @@ Property,Airflow,,Airflow,,
5956
Property,App,,App,Application,Software program
6057
Property,Brightness,,Brightness,,
6158
Property,Channel,,Channel,,
59+
Property,Color,,Color,,
6260
Property,ColorTemperature,,Color Temperature,,
6361
Property,Current,,Current,,
6462
Property,Duration,,Duration,,
63+
Property,Enabled,,Enabled,,
6564
Property,Energy,,Energy,,
6665
Property,Frequency,,Frequency,,
6766
Property,Gas,,Gas,,
@@ -70,14 +69,18 @@ Property,Humidity,,Humidity,Moisture,
7069
Property,Illuminance,,Illuminance,,
7170
Property,Level,,Level,,
7271
Property,Light,,Light,"Lights, Lighting",
72+
Property,LowBattery,,Low Battery,,
73+
Property,MediaControl,,Media Control,,
7374
Property,Mode,,Mode,,
74-
Property,AutoManual,Mode,Auto Manual,,
75-
Property,EnabledDisabled,Mode,Enabled Disabled,,
75+
Property,Moisture,,Moisture,,
76+
Property,Motion,,Motion,,
7677
Property,Noise,,Noise,,
7778
Property,Oil,,Oil,,
78-
Property,OnOff,,On Off,,
79-
Property,OpenClosed,,Open Closed,,
8079
Property,Opening,,Opening,,
80+
Property,OpenLevel,Opening,Open Level,,
81+
Property,OpenState,Opening,Open State,Open Closed,
82+
Property,Position,,Position,,
83+
Property,GeoLocation,Position,Geo Location,,
8184
Property,Power,,Power,,
8285
Property,Presence,,Presence,,
8386
Property,Pressure,,Pressure,,
@@ -88,6 +91,7 @@ Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,
8891
Property,Smoke,,Smoke,,
8992
Property,SoundVolume,,Sound Volume,,
9093
Property,Speed,,Speed,,
94+
Property,Tampered,,Tampered,,
9195
Property,Temperature,,Temperature,Temperatures,
9296
Property,Tilt,,Tilt,,
9397
Property,Timestamp,,Timestamp,,
@@ -97,15 +101,18 @@ Property,Vibration,,Vibration,,
97101
Property,Voltage,,Voltage,,
98102
Property,Water,,Water,,
99103
Property,Wind,,Wind,,
104+
Equipment,AlarmDevice,,Alarm Device,,
100105
Equipment,AlarmSystem,,Alarm System,Alarm Systems,
101106
Equipment,AudioVisual,,Audio Visual,,
107+
Equipment,Display,AudioVisual,Display,,
108+
Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",
109+
Equipment,Television,Display,Television,"Televisions, TV, TVs",
102110
Equipment,MediaPlayer,AudioVisual,Media Player,,
103111
Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
104112
Equipment,Screen,AudioVisual,Screen,Screens,
105-
Equipment,Television,AudioVisual,Television,"Televisions, TV, TVs",
113+
Equipment,Speaker,AudioVisual,Speaker,Speakers,
106114
Equipment,Battery,,Battery,Batteries,
107115
Equipment,Bed,,Bed,,
108-
Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
109116
Equipment,Camera,,Camera,Cameras,
110117
Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
111118
Equipment,Computer,,Computer,,
@@ -185,31 +192,33 @@ Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,
185192
Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,
186193
Equipment,Printer,,Printer,,
187194
Equipment,Printer3D,Printer,3D Printer,,
188-
Equipment,Projector,,Projector,"Projectors, Beamer, Beamers",
189195
Equipment,Pump,,Pump,Pumps,
190196
Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",
191197
Equipment,RemoteControl,,Remote Control,Remote Controls,
192198
Equipment,Sensor,,Sensor,Sensors,
193199
Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,
194200
Equipment,CO2Sensor,Sensor,CO2 Sensor,,
195201
Equipment,COSensor,Sensor,CO Sensor,,
202+
Equipment,ContactSensor,Sensor,Contact Sensor,,
196203
Equipment,ElectricMeter,Sensor,Electric Meter,,
204+
Equipment,FireDetector,Sensor,Fire Detector,,
205+
Equipment,FlameDetector,FireDetector,Flame Detector,,
206+
Equipment,HeatDetector,FireDetector,Heat Detector,,
207+
Equipment,SmokeDetector,FireDetector,Smoke Detector,Smoke Detectors,
197208
Equipment,GasMeter,Sensor,Gas Meter,,
198209
Equipment,GlassBreakDetector,Sensor,Glass Break Detector,,
199-
Equipment,HeatDetector,Sensor,Heat Detector,Flame detector,
200210
Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer,
201211
Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,,
202212
Equipment,LeakSensor,Sensor,Leak Sensor,,
203213
Equipment,OccupancySensor,Sensor,Occupancy Sensor,,
204214
Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors",
205-
Equipment,SmokeDetector,Sensor,Smoke Detector,Smoke Detectors,
206215
Equipment,TemperatureSensor,Sensor,Temperature Sensor,,
216+
Equipment,VibrationSensor,Sensor,Vibration Sensor,,
207217
Equipment,WaterMeter,Sensor,Water Meter,,
208218
Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,
209219
Equipment,WeatherStation,Sensor,Weather Station,,
210220
Equipment,Siren,,Siren,Sirens,
211221
Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",
212-
Equipment,Speaker,,Speaker,Speakers,
213222
Equipment,Tool,,Tool,,
214223
Equipment,Tracker,,Tracker,,
215224
Equipment,Valve,,Valve,Valves,
@@ -244,4 +253,5 @@ Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,
244253
Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,
245254
Equipment,Window,,Window,Windows,
246255
Equipment,WindowCovering,,Window Covering,,
256+
Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
247257
Equipment,Drapes,WindowCovering,Drapes,Curtains,

‎bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,10 @@ public DefaultSemanticTagProvider() {
7878
defaultTags.add(DefaultSemanticTags.Point.ALARM);
7979
defaultTags.add(DefaultSemanticTags.Point.CONTROL);
8080
defaultTags.add(DefaultSemanticTags.Point.SWITCH);
81+
defaultTags.add(DefaultSemanticTags.Point.FORECAST);
8182
defaultTags.add(DefaultSemanticTags.Point.MEASUREMENT);
8283
defaultTags.add(DefaultSemanticTags.Point.SETPOINT);
8384
defaultTags.add(DefaultSemanticTags.Point.STATUS);
84-
defaultTags.add(DefaultSemanticTags.Point.LOW_BATTERY);
85-
defaultTags.add(DefaultSemanticTags.Point.OPEN_LEVEL);
86-
defaultTags.add(DefaultSemanticTags.Point.OPEN_STATE);
87-
defaultTags.add(DefaultSemanticTags.Point.TAMPERED);
8885
defaultTags.add(DefaultSemanticTags.Property.AIR_QUALITY);
8986
defaultTags.add(DefaultSemanticTags.Property.AQI);
9087
defaultTags.add(DefaultSemanticTags.Property.CO);
@@ -99,9 +96,11 @@ public DefaultSemanticTagProvider() {
9996
defaultTags.add(DefaultSemanticTags.Property.APP);
10097
defaultTags.add(DefaultSemanticTags.Property.BRIGHTNESS);
10198
defaultTags.add(DefaultSemanticTags.Property.CHANNEL);
99+
defaultTags.add(DefaultSemanticTags.Property.COLOR);
102100
defaultTags.add(DefaultSemanticTags.Property.COLOR_TEMPERATURE);
103101
defaultTags.add(DefaultSemanticTags.Property.CURRENT);
104102
defaultTags.add(DefaultSemanticTags.Property.DURATION);
103+
defaultTags.add(DefaultSemanticTags.Property.ENABLED);
105104
defaultTags.add(DefaultSemanticTags.Property.ENERGY);
106105
defaultTags.add(DefaultSemanticTags.Property.FREQUENCY);
107106
defaultTags.add(DefaultSemanticTags.Property.GAS);
@@ -110,14 +109,18 @@ public DefaultSemanticTagProvider() {
110109
defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE);
111110
defaultTags.add(DefaultSemanticTags.Property.LEVEL);
112111
defaultTags.add(DefaultSemanticTags.Property.LIGHT);
112+
defaultTags.add(DefaultSemanticTags.Property.LOW_BATTERY);
113+
defaultTags.add(DefaultSemanticTags.Property.MEDIA_CONTROL);
113114
defaultTags.add(DefaultSemanticTags.Property.MODE);
114-
defaultTags.add(DefaultSemanticTags.Property.AUTO_MANUAL);
115-
defaultTags.add(DefaultSemanticTags.Property.ENABLED_DISABLED);
115+
defaultTags.add(DefaultSemanticTags.Property.MOISTURE);
116+
defaultTags.add(DefaultSemanticTags.Property.MOTION);
116117
defaultTags.add(DefaultSemanticTags.Property.NOISE);
117118
defaultTags.add(DefaultSemanticTags.Property.OIL);
118-
defaultTags.add(DefaultSemanticTags.Property.ON_OFF);
119-
defaultTags.add(DefaultSemanticTags.Property.OPEN_CLOSED);
120119
defaultTags.add(DefaultSemanticTags.Property.OPENING);
120+
defaultTags.add(DefaultSemanticTags.Property.OPEN_LEVEL);
121+
defaultTags.add(DefaultSemanticTags.Property.OPEN_STATE);
122+
defaultTags.add(DefaultSemanticTags.Property.POSITION);
123+
defaultTags.add(DefaultSemanticTags.Property.GEO_LOCATION);
121124
defaultTags.add(DefaultSemanticTags.Property.POWER);
122125
defaultTags.add(DefaultSemanticTags.Property.PRESENCE);
123126
defaultTags.add(DefaultSemanticTags.Property.PRESSURE);
@@ -128,6 +131,7 @@ public DefaultSemanticTagProvider() {
128131
defaultTags.add(DefaultSemanticTags.Property.SMOKE);
129132
defaultTags.add(DefaultSemanticTags.Property.SOUND_VOLUME);
130133
defaultTags.add(DefaultSemanticTags.Property.SPEED);
134+
defaultTags.add(DefaultSemanticTags.Property.TAMPERED);
131135
defaultTags.add(DefaultSemanticTags.Property.TEMPERATURE);
132136
defaultTags.add(DefaultSemanticTags.Property.TILT);
133137
defaultTags.add(DefaultSemanticTags.Property.TIMESTAMP);
@@ -137,15 +141,18 @@ public DefaultSemanticTagProvider() {
137141
defaultTags.add(DefaultSemanticTags.Property.VOLTAGE);
138142
defaultTags.add(DefaultSemanticTags.Property.WATER);
139143
defaultTags.add(DefaultSemanticTags.Property.WIND);
144+
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE);
140145
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM);
141146
defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL);
147+
defaultTags.add(DefaultSemanticTags.Equipment.DISPLAY);
148+
defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
149+
defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION);
142150
defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER);
143151
defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER);
144152
defaultTags.add(DefaultSemanticTags.Equipment.SCREEN);
145-
defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION);
153+
defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
146154
defaultTags.add(DefaultSemanticTags.Equipment.BATTERY);
147155
defaultTags.add(DefaultSemanticTags.Equipment.BED);
148-
defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
149156
defaultTags.add(DefaultSemanticTags.Equipment.CAMERA);
150157
defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT);
151158
defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER);
@@ -225,31 +232,33 @@ public DefaultSemanticTagProvider() {
225232
defaultTags.add(DefaultSemanticTags.Equipment.WIND_GENERATOR);
226233
defaultTags.add(DefaultSemanticTags.Equipment.PRINTER);
227234
defaultTags.add(DefaultSemanticTags.Equipment.PRINTER3D);
228-
defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
229235
defaultTags.add(DefaultSemanticTags.Equipment.PUMP);
230236
defaultTags.add(DefaultSemanticTags.Equipment.WATER_FEATURE);
231237
defaultTags.add(DefaultSemanticTags.Equipment.REMOTE_CONTROL);
232238
defaultTags.add(DefaultSemanticTags.Equipment.SENSOR);
233239
defaultTags.add(DefaultSemanticTags.Equipment.AIR_QUALITY_SENSOR);
234240
defaultTags.add(DefaultSemanticTags.Equipment.CO2_SENSOR);
235241
defaultTags.add(DefaultSemanticTags.Equipment.CO_SENSOR);
242+
defaultTags.add(DefaultSemanticTags.Equipment.CONTACT_SENSOR);
236243
defaultTags.add(DefaultSemanticTags.Equipment.ELECTRIC_METER);
244+
defaultTags.add(DefaultSemanticTags.Equipment.FIRE_DETECTOR);
245+
defaultTags.add(DefaultSemanticTags.Equipment.FLAME_DETECTOR);
246+
defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
247+
defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
237248
defaultTags.add(DefaultSemanticTags.Equipment.GAS_METER);
238249
defaultTags.add(DefaultSemanticTags.Equipment.GLASS_BREAK_DETECTOR);
239-
defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
240250
defaultTags.add(DefaultSemanticTags.Equipment.HUMIDITY_SENSOR);
241251
defaultTags.add(DefaultSemanticTags.Equipment.ILLUMINANCE_SENSOR);
242252
defaultTags.add(DefaultSemanticTags.Equipment.LEAK_SENSOR);
243253
defaultTags.add(DefaultSemanticTags.Equipment.OCCUPANCY_SENSOR);
244254
defaultTags.add(DefaultSemanticTags.Equipment.MOTION_DETECTOR);
245-
defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
246255
defaultTags.add(DefaultSemanticTags.Equipment.TEMPERATURE_SENSOR);
256+
defaultTags.add(DefaultSemanticTags.Equipment.VIBRATION_SENSOR);
247257
defaultTags.add(DefaultSemanticTags.Equipment.WATER_METER);
248258
defaultTags.add(DefaultSemanticTags.Equipment.WATER_QUALITY_SENSOR);
249259
defaultTags.add(DefaultSemanticTags.Equipment.WEATHER_STATION);
250260
defaultTags.add(DefaultSemanticTags.Equipment.SIREN);
251261
defaultTags.add(DefaultSemanticTags.Equipment.SMARTPHONE);
252-
defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
253262
defaultTags.add(DefaultSemanticTags.Equipment.TOOL);
254263
defaultTags.add(DefaultSemanticTags.Equipment.TRACKER);
255264
defaultTags.add(DefaultSemanticTags.Equipment.VALVE);
@@ -284,6 +293,7 @@ public DefaultSemanticTagProvider() {
284293
defaultTags.add(DefaultSemanticTags.Equipment.WASHING_MACHINE);
285294
defaultTags.add(DefaultSemanticTags.Equipment.WINDOW);
286295
defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING);
296+
defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
287297
defaultTags.add(DefaultSemanticTags.Equipment.DRAPES);
288298
}
289299

0 commit comments

Comments
 (0)