OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Semantic Tags: Tweaks to tags (#4708) 

* Tweaks to Point and Property tags

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
pull/4721/head
Andrew Fiddian-Green 2025-04-13 15:12:05 +01:00 committed by GitHub
parent 788b40f8a0
commit ad7612dba7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 205 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bundles/org.openhab.core.semantics/model/SemanticTags.csv
View File

@ -38,13 +38,10 @@ Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks",
Point,Alarm,,Alarm,, Point,Alarm,,Alarm,,
Point,Control,,Control,, Point,Control,,Control,,
Point,Switch,Control,Switch,, Point,Switch,Control,Switch,,
Point,Forecast,,Forecast,,
Point,Measurement,,Measurement,, Point,Measurement,,Measurement,,
Point,Setpoint,,Setpoint,, Point,Setpoint,,Setpoint,,
Point,Status,,Status,, Point,Status,,Status,,
Point,LowBattery,Status,LowBattery,,
Point,OpenLevel,Status,OpenLevel,,
Point,OpenState,Status,OpenState,,
Point,Tampered,Status,Tampered,,
Property,AirQuality,,Air Quality,, Property,AirQuality,,Air Quality,,
Property,AQI,AirQuality,AQI,Air Quality Index, Property,AQI,AirQuality,AQI,Air Quality Index,
Property,CO,AirQuality,CO,Carbon Monoxide, Property,CO,AirQuality,CO,Carbon Monoxide,
@ -59,9 +56,11 @@ Property,Airflow,,Airflow,,
Property,App,,App,Application,Software program Property,App,,App,Application,Software program
Property,Brightness,,Brightness,, Property,Brightness,,Brightness,,
Property,Channel,,Channel,, Property,Channel,,Channel,,
Property,Color,,Color,,
Property,ColorTemperature,,Color Temperature,, Property,ColorTemperature,,Color Temperature,,
Property,Current,,Current,, Property,Current,,Current,,
Property,Duration,,Duration,, Property,Duration,,Duration,,
Property,Enabled,,Enabled,,
Property,Energy,,Energy,, Property,Energy,,Energy,,
Property,Frequency,,Frequency,, Property,Frequency,,Frequency,,
Property,Gas,,Gas,, Property,Gas,,Gas,,
@ -70,14 +69,18 @@ Property,Humidity,,Humidity,Moisture,
Property,Illuminance,,Illuminance,, Property,Illuminance,,Illuminance,,
Property,Level,,Level,, Property,Level,,Level,,
Property,Light,,Light,"Lights, Lighting", Property,Light,,Light,"Lights, Lighting",
Property,LowBattery,,Low Battery,,
Property,MediaControl,,Media Control,,
Property,Mode,,Mode,, Property,Mode,,Mode,,
Property,AutoManual,Mode,Auto Manual,, Property,Moisture,,Moisture,,
Property,EnabledDisabled,Mode,Enabled Disabled,, Property,Motion,,Motion,,
Property,Noise,,Noise,, Property,Noise,,Noise,,
Property,Oil,,Oil,, Property,Oil,,Oil,,
Property,OnOff,,On Off,,
Property,OpenClosed,,Open Closed,,
Property,Opening,,Opening,, Property,Opening,,Opening,,
Property,OpenLevel,Opening,Open Level,,
Property,OpenState,Opening,Open State,Open Closed,
Property,Position,,Position,,
Property,GeoLocation,Position,Geo Location,,
Property,Power,,Power,, Property,Power,,Power,,
Property,Presence,,Presence,, Property,Presence,,Presence,,
Property,Pressure,,Pressure,, Property,Pressure,,Pressure,,
@ -88,6 +91,7 @@ Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,
Property,Smoke,,Smoke,, Property,Smoke,,Smoke,,
Property,SoundVolume,,Sound Volume,, Property,SoundVolume,,Sound Volume,,
Property,Speed,,Speed,, Property,Speed,,Speed,,
Property,Tampered,,Tampered,,
Property,Temperature,,Temperature,Temperatures, Property,Temperature,,Temperature,Temperatures,
Property,Tilt,,Tilt,, Property,Tilt,,Tilt,,
Property,Timestamp,,Timestamp,, Property,Timestamp,,Timestamp,,
@ -97,15 +101,18 @@ Property,Vibration,,Vibration,,
Property,Voltage,,Voltage,, Property,Voltage,,Voltage,,
Property,Water,,Water,, Property,Water,,Water,,
Property,Wind,,Wind,, Property,Wind,,Wind,,
Equipment,AlarmDevice,,Alarm Device,,
Equipment,AlarmSystem,,Alarm System,Alarm Systems, Equipment,AlarmSystem,,Alarm System,Alarm Systems,
Equipment,AudioVisual,,Audio Visual,, Equipment,AudioVisual,,Audio Visual,,
Equipment,Display,AudioVisual,Display,,
Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",
Equipment,Television,Display,Television,"Televisions, TV, TVs",
Equipment,MediaPlayer,AudioVisual,Media Player,, Equipment,MediaPlayer,AudioVisual,Media Player,,
Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",
Equipment,Screen,AudioVisual,Screen,Screens, Equipment,Screen,AudioVisual,Screen,Screens,
Equipment,Television,AudioVisual,Television,"Televisions, TV, TVs", Equipment,Speaker,AudioVisual,Speaker,Speakers,
Equipment,Battery,,Battery,Batteries, Equipment,Battery,,Battery,Batteries,
Equipment,Bed,,Bed,, Equipment,Bed,,Bed,,
Equipment,Blinds,,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
Equipment,Camera,,Camera,Cameras, Equipment,Camera,,Camera,Cameras,
Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots", Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",
Equipment,Computer,,Computer,, Equipment,Computer,,Computer,,
@ -185,7 +192,6 @@ Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,
Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine, Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,
Equipment,Printer,,Printer,, Equipment,Printer,,Printer,,
Equipment,Printer3D,Printer,3D Printer,, Equipment,Printer3D,Printer,3D Printer,,
Equipment,Projector,,Projector,"Projectors, Beamer, Beamers",
Equipment,Pump,,Pump,Pumps, Equipment,Pump,,Pump,Pumps,
Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",
Equipment,RemoteControl,,Remote Control,Remote Controls, Equipment,RemoteControl,,Remote Control,Remote Controls,
@ -193,23 +199,26 @@ Equipment,Sensor,,Sensor,Sensors,
Equipment,AirQualitySensor,Sensor,Air Quality Sensor,, Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,
Equipment,CO2Sensor,Sensor,CO2 Sensor,, Equipment,CO2Sensor,Sensor,CO2 Sensor,,
Equipment,COSensor,Sensor,CO Sensor,, Equipment,COSensor,Sensor,CO Sensor,,
Equipment,ContactSensor,Sensor,Contact Sensor,,
Equipment,ElectricMeter,Sensor,Electric Meter,, Equipment,ElectricMeter,Sensor,Electric Meter,,
Equipment,FireDetector,Sensor,Fire Detector,,
Equipment,FlameDetector,FireDetector,Flame Detector,,
Equipment,HeatDetector,FireDetector,Heat Detector,,
Equipment,SmokeDetector,FireDetector,Smoke Detector,Smoke Detectors,
Equipment,GasMeter,Sensor,Gas Meter,, Equipment,GasMeter,Sensor,Gas Meter,,
Equipment,GlassBreakDetector,Sensor,Glass Break Detector,, Equipment,GlassBreakDetector,Sensor,Glass Break Detector,,
Equipment,HeatDetector,Sensor,Heat Detector,Flame detector,
Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer, Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer,
Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,, Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,,
Equipment,LeakSensor,Sensor,Leak Sensor,, Equipment,LeakSensor,Sensor,Leak Sensor,,
Equipment,OccupancySensor,Sensor,Occupancy Sensor,, Equipment,OccupancySensor,Sensor,Occupancy Sensor,,
Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors", Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors",
Equipment,SmokeDetector,Sensor,Smoke Detector,Smoke Detectors,
Equipment,TemperatureSensor,Sensor,Temperature Sensor,, Equipment,TemperatureSensor,Sensor,Temperature Sensor,,
Equipment,VibrationSensor,Sensor,Vibration Sensor,,
Equipment,WaterMeter,Sensor,Water Meter,, Equipment,WaterMeter,Sensor,Water Meter,,
Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,, Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,
Equipment,WeatherStation,Sensor,Weather Station,, Equipment,WeatherStation,Sensor,Weather Station,,
Equipment,Siren,,Siren,Sirens, Equipment,Siren,,Siren,Sirens,
Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones", Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",
Equipment,Speaker,,Speaker,Speakers,
Equipment,Tool,,Tool,, Equipment,Tool,,Tool,,
Equipment,Tracker,,Tracker,, Equipment,Tracker,,Tracker,,
Equipment,Valve,,Valve,Valves, Equipment,Valve,,Valve,Valves,
@ -244,4 +253,5 @@ Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,
Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines, Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,
Equipment,Window,,Window,Windows, Equipment,Window,,Window,Windows,
Equipment,WindowCovering,,Window Covering,, Equipment,WindowCovering,,Window Covering,,
Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters",
Equipment,Drapes,WindowCovering,Drapes,Curtains, Equipment,Drapes,WindowCovering,Drapes,Curtains,

1 Type Tag Parent Label Synonyms Description
38 Point Alarm Alarm
39 Point Control Control
40 Point Switch Control Switch
41 Point Forecast Forecast
42 Point Measurement Measurement
43 Point Setpoint Setpoint
44 Point Status Status
Point LowBattery Status LowBattery
Point OpenLevel Status OpenLevel
Point OpenState Status OpenState
Point Tampered Status Tampered
45 Property AirQuality Air Quality
46 Property AQI AirQuality AQI Air Quality Index
47 Property CO AirQuality CO Carbon Monoxide
56 Property App App Application Software program
57 Property Brightness Brightness
58 Property Channel Channel
59 Property Color Color
60 Property ColorTemperature Color Temperature
61 Property Current Current
62 Property Duration Duration
63 Property Enabled Enabled
64 Property Energy Energy
65 Property Frequency Frequency
66 Property Gas Gas
69 Property Illuminance Illuminance
70 Property Level Level
71 Property Light Light Lights, Lighting
72 Property LowBattery Low Battery
73 Property MediaControl Media Control
74 Property Mode Mode
75 Property AutoManual Moisture Mode Auto Manual Moisture
76 Property EnabledDisabled Motion Mode Enabled Disabled Motion
77 Property Noise Noise
78 Property Oil Oil
Property OnOff On Off
Property OpenClosed Open Closed
79 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
84 Property Power Power
85 Property Presence Presence
86 Property Pressure Pressure
91 Property Smoke Smoke
92 Property SoundVolume Sound Volume
93 Property Speed Speed
94 Property Tampered Tampered
95 Property Temperature Temperature Temperatures
96 Property Tilt Tilt
97 Property Timestamp Timestamp
101 Property Voltage Voltage
102 Property Water Water
103 Property Wind Wind
104 Equipment AlarmDevice Alarm Device
105 Equipment AlarmSystem Alarm System Alarm Systems
106 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
110 Equipment MediaPlayer AudioVisual Media Player
111 Equipment Receiver AudioVisual Receiver Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers
112 Equipment Screen AudioVisual Screen Screens
113 Equipment Television Speaker AudioVisual Television Speaker Televisions, TV, TVs Speakers
114 Equipment Battery Battery Batteries
115 Equipment Bed Bed
Equipment Blinds Blinds Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters
116 Equipment Camera Camera Cameras
117 Equipment CleaningRobot Cleaning Robot Cleaning Robots, Vacuum robot, Vacuum robots
118 Equipment Computer Computer
192 Equipment WindGenerator PowerSupply Wind Generator Wind Turbine
193 Equipment Printer Printer
194 Equipment Printer3D Printer 3D Printer
Equipment Projector Projector Projectors, Beamer, Beamers
195 Equipment Pump Pump Pumps
196 Equipment WaterFeature Pump Water Feature Waterfall, Pond Pump
197 Equipment RemoteControl Remote Control Remote Controls
199 Equipment AirQualitySensor Sensor Air Quality Sensor
200 Equipment CO2Sensor Sensor CO2 Sensor
201 Equipment COSensor Sensor CO Sensor
202 Equipment ContactSensor Sensor Contact Sensor
203 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
208 Equipment GasMeter Sensor Gas Meter
209 Equipment GlassBreakDetector Sensor Glass Break Detector
Equipment HeatDetector Sensor Heat Detector Flame detector
210 Equipment HumiditySensor Sensor Humidity Sensor Hygrometer
211 Equipment IlluminanceSensor Sensor Illuminance Sensor
212 Equipment LeakSensor Sensor Leak Sensor
213 Equipment OccupancySensor Sensor Occupancy Sensor
214 Equipment MotionDetector OccupancySensor Motion Detector Motion Detectors, Motion Sensor, Motion Sensors
Equipment SmokeDetector Sensor Smoke Detector Smoke Detectors
215 Equipment TemperatureSensor Sensor Temperature Sensor
216 Equipment VibrationSensor Sensor Vibration Sensor
217 Equipment WaterMeter Sensor Water Meter
218 Equipment WaterQualitySensor Sensor Water Quality Sensor
219 Equipment WeatherStation Sensor Weather Station
220 Equipment Siren Siren Sirens
221 Equipment Smartphone Smartphone Smartphones, Phone, Phones
Equipment Speaker Speaker Speakers
222 Equipment Tool Tool
223 Equipment Tracker Tracker
224 Equipment Valve Valve Valves
253 Equipment WashingMachine WhiteGood Washing Machine Washing Machines
254 Equipment Window Window Windows
255 Equipment WindowCovering Window Covering
256 Equipment Blinds WindowCovering Blinds Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters
257 Equipment Drapes WindowCovering Drapes Curtains

38
bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java
View File

@ -78,13 +78,10 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Point.ALARM); defaultTags.add(DefaultSemanticTags.Point.ALARM);
defaultTags.add(DefaultSemanticTags.Point.CONTROL); defaultTags.add(DefaultSemanticTags.Point.CONTROL);
defaultTags.add(DefaultSemanticTags.Point.SWITCH); defaultTags.add(DefaultSemanticTags.Point.SWITCH);
defaultTags.add(DefaultSemanticTags.Point.FORECAST);
defaultTags.add(DefaultSemanticTags.Point.MEASUREMENT); defaultTags.add(DefaultSemanticTags.Point.MEASUREMENT);
defaultTags.add(DefaultSemanticTags.Point.SETPOINT); defaultTags.add(DefaultSemanticTags.Point.SETPOINT);
defaultTags.add(DefaultSemanticTags.Point.STATUS); 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.AIR_QUALITY);
defaultTags.add(DefaultSemanticTags.Property.AQI); defaultTags.add(DefaultSemanticTags.Property.AQI);
defaultTags.add(DefaultSemanticTags.Property.CO); defaultTags.add(DefaultSemanticTags.Property.CO);
@ -99,9 +96,11 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Property.APP); defaultTags.add(DefaultSemanticTags.Property.APP);
defaultTags.add(DefaultSemanticTags.Property.BRIGHTNESS); defaultTags.add(DefaultSemanticTags.Property.BRIGHTNESS);
defaultTags.add(DefaultSemanticTags.Property.CHANNEL); defaultTags.add(DefaultSemanticTags.Property.CHANNEL);
defaultTags.add(DefaultSemanticTags.Property.COLOR);
defaultTags.add(DefaultSemanticTags.Property.COLOR_TEMPERATURE); defaultTags.add(DefaultSemanticTags.Property.COLOR_TEMPERATURE);
defaultTags.add(DefaultSemanticTags.Property.CURRENT); defaultTags.add(DefaultSemanticTags.Property.CURRENT);
defaultTags.add(DefaultSemanticTags.Property.DURATION); defaultTags.add(DefaultSemanticTags.Property.DURATION);
defaultTags.add(DefaultSemanticTags.Property.ENABLED);
defaultTags.add(DefaultSemanticTags.Property.ENERGY); defaultTags.add(DefaultSemanticTags.Property.ENERGY);
defaultTags.add(DefaultSemanticTags.Property.FREQUENCY); defaultTags.add(DefaultSemanticTags.Property.FREQUENCY);
defaultTags.add(DefaultSemanticTags.Property.GAS); defaultTags.add(DefaultSemanticTags.Property.GAS);
@ -110,14 +109,18 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE); defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE);
defaultTags.add(DefaultSemanticTags.Property.LEVEL); defaultTags.add(DefaultSemanticTags.Property.LEVEL);
defaultTags.add(DefaultSemanticTags.Property.LIGHT); 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.MODE);
defaultTags.add(DefaultSemanticTags.Property.AUTO_MANUAL); defaultTags.add(DefaultSemanticTags.Property.MOISTURE);
defaultTags.add(DefaultSemanticTags.Property.ENABLED_DISABLED); defaultTags.add(DefaultSemanticTags.Property.MOTION);
defaultTags.add(DefaultSemanticTags.Property.NOISE); defaultTags.add(DefaultSemanticTags.Property.NOISE);
defaultTags.add(DefaultSemanticTags.Property.OIL); defaultTags.add(DefaultSemanticTags.Property.OIL);
defaultTags.add(DefaultSemanticTags.Property.ON_OFF);
defaultTags.add(DefaultSemanticTags.Property.OPEN_CLOSED);
defaultTags.add(DefaultSemanticTags.Property.OPENING); defaultTags.add(DefaultSemanticTags.Property.OPENING);
defaultTags.add(DefaultSemanticTags.Property.OPEN_LEVEL);
defaultTags.add(DefaultSemanticTags.Property.OPEN_STATE);
defaultTags.add(DefaultSemanticTags.Property.POSITION);
defaultTags.add(DefaultSemanticTags.Property.GEO_LOCATION);
defaultTags.add(DefaultSemanticTags.Property.POWER); defaultTags.add(DefaultSemanticTags.Property.POWER);
defaultTags.add(DefaultSemanticTags.Property.PRESENCE); defaultTags.add(DefaultSemanticTags.Property.PRESENCE);
defaultTags.add(DefaultSemanticTags.Property.PRESSURE); defaultTags.add(DefaultSemanticTags.Property.PRESSURE);
@ -128,6 +131,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Property.SMOKE); defaultTags.add(DefaultSemanticTags.Property.SMOKE);
defaultTags.add(DefaultSemanticTags.Property.SOUND_VOLUME); defaultTags.add(DefaultSemanticTags.Property.SOUND_VOLUME);
defaultTags.add(DefaultSemanticTags.Property.SPEED); defaultTags.add(DefaultSemanticTags.Property.SPEED);
defaultTags.add(DefaultSemanticTags.Property.TAMPERED);
defaultTags.add(DefaultSemanticTags.Property.TEMPERATURE); defaultTags.add(DefaultSemanticTags.Property.TEMPERATURE);
defaultTags.add(DefaultSemanticTags.Property.TILT); defaultTags.add(DefaultSemanticTags.Property.TILT);
defaultTags.add(DefaultSemanticTags.Property.TIMESTAMP); defaultTags.add(DefaultSemanticTags.Property.TIMESTAMP);
@ -137,15 +141,18 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Property.VOLTAGE); defaultTags.add(DefaultSemanticTags.Property.VOLTAGE);
defaultTags.add(DefaultSemanticTags.Property.WATER); defaultTags.add(DefaultSemanticTags.Property.WATER);
defaultTags.add(DefaultSemanticTags.Property.WIND); defaultTags.add(DefaultSemanticTags.Property.WIND);
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE);
defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM); defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM);
defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL); defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL);
defaultTags.add(DefaultSemanticTags.Equipment.DISPLAY);
defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION);
defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER); defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER);
defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER); defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER);
defaultTags.add(DefaultSemanticTags.Equipment.SCREEN); defaultTags.add(DefaultSemanticTags.Equipment.SCREEN);
defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION); defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
defaultTags.add(DefaultSemanticTags.Equipment.BATTERY); defaultTags.add(DefaultSemanticTags.Equipment.BATTERY);
defaultTags.add(DefaultSemanticTags.Equipment.BED); defaultTags.add(DefaultSemanticTags.Equipment.BED);
defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
defaultTags.add(DefaultSemanticTags.Equipment.CAMERA); defaultTags.add(DefaultSemanticTags.Equipment.CAMERA);
defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT); defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT);
defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER); defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER);
@ -225,7 +232,6 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Equipment.WIND_GENERATOR); defaultTags.add(DefaultSemanticTags.Equipment.WIND_GENERATOR);
defaultTags.add(DefaultSemanticTags.Equipment.PRINTER); defaultTags.add(DefaultSemanticTags.Equipment.PRINTER);
defaultTags.add(DefaultSemanticTags.Equipment.PRINTER3D); defaultTags.add(DefaultSemanticTags.Equipment.PRINTER3D);
defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.PUMP); defaultTags.add(DefaultSemanticTags.Equipment.PUMP);
defaultTags.add(DefaultSemanticTags.Equipment.WATER_FEATURE); defaultTags.add(DefaultSemanticTags.Equipment.WATER_FEATURE);
defaultTags.add(DefaultSemanticTags.Equipment.REMOTE_CONTROL); defaultTags.add(DefaultSemanticTags.Equipment.REMOTE_CONTROL);
@ -233,23 +239,26 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Equipment.AIR_QUALITY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.AIR_QUALITY_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.CO2_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.CO2_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.CO_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.CO_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.CONTACT_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.ELECTRIC_METER); defaultTags.add(DefaultSemanticTags.Equipment.ELECTRIC_METER);
defaultTags.add(DefaultSemanticTags.Equipment.FIRE_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.FLAME_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.GAS_METER); defaultTags.add(DefaultSemanticTags.Equipment.GAS_METER);
defaultTags.add(DefaultSemanticTags.Equipment.GLASS_BREAK_DETECTOR); defaultTags.add(DefaultSemanticTags.Equipment.GLASS_BREAK_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.HUMIDITY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.HUMIDITY_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.ILLUMINANCE_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.ILLUMINANCE_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.LEAK_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.LEAK_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.OCCUPANCY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.OCCUPANCY_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.MOTION_DETECTOR); defaultTags.add(DefaultSemanticTags.Equipment.MOTION_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR);
defaultTags.add(DefaultSemanticTags.Equipment.TEMPERATURE_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.TEMPERATURE_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.VIBRATION_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.WATER_METER); defaultTags.add(DefaultSemanticTags.Equipment.WATER_METER);
defaultTags.add(DefaultSemanticTags.Equipment.WATER_QUALITY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.WATER_QUALITY_SENSOR);
defaultTags.add(DefaultSemanticTags.Equipment.WEATHER_STATION); defaultTags.add(DefaultSemanticTags.Equipment.WEATHER_STATION);
defaultTags.add(DefaultSemanticTags.Equipment.SIREN); defaultTags.add(DefaultSemanticTags.Equipment.SIREN);
defaultTags.add(DefaultSemanticTags.Equipment.SMARTPHONE); defaultTags.add(DefaultSemanticTags.Equipment.SMARTPHONE);
defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER);
defaultTags.add(DefaultSemanticTags.Equipment.TOOL); defaultTags.add(DefaultSemanticTags.Equipment.TOOL);
defaultTags.add(DefaultSemanticTags.Equipment.TRACKER); defaultTags.add(DefaultSemanticTags.Equipment.TRACKER);
defaultTags.add(DefaultSemanticTags.Equipment.VALVE); defaultTags.add(DefaultSemanticTags.Equipment.VALVE);
@ -284,6 +293,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider {
defaultTags.add(DefaultSemanticTags.Equipment.WASHING_MACHINE); defaultTags.add(DefaultSemanticTags.Equipment.WASHING_MACHINE);
defaultTags.add(DefaultSemanticTags.Equipment.WINDOW); defaultTags.add(DefaultSemanticTags.Equipment.WINDOW);
defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING); defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING);
defaultTags.add(DefaultSemanticTags.Equipment.BLINDS);
defaultTags.add(DefaultSemanticTags.Equipment.DRAPES); defaultTags.add(DefaultSemanticTags.Equipment.DRAPES);
} }

180
bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java
View File

@ -228,6 +228,11 @@ public class DefaultSemanticTags {
"Switch", // "Switch", //
"", // "", //
""); "");
public static final SemanticTag FORECAST = new SemanticTagImpl( //
"Point_Forecast", //
"Forecast", //
"", //
"");
public static final SemanticTag MEASUREMENT = new SemanticTagImpl( // public static final SemanticTag MEASUREMENT = new SemanticTagImpl( //
"Point_Measurement", // "Point_Measurement", //
"Measurement", // "Measurement", //
@ -243,26 +248,6 @@ public class DefaultSemanticTags {
"Status", // "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 { public static class Property {
@ -336,6 +321,11 @@ public class DefaultSemanticTags {
"Channel", // "Channel", //
"", // "", //
""); "");
public static final SemanticTag COLOR = new SemanticTagImpl( //
"Property_Color", //
"Color", //
"", //
"");
public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( // public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( //
"Property_ColorTemperature", // "Property_ColorTemperature", //
"Color Temperature", // "Color Temperature", //
@ -351,6 +341,11 @@ public class DefaultSemanticTags {
"Duration", // "Duration", //
"", // "", //
""); "");
public static final SemanticTag ENABLED = new SemanticTagImpl( //
"Property_Enabled", //
"Enabled", //
"", //
"");
public static final SemanticTag ENERGY = new SemanticTagImpl( // public static final SemanticTag ENERGY = new SemanticTagImpl( //
"Property_Energy", // "Property_Energy", //
"Energy", // "Energy", //
@ -391,19 +386,29 @@ public class DefaultSemanticTags {
"Light", // "Light", //
"", // "", //
"Lights, Lighting"); "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( // public static final SemanticTag MODE = new SemanticTagImpl( //
"Property_Mode", // "Property_Mode", //
"Mode", // "Mode", //
"", // "", //
""); "");
public static final SemanticTag AUTO_MANUAL = new SemanticTagImpl( // public static final SemanticTag MOISTURE = new SemanticTagImpl( //
"Property_Mode_AutoManual", // "Property_Moisture", //
"Auto Manual", // "Moisture", //
"", // "", //
""); "");
public static final SemanticTag ENABLED_DISABLED = new SemanticTagImpl( // public static final SemanticTag MOTION = new SemanticTagImpl( //
"Property_Mode_EnabledDisabled", // "Property_Motion", //
"Enabled Disabled", // "Motion", //
"", // "", //
""); "");
public static final SemanticTag NOISE = new SemanticTagImpl( // public static final SemanticTag NOISE = new SemanticTagImpl( //
@ -416,21 +421,31 @@ public class DefaultSemanticTags {
"Oil", // "Oil", //
"", // "", //
""); "");
public static final SemanticTag ON_OFF = new SemanticTagImpl( //
"Property_OnOff", //
"On Off", //
"", //
"");
public static final SemanticTag OPEN_CLOSED = new SemanticTagImpl( //
"Property_OpenClosed", //
"Open Closed", //
"", //
"");
public static final SemanticTag OPENING = new SemanticTagImpl( // public static final SemanticTag OPENING = new SemanticTagImpl( //
"Property_Opening", // "Property_Opening", //
"Opening", // "Opening", //
"", // "", //
""); "");
public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( //
"Property_Opening_OpenLevel", //
"Open Level", //
"", //
"");
public static final SemanticTag OPEN_STATE = new SemanticTagImpl( //
"Property_Opening_OpenState", //
"Open State", //
"", //
"Open Closed");
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( // public static final SemanticTag POWER = new SemanticTagImpl( //
"Property_Power", // "Property_Power", //
"Power", // "Power", //
@ -481,6 +496,11 @@ public class DefaultSemanticTags {
"Speed", // "Speed", //
"", // "", //
""); "");
public static final SemanticTag TAMPERED = new SemanticTagImpl( //
"Property_Tampered", //
"Tampered", //
"", //
"");
public static final SemanticTag TEMPERATURE = new SemanticTagImpl( // public static final SemanticTag TEMPERATURE = new SemanticTagImpl( //
"Property_Temperature", // "Property_Temperature", //
"Temperature", // "Temperature", //
@ -529,6 +549,11 @@ public class DefaultSemanticTags {
} }
public static class Equipment { public static class Equipment {
public static final SemanticTag ALARM_DEVICE = new SemanticTagImpl( //
"Equipment_AlarmDevice", //
"Alarm Device", //
"", //
"");
public static final SemanticTag ALARM_SYSTEM = new SemanticTagImpl( // public static final SemanticTag ALARM_SYSTEM = new SemanticTagImpl( //
"Equipment_AlarmSystem", // "Equipment_AlarmSystem", //
"Alarm System", // "Alarm System", //
@ -539,6 +564,21 @@ public class DefaultSemanticTags {
"Audio Visual", // "Audio Visual", //
"", // "", //
""); "");
public static final SemanticTag DISPLAY = new SemanticTagImpl( //
"Equipment_AudioVisual_Display", //
"Display", //
"", //
"");
public static final SemanticTag PROJECTOR = new SemanticTagImpl( //
"Equipment_AudioVisual_Display_Projector", //
"Projector", //
"", //
"Projectors, Beamer, Beamers");
public static final SemanticTag TELEVISION = new SemanticTagImpl( //
"Equipment_AudioVisual_Display_Television", //
"Television", //
"", //
"Televisions, TV, TVs");
public static final SemanticTag MEDIA_PLAYER = new SemanticTagImpl( // public static final SemanticTag MEDIA_PLAYER = new SemanticTagImpl( //
"Equipment_AudioVisual_MediaPlayer", // "Equipment_AudioVisual_MediaPlayer", //
"Media Player", // "Media Player", //
@ -554,11 +594,11 @@ public class DefaultSemanticTags {
"Screen", // "Screen", //
"", // "", //
"Screens"); "Screens");
public static final SemanticTag TELEVISION = new SemanticTagImpl( // public static final SemanticTag SPEAKER = new SemanticTagImpl( //
"Equipment_AudioVisual_Television", // "Equipment_AudioVisual_Speaker", //
"Television", // "Speaker", //
"", // "", //
"Televisions, TV, TVs"); "Speakers");
public static final SemanticTag BATTERY = new SemanticTagImpl( // public static final SemanticTag BATTERY = new SemanticTagImpl( //
"Equipment_Battery", // "Equipment_Battery", //
"Battery", // "Battery", //
@ -569,11 +609,6 @@ public class DefaultSemanticTags {
"Bed", // "Bed", //
"", // "", //
""); "");
public static final SemanticTag BLINDS = new SemanticTagImpl( //
"Equipment_Blinds", //
"Blinds", //
"", //
"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters");
public static final SemanticTag CAMERA = new SemanticTagImpl( // public static final SemanticTag CAMERA = new SemanticTagImpl( //
"Equipment_Camera", // "Equipment_Camera", //
"Camera", // "Camera", //
@ -969,11 +1004,6 @@ public class DefaultSemanticTags {
"3D Printer", // "3D Printer", //
"", // "", //
""); "");
public static final SemanticTag PROJECTOR = new SemanticTagImpl( //
"Equipment_Projector", //
"Projector", //
"", //
"Projectors, Beamer, Beamers");
public static final SemanticTag PUMP = new SemanticTagImpl( // public static final SemanticTag PUMP = new SemanticTagImpl( //
"Equipment_Pump", // "Equipment_Pump", //
"Pump", // "Pump", //
@ -1009,11 +1039,36 @@ public class DefaultSemanticTags {
"CO Sensor", // "CO Sensor", //
"", // "", //
""); "");
public static final SemanticTag CONTACT_SENSOR = new SemanticTagImpl( //
"Equipment_Sensor_ContactSensor", //
"Contact Sensor", //
"", //
"");
public static final SemanticTag ELECTRIC_METER = new SemanticTagImpl( // public static final SemanticTag ELECTRIC_METER = new SemanticTagImpl( //
"Equipment_Sensor_ElectricMeter", // "Equipment_Sensor_ElectricMeter", //
"Electric Meter", // "Electric Meter", //
"", // "", //
""); "");
public static final SemanticTag FIRE_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_FireDetector", //
"Fire Detector", //
"", //
"");
public static final SemanticTag FLAME_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_FireDetector_FlameDetector", //
"Flame Detector", //
"", //
"");
public static final SemanticTag HEAT_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_FireDetector_HeatDetector", //
"Heat Detector", //
"", //
"");
public static final SemanticTag SMOKE_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_FireDetector_SmokeDetector", //
"Smoke Detector", //
"", //
"Smoke Detectors");
public static final SemanticTag GAS_METER = new SemanticTagImpl( // public static final SemanticTag GAS_METER = new SemanticTagImpl( //
"Equipment_Sensor_GasMeter", // "Equipment_Sensor_GasMeter", //
"Gas Meter", // "Gas Meter", //
@ -1024,11 +1079,6 @@ public class DefaultSemanticTags {
"Glass Break Detector", // "Glass Break Detector", //
"", // "", //
""); "");
public static final SemanticTag HEAT_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_HeatDetector", //
"Heat Detector", //
"", //
"Flame detector");
public static final SemanticTag HUMIDITY_SENSOR = new SemanticTagImpl( // public static final SemanticTag HUMIDITY_SENSOR = new SemanticTagImpl( //
"Equipment_Sensor_HumiditySensor", // "Equipment_Sensor_HumiditySensor", //
"Humidity Sensor", // "Humidity Sensor", //
@ -1054,16 +1104,16 @@ public class DefaultSemanticTags {
"Motion Detector", // "Motion Detector", //
"", // "", //
"Motion Detectors, Motion Sensor, Motion Sensors"); "Motion Detectors, Motion Sensor, Motion Sensors");
public static final SemanticTag SMOKE_DETECTOR = new SemanticTagImpl( //
"Equipment_Sensor_SmokeDetector", //
"Smoke Detector", //
"", //
"Smoke Detectors");
public static final SemanticTag TEMPERATURE_SENSOR = new SemanticTagImpl( // public static final SemanticTag TEMPERATURE_SENSOR = new SemanticTagImpl( //
"Equipment_Sensor_TemperatureSensor", // "Equipment_Sensor_TemperatureSensor", //
"Temperature Sensor", // "Temperature Sensor", //
"", // "", //
""); "");
public static final SemanticTag VIBRATION_SENSOR = new SemanticTagImpl( //
"Equipment_Sensor_VibrationSensor", //
"Vibration Sensor", //
"", //
"");
public static final SemanticTag WATER_METER = new SemanticTagImpl( // public static final SemanticTag WATER_METER = new SemanticTagImpl( //
"Equipment_Sensor_WaterMeter", // "Equipment_Sensor_WaterMeter", //
"Water Meter", // "Water Meter", //
@ -1089,11 +1139,6 @@ public class DefaultSemanticTags {
"Smartphone", // "Smartphone", //
"", // "", //
"Smartphones, Phone, Phones"); "Smartphones, Phone, Phones");
public static final SemanticTag SPEAKER = new SemanticTagImpl( //
"Equipment_Speaker", //
"Speaker", //
"", //
"Speakers");
public static final SemanticTag TOOL = new SemanticTagImpl( // public static final SemanticTag TOOL = new SemanticTagImpl( //
"Equipment_Tool", // "Equipment_Tool", //
"Tool", // "Tool", //
@ -1264,6 +1309,11 @@ public class DefaultSemanticTags {
"Window Covering", // "Window Covering", //
"", // "", //
""); "");
public static final SemanticTag BLINDS = new SemanticTagImpl( //
"Equipment_WindowCovering_Blinds", //
"Blinds", //
"", //
"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters");
public static final SemanticTag DRAPES = new SemanticTagImpl( // public static final SemanticTag DRAPES = new SemanticTagImpl( //
"Equipment_WindowCovering_Drapes", // "Equipment_WindowCovering_Drapes", //
"Drapes", // "Drapes", //

38
bundles/org.openhab.core.semantics/src/main/resources/tags.properties
View File

@ -38,13 +38,10 @@ Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks
Point_Alarm=Alarm Point_Alarm=Alarm
Point_Control=Control Point_Control=Control
Point_Control_Switch=Switch Point_Control_Switch=Switch
Point_Forecast=Forecast
Point_Measurement=Measurement Point_Measurement=Measurement
Point_Setpoint=Setpoint Point_Setpoint=Setpoint
Point_Status=Status 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=Air Quality
Property_AirQuality_AQI=AQI,Air Quality Index Property_AirQuality_AQI=AQI,Air Quality Index
Property_AirQuality_CO=CO,Carbon Monoxide Property_AirQuality_CO=CO,Carbon Monoxide
@ -59,9 +56,11 @@ Property_Airflow=Airflow
Property_App=App,Application Property_App=App,Application
Property_Brightness=Brightness Property_Brightness=Brightness
Property_Channel=Channel Property_Channel=Channel
Property_Color=Color
Property_ColorTemperature=Color Temperature Property_ColorTemperature=Color Temperature
Property_Current=Current Property_Current=Current
Property_Duration=Duration Property_Duration=Duration
Property_Enabled=Enabled
Property_Energy=Energy Property_Energy=Energy
Property_Frequency=Frequency Property_Frequency=Frequency
Property_Gas=Gas Property_Gas=Gas
@ -70,14 +69,18 @@ Property_Humidity=Humidity,Moisture
Property_Illuminance=Illuminance Property_Illuminance=Illuminance
Property_Level=Level Property_Level=Level
Property_Light=Light,Lights,Lighting Property_Light=Light,Lights,Lighting
Property_LowBattery=Low Battery
Property_MediaControl=Media Control
Property_Mode=Mode Property_Mode=Mode
Property_Mode_AutoManual=Auto Manual Property_Moisture=Moisture
Property_Mode_EnabledDisabled=Enabled Disabled Property_Motion=Motion
Property_Noise=Noise Property_Noise=Noise
Property_Oil=Oil Property_Oil=Oil
Property_OnOff=On Off
Property_OpenClosed=Open Closed
Property_Opening=Opening Property_Opening=Opening
Property_Opening_OpenLevel=Open Level
Property_Opening_OpenState=Open State,Open Closed
Property_Position=Position
Property_Position_GeoLocation=Geo Location
Property_Power=Power Property_Power=Power
Property_Presence=Presence Property_Presence=Presence
Property_Pressure=Pressure Property_Pressure=Pressure
@ -88,6 +91,7 @@ Property_SignalStrength_RSSI=RSSI,Received Signal Strength Indication
Property_Smoke=Smoke Property_Smoke=Smoke
Property_SoundVolume=Sound Volume Property_SoundVolume=Sound Volume
Property_Speed=Speed Property_Speed=Speed
Property_Tampered=Tampered
Property_Temperature=Temperature,Temperatures Property_Temperature=Temperature,Temperatures
Property_Tilt=Tilt Property_Tilt=Tilt
Property_Timestamp=Timestamp Property_Timestamp=Timestamp
@ -97,15 +101,18 @@ Property_Vibration=Vibration
Property_Voltage=Voltage Property_Voltage=Voltage
Property_Water=Water Property_Water=Water
Property_Wind=Wind Property_Wind=Wind
Equipment_AlarmDevice=Alarm Device
Equipment_AlarmSystem=Alarm System,Alarm Systems Equipment_AlarmSystem=Alarm System,Alarm Systems
Equipment_AudioVisual=Audio Visual Equipment_AudioVisual=Audio Visual
Equipment_AudioVisual_Display=Display
Equipment_AudioVisual_Display_Projector=Projector,Projectors,Beamer,Beamers
Equipment_AudioVisual_Display_Television=Television,Televisions,TV,TVs
Equipment_AudioVisual_MediaPlayer=Media Player Equipment_AudioVisual_MediaPlayer=Media Player
Equipment_AudioVisual_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers Equipment_AudioVisual_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers
Equipment_AudioVisual_Screen=Screen,Screens Equipment_AudioVisual_Screen=Screen,Screens
Equipment_AudioVisual_Television=Television,Televisions,TV,TVs Equipment_AudioVisual_Speaker=Speaker,Speakers
Equipment_Battery=Battery,Batteries Equipment_Battery=Battery,Batteries
Equipment_Bed=Bed Equipment_Bed=Bed
Equipment_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
Equipment_Camera=Camera,Cameras Equipment_Camera=Camera,Cameras
Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots
Equipment_Computer=Computer Equipment_Computer=Computer
@ -185,7 +192,6 @@ Equipment_PowerSupply_UPS=UPS,Uninterruptible Power Supply
Equipment_PowerSupply_WindGenerator=Wind Generator,Wind Turbine Equipment_PowerSupply_WindGenerator=Wind Generator,Wind Turbine
Equipment_Printer=Printer Equipment_Printer=Printer
Equipment_Printer_Printer3D=3D Printer Equipment_Printer_Printer3D=3D Printer
Equipment_Projector=Projector,Projectors,Beamer,Beamers
Equipment_Pump=Pump,Pumps Equipment_Pump=Pump,Pumps
Equipment_Pump_WaterFeature=Water Feature,Waterfall,Pond Pump Equipment_Pump_WaterFeature=Water Feature,Waterfall,Pond Pump
Equipment_RemoteControl=Remote Control,Remote Controls Equipment_RemoteControl=Remote Control,Remote Controls
@ -193,23 +199,26 @@ Equipment_Sensor=Sensor,Sensors
Equipment_Sensor_AirQualitySensor=Air Quality Sensor Equipment_Sensor_AirQualitySensor=Air Quality Sensor
Equipment_Sensor_CO2Sensor=CO2 Sensor Equipment_Sensor_CO2Sensor=CO2 Sensor
Equipment_Sensor_COSensor=CO Sensor Equipment_Sensor_COSensor=CO Sensor
Equipment_Sensor_ContactSensor=Contact Sensor
Equipment_Sensor_ElectricMeter=Electric Meter Equipment_Sensor_ElectricMeter=Electric Meter
Equipment_Sensor_FireDetector=Fire Detector
Equipment_Sensor_FireDetector_FlameDetector=Flame Detector
Equipment_Sensor_FireDetector_HeatDetector=Heat Detector
Equipment_Sensor_FireDetector_SmokeDetector=Smoke Detector,Smoke Detectors
Equipment_Sensor_GasMeter=Gas Meter Equipment_Sensor_GasMeter=Gas Meter
Equipment_Sensor_GlassBreakDetector=Glass Break Detector Equipment_Sensor_GlassBreakDetector=Glass Break Detector
Equipment_Sensor_HeatDetector=Heat Detector,Flame detector
Equipment_Sensor_HumiditySensor=Humidity Sensor,Hygrometer Equipment_Sensor_HumiditySensor=Humidity Sensor,Hygrometer
Equipment_Sensor_IlluminanceSensor=Illuminance Sensor Equipment_Sensor_IlluminanceSensor=Illuminance Sensor
Equipment_Sensor_LeakSensor=Leak Sensor Equipment_Sensor_LeakSensor=Leak Sensor
Equipment_Sensor_OccupancySensor=Occupancy Sensor Equipment_Sensor_OccupancySensor=Occupancy Sensor
Equipment_Sensor_OccupancySensor_MotionDetector=Motion Detector,Motion Detectors,Motion Sensor,Motion Sensors Equipment_Sensor_OccupancySensor_MotionDetector=Motion Detector,Motion Detectors,Motion Sensor,Motion Sensors
Equipment_Sensor_SmokeDetector=Smoke Detector,Smoke Detectors
Equipment_Sensor_TemperatureSensor=Temperature Sensor Equipment_Sensor_TemperatureSensor=Temperature Sensor
Equipment_Sensor_VibrationSensor=Vibration Sensor
Equipment_Sensor_WaterMeter=Water Meter Equipment_Sensor_WaterMeter=Water Meter
Equipment_Sensor_WaterQualitySensor=Water Quality Sensor Equipment_Sensor_WaterQualitySensor=Water Quality Sensor
Equipment_Sensor_WeatherStation=Weather Station Equipment_Sensor_WeatherStation=Weather Station
Equipment_Siren=Siren,Sirens Equipment_Siren=Siren,Sirens
Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones
Equipment_Speaker=Speaker,Speakers
Equipment_Tool=Tool Equipment_Tool=Tool
Equipment_Tracker=Tracker Equipment_Tracker=Tracker
Equipment_Valve=Valve,Valves Equipment_Valve=Valve,Valves
@ -244,4 +253,5 @@ Equipment_WhiteGood_Toaster=Toaster,Toaster Oven
Equipment_WhiteGood_WashingMachine=Washing Machine,Washing Machines Equipment_WhiteGood_WashingMachine=Washing Machine,Washing Machines
Equipment_Window=Window,Windows Equipment_Window=Window,Windows
Equipment_WindowCovering=Window Covering Equipment_WindowCovering=Window Covering
Equipment_WindowCovering_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters
Equipment_WindowCovering_Drapes=Drapes,Curtains Equipment_WindowCovering_Drapes=Drapes,Curtains

26
bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
View File

@ -280,32 +280,38 @@
<xs:enumeration value="AirQuality"/> <xs:enumeration value="AirQuality"/>
<xs:enumeration value="App"/> <xs:enumeration value="App"/>
<xs:enumeration value="AQI"/> <xs:enumeration value="AQI"/>
<xs:enumeration value="AutoManual"/>
<xs:enumeration value="Brightness"/> <xs:enumeration value="Brightness"/>
<xs:enumeration value="Channel"/> <xs:enumeration value="Channel"/>
<xs:enumeration value="CO"/> <xs:enumeration value="CO"/>
<xs:enumeration value="CO2"/> <xs:enumeration value="CO2"/>
<xs:enumeration value="Color"/>
<xs:enumeration value="ColorTemperature"/> <xs:enumeration value="ColorTemperature"/>
<xs:enumeration value="Current"/> <xs:enumeration value="Current"/>
<xs:enumeration value="Duration"/> <xs:enumeration value="Duration"/>
<xs:enumeration value="EnabledDisabled"/> <xs:enumeration value="Enabled"/>
<xs:enumeration value="Energy"/> <xs:enumeration value="Energy"/>
<xs:enumeration value="Frequency"/> <xs:enumeration value="Frequency"/>
<xs:enumeration value="Gas"/> <xs:enumeration value="Gas"/>
<xs:enumeration value="GeoLocation"/>
<xs:enumeration value="Heating"/> <xs:enumeration value="Heating"/>
<xs:enumeration value="Humidity"/> <xs:enumeration value="Humidity"/>
<xs:enumeration value="Illuminance"/> <xs:enumeration value="Illuminance"/>
<xs:enumeration value="Level"/> <xs:enumeration value="Level"/>
<xs:enumeration value="Light"/> <xs:enumeration value="Light"/>
<xs:enumeration value="LowBattery"/>
<xs:enumeration value="MediaControl"/>
<xs:enumeration value="Mode"/> <xs:enumeration value="Mode"/>
<xs:enumeration value="Moisture"/>
<xs:enumeration value="Motion"/>
<xs:enumeration value="Noise"/> <xs:enumeration value="Noise"/>
<xs:enumeration value="Oil"/> <xs:enumeration value="Oil"/>
<xs:enumeration value="OnOff"/>
<xs:enumeration value="OpenClosed"/>
<xs:enumeration value="Opening"/> <xs:enumeration value="Opening"/>
<xs:enumeration value="OpenLevel"/>
<xs:enumeration value="OpenState"/>
<xs:enumeration value="Ozone"/> <xs:enumeration value="Ozone"/>
<xs:enumeration value="ParticulateMatter"/> <xs:enumeration value="ParticulateMatter"/>
<xs:enumeration value="Pollen"/> <xs:enumeration value="Pollen"/>
<xs:enumeration value="Position"/>
<xs:enumeration value="Power"/> <xs:enumeration value="Power"/>
<xs:enumeration value="Presence"/> <xs:enumeration value="Presence"/>
<xs:enumeration value="Pressure"/> <xs:enumeration value="Pressure"/>
@ -317,6 +323,7 @@
<xs:enumeration value="Smoke"/> <xs:enumeration value="Smoke"/>
<xs:enumeration value="SoundVolume"/> <xs:enumeration value="SoundVolume"/>
<xs:enumeration value="Speed"/> <xs:enumeration value="Speed"/>
<xs:enumeration value="Tampered"/>
<xs:enumeration value="Temperature"/> <xs:enumeration value="Temperature"/>
<xs:enumeration value="Tilt"/> <xs:enumeration value="Tilt"/>
<xs:enumeration value="Timestamp"/> <xs:enumeration value="Timestamp"/>
@ -333,14 +340,11 @@
<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy --> <!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
<xs:enumeration value="Alarm"/> <xs:enumeration value="Alarm"/>
<xs:enumeration value="Control"/> <xs:enumeration value="Control"/>
<xs:enumeration value="LowBattery"/> <xs:enumeration value="Forecast"/>
<xs:enumeration value="Measurement"/> <xs:enumeration value="Measurement"/>
<xs:enumeration value="OpenLevel"/>
<xs:enumeration value="OpenState"/>
<xs:enumeration value="Setpoint"/> <xs:enumeration value="Setpoint"/>
<xs:enumeration value="Status"/> <xs:enumeration value="Status"/>
<xs:enumeration value="Switch"/> <xs:enumeration value="Switch"/>
<xs:enumeration value="Tampered"/>
<!-- End Allowed Semantic Point Tag Values --> <!-- End Allowed Semantic Point Tag Values -->
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
@ -354,6 +358,7 @@
<xs:enumeration value="AirFilter"/> <xs:enumeration value="AirFilter"/>
<xs:enumeration value="AirFryer"/> <xs:enumeration value="AirFryer"/>
<xs:enumeration value="AirQualitySensor"/> <xs:enumeration value="AirQualitySensor"/>
<xs:enumeration value="AlarmDevice"/>
<xs:enumeration value="AlarmSystem"/> <xs:enumeration value="AlarmSystem"/>
<xs:enumeration value="Aquarium"/> <xs:enumeration value="Aquarium"/>
<xs:enumeration value="AudioVisual"/> <xs:enumeration value="AudioVisual"/>
@ -372,12 +377,14 @@
<xs:enumeration value="CleaningRobot"/> <xs:enumeration value="CleaningRobot"/>
<xs:enumeration value="CO2Sensor"/> <xs:enumeration value="CO2Sensor"/>
<xs:enumeration value="Computer"/> <xs:enumeration value="Computer"/>
<xs:enumeration value="ContactSensor"/>
<xs:enumeration value="ControlDevice"/> <xs:enumeration value="ControlDevice"/>
<xs:enumeration value="Cooktop"/> <xs:enumeration value="Cooktop"/>
<xs:enumeration value="COSensor"/> <xs:enumeration value="COSensor"/>
<xs:enumeration value="Dehumidifier"/> <xs:enumeration value="Dehumidifier"/>
<xs:enumeration value="Dial"/> <xs:enumeration value="Dial"/>
<xs:enumeration value="Dishwasher"/> <xs:enumeration value="Dishwasher"/>
<xs:enumeration value="Display"/>
<xs:enumeration value="Door"/> <xs:enumeration value="Door"/>
<xs:enumeration value="Doorbell"/> <xs:enumeration value="Doorbell"/>
<xs:enumeration value="Downlight"/> <xs:enumeration value="Downlight"/>
@ -388,7 +395,9 @@
<xs:enumeration value="EVSE"/> <xs:enumeration value="EVSE"/>
<xs:enumeration value="ExhaustFan"/> <xs:enumeration value="ExhaustFan"/>
<xs:enumeration value="Fan"/> <xs:enumeration value="Fan"/>
<xs:enumeration value="FireDetector"/>
<xs:enumeration value="Firewall"/> <xs:enumeration value="Firewall"/>
<xs:enumeration value="FlameDetector"/>
<xs:enumeration value="FloodLight"/> <xs:enumeration value="FloodLight"/>
<xs:enumeration value="FloorHeating"/> <xs:enumeration value="FloorHeating"/>
<xs:enumeration value="FoodProcessor"/> <xs:enumeration value="FoodProcessor"/>
@ -478,6 +487,7 @@
<xs:enumeration value="UPS"/> <xs:enumeration value="UPS"/>
<xs:enumeration value="Valve"/> <xs:enumeration value="Valve"/>
<xs:enumeration value="Vehicle"/> <xs:enumeration value="Vehicle"/>
<xs:enumeration value="VibrationSensor"/>
<xs:enumeration value="VoiceAssistant"/> <xs:enumeration value="VoiceAssistant"/>
<xs:enumeration value="WallLight"/> <xs:enumeration value="WallLight"/>
<xs:enumeration value="WallSwitch"/> <xs:enumeration value="WallSwitch"/>