From ad7612dba7963ef93c140bebb743aa3aab429928 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 13 Apr 2025 15:12:05 +0100 Subject: [PATCH] Semantic Tags: Tweaks to tags (#4708) * Tweaks to Point and Property tags Signed-off-by: Andrew Fiddian-Green --- .../model/SemanticTags.csv | 38 ++-- .../model/DefaultSemanticTagProvider.java | 38 ++-- .../semantics/model/DefaultSemanticTags.java | 180 +++++++++++------- .../src/main/resources/tags.properties | 38 ++-- .../schema/thing/thing-description-1.0.0.xsd | 26 ++- 5 files changed, 205 insertions(+), 115 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 6c3110dd2b..9eeb7b6443 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -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, @@ -59,9 +56,11 @@ 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,, +Property,Enabled,,Enabled,, Property,Energy,,Energy,, Property,Frequency,,Frequency,, Property,Gas,,Gas,, @@ -70,14 +69,18 @@ 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,Moisture,,Moisture,, +Property,Motion,,Motion,, Property,Noise,,Noise,, Property,Oil,,Oil,, -Property,OnOff,,On Off,, -Property,OpenClosed,,Open Closed,, 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,Presence,,Presence,, Property,Pressure,,Pressure,, @@ -88,6 +91,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,, @@ -97,15 +101,18 @@ 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,Display,AudioVisual,Display,, +Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers", +Equipment,Television,Display,Television,"Televisions, TV, TVs", Equipment,MediaPlayer,AudioVisual,Media Player,, Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", Equipment,Screen,AudioVisual,Screen,Screens, -Equipment,Television,AudioVisual,Television,"Televisions, TV, TVs", +Equipment,Speaker,AudioVisual,Speaker,Speakers, Equipment,Battery,,Battery,Batteries, 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,Computer,,Computer,, @@ -185,7 +192,6 @@ Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply, Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine, Equipment,Printer,,Printer,, Equipment,Printer3D,Printer,3D Printer,, -Equipment,Projector,,Projector,"Projectors, Beamer, Beamers", Equipment,Pump,,Pump,Pumps, Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", Equipment,RemoteControl,,Remote Control,Remote Controls, @@ -193,23 +199,26 @@ Equipment,Sensor,,Sensor,Sensors, Equipment,AirQualitySensor,Sensor,Air Quality Sensor,, Equipment,CO2Sensor,Sensor,CO2 Sensor,, Equipment,COSensor,Sensor,CO Sensor,, +Equipment,ContactSensor,Sensor,Contact Sensor,, 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,GlassBreakDetector,Sensor,Glass Break Detector,, -Equipment,HeatDetector,Sensor,Heat Detector,Flame detector, Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer, Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,, Equipment,LeakSensor,Sensor,Leak Sensor,, Equipment,OccupancySensor,Sensor,Occupancy Sensor,, Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors", -Equipment,SmokeDetector,Sensor,Smoke Detector,Smoke Detectors, Equipment,TemperatureSensor,Sensor,Temperature Sensor,, +Equipment,VibrationSensor,Sensor,Vibration Sensor,, Equipment,WaterMeter,Sensor,Water Meter,, Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,, Equipment,WeatherStation,Sensor,Weather Station,, Equipment,Siren,,Siren,Sirens, Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones", -Equipment,Speaker,,Speaker,Speakers, Equipment,Tool,,Tool,, Equipment,Tracker,,Tracker,, Equipment,Valve,,Valve,Valves, @@ -244,4 +253,5 @@ Equipment,Toaster,WhiteGood,Toaster,Toaster Oven, Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines, Equipment,Window,,Window,Windows, Equipment,WindowCovering,,Window Covering,, +Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters", Equipment,Drapes,WindowCovering,Drapes,Curtains, diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java index 809f95e724..3f35b2d623 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTagProvider.java @@ -78,13 +78,10 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { 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); @@ -99,9 +96,11 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { 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); + defaultTags.add(DefaultSemanticTags.Property.ENABLED); defaultTags.add(DefaultSemanticTags.Property.ENERGY); defaultTags.add(DefaultSemanticTags.Property.FREQUENCY); defaultTags.add(DefaultSemanticTags.Property.GAS); @@ -110,14 +109,18 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { 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.MOISTURE); + defaultTags.add(DefaultSemanticTags.Property.MOTION); 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.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.PRESENCE); defaultTags.add(DefaultSemanticTags.Property.PRESSURE); @@ -128,6 +131,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { 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); @@ -137,15 +141,18 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { 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.DISPLAY); + defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR); + defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION); defaultTags.add(DefaultSemanticTags.Equipment.MEDIA_PLAYER); defaultTags.add(DefaultSemanticTags.Equipment.RECEIVER); defaultTags.add(DefaultSemanticTags.Equipment.SCREEN); - defaultTags.add(DefaultSemanticTags.Equipment.TELEVISION); + defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER); defaultTags.add(DefaultSemanticTags.Equipment.BATTERY); defaultTags.add(DefaultSemanticTags.Equipment.BED); - defaultTags.add(DefaultSemanticTags.Equipment.BLINDS); defaultTags.add(DefaultSemanticTags.Equipment.CAMERA); defaultTags.add(DefaultSemanticTags.Equipment.CLEANING_ROBOT); defaultTags.add(DefaultSemanticTags.Equipment.COMPUTER); @@ -225,7 +232,6 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { defaultTags.add(DefaultSemanticTags.Equipment.WIND_GENERATOR); defaultTags.add(DefaultSemanticTags.Equipment.PRINTER); defaultTags.add(DefaultSemanticTags.Equipment.PRINTER3D); - defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR); defaultTags.add(DefaultSemanticTags.Equipment.PUMP); defaultTags.add(DefaultSemanticTags.Equipment.WATER_FEATURE); 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.CO2_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.CO_SENSOR); + defaultTags.add(DefaultSemanticTags.Equipment.CONTACT_SENSOR); 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.GLASS_BREAK_DETECTOR); - defaultTags.add(DefaultSemanticTags.Equipment.HEAT_DETECTOR); defaultTags.add(DefaultSemanticTags.Equipment.HUMIDITY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.ILLUMINANCE_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.LEAK_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.OCCUPANCY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.MOTION_DETECTOR); - defaultTags.add(DefaultSemanticTags.Equipment.SMOKE_DETECTOR); defaultTags.add(DefaultSemanticTags.Equipment.TEMPERATURE_SENSOR); + defaultTags.add(DefaultSemanticTags.Equipment.VIBRATION_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.WATER_METER); defaultTags.add(DefaultSemanticTags.Equipment.WATER_QUALITY_SENSOR); defaultTags.add(DefaultSemanticTags.Equipment.WEATHER_STATION); defaultTags.add(DefaultSemanticTags.Equipment.SIREN); defaultTags.add(DefaultSemanticTags.Equipment.SMARTPHONE); - defaultTags.add(DefaultSemanticTags.Equipment.SPEAKER); defaultTags.add(DefaultSemanticTags.Equipment.TOOL); defaultTags.add(DefaultSemanticTags.Equipment.TRACKER); defaultTags.add(DefaultSemanticTags.Equipment.VALVE); @@ -284,6 +293,7 @@ public class DefaultSemanticTagProvider implements SemanticTagProvider { defaultTags.add(DefaultSemanticTags.Equipment.WASHING_MACHINE); defaultTags.add(DefaultSemanticTags.Equipment.WINDOW); defaultTags.add(DefaultSemanticTags.Equipment.WINDOW_COVERING); + defaultTags.add(DefaultSemanticTags.Equipment.BLINDS); defaultTags.add(DefaultSemanticTags.Equipment.DRAPES); } diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java index 1710eb9320..a1c181bc3e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/DefaultSemanticTags.java @@ -228,6 +228,11 @@ public class DefaultSemanticTags { "Switch", // "", // ""); + public static final SemanticTag FORECAST = new SemanticTagImpl( // + "Point_Forecast", // + "Forecast", // + "", // + ""); public static final SemanticTag MEASUREMENT = new SemanticTagImpl( // "Point_Measurement", // "Measurement", // @@ -243,26 +248,6 @@ public class DefaultSemanticTags { "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 { @@ -336,6 +321,11 @@ public class DefaultSemanticTags { "Channel", // "", // ""); + public static final SemanticTag COLOR = new SemanticTagImpl( // + "Property_Color", // + "Color", // + "", // + ""); public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( // "Property_ColorTemperature", // "Color Temperature", // @@ -351,6 +341,11 @@ public class DefaultSemanticTags { "Duration", // "", // ""); + public static final SemanticTag ENABLED = new SemanticTagImpl( // + "Property_Enabled", // + "Enabled", // + "", // + ""); public static final SemanticTag ENERGY = new SemanticTagImpl( // "Property_Energy", // "Energy", // @@ -391,19 +386,29 @@ public class DefaultSemanticTags { "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", // "", // ""); - public static final SemanticTag AUTO_MANUAL = new SemanticTagImpl( // - "Property_Mode_AutoManual", // - "Auto Manual", // + public static final SemanticTag MOISTURE = new SemanticTagImpl( // + "Property_Moisture", // + "Moisture", // "", // ""); - public static final SemanticTag ENABLED_DISABLED = new SemanticTagImpl( // - "Property_Mode_EnabledDisabled", // - "Enabled Disabled", // + public static final SemanticTag MOTION = new SemanticTagImpl( // + "Property_Motion", // + "Motion", // "", // ""); public static final SemanticTag NOISE = new SemanticTagImpl( // @@ -416,21 +421,31 @@ public class DefaultSemanticTags { "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( // "Property_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( // "Property_Power", // "Power", // @@ -481,6 +496,11 @@ public class DefaultSemanticTags { "Speed", // "", // ""); + public static final SemanticTag TAMPERED = new SemanticTagImpl( // + "Property_Tampered", // + "Tampered", // + "", // + ""); public static final SemanticTag TEMPERATURE = new SemanticTagImpl( // "Property_Temperature", // "Temperature", // @@ -529,6 +549,11 @@ public class DefaultSemanticTags { } 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", // @@ -539,6 +564,21 @@ public class DefaultSemanticTags { "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( // "Equipment_AudioVisual_MediaPlayer", // "Media Player", // @@ -554,11 +594,11 @@ public class DefaultSemanticTags { "Screen", // "", // "Screens"); - public static final SemanticTag TELEVISION = new SemanticTagImpl( // - "Equipment_AudioVisual_Television", // - "Television", // + public static final SemanticTag SPEAKER = new SemanticTagImpl( // + "Equipment_AudioVisual_Speaker", // + "Speaker", // "", // - "Televisions, TV, TVs"); + "Speakers"); public static final SemanticTag BATTERY = new SemanticTagImpl( // "Equipment_Battery", // "Battery", // @@ -569,11 +609,6 @@ public class DefaultSemanticTags { "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( // "Equipment_Camera", // "Camera", // @@ -969,11 +1004,6 @@ public class DefaultSemanticTags { "3D Printer", // "", // ""); - public static final SemanticTag PROJECTOR = new SemanticTagImpl( // - "Equipment_Projector", // - "Projector", // - "", // - "Projectors, Beamer, Beamers"); public static final SemanticTag PUMP = new SemanticTagImpl( // "Equipment_Pump", // "Pump", // @@ -1009,11 +1039,36 @@ public class DefaultSemanticTags { "CO Sensor", // "", // ""); + public static final SemanticTag CONTACT_SENSOR = new SemanticTagImpl( // + "Equipment_Sensor_ContactSensor", // + "Contact Sensor", // + "", // + ""); public static final SemanticTag ELECTRIC_METER = new SemanticTagImpl( // "Equipment_Sensor_ElectricMeter", // "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( // "Equipment_Sensor_GasMeter", // "Gas Meter", // @@ -1024,11 +1079,6 @@ public class DefaultSemanticTags { "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( // "Equipment_Sensor_HumiditySensor", // "Humidity Sensor", // @@ -1054,16 +1104,16 @@ public class DefaultSemanticTags { "Motion Detector", // "", // "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( // "Equipment_Sensor_TemperatureSensor", // "Temperature Sensor", // "", // ""); + public static final SemanticTag VIBRATION_SENSOR = new SemanticTagImpl( // + "Equipment_Sensor_VibrationSensor", // + "Vibration Sensor", // + "", // + ""); public static final SemanticTag WATER_METER = new SemanticTagImpl( // "Equipment_Sensor_WaterMeter", // "Water Meter", // @@ -1089,11 +1139,6 @@ public class DefaultSemanticTags { "Smartphone", // "", // "Smartphones, Phone, Phones"); - public static final SemanticTag SPEAKER = new SemanticTagImpl( // - "Equipment_Speaker", // - "Speaker", // - "", // - "Speakers"); public static final SemanticTag TOOL = new SemanticTagImpl( // "Equipment_Tool", // "Tool", // @@ -1264,6 +1309,11 @@ public class DefaultSemanticTags { "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( // "Equipment_WindowCovering_Drapes", // "Drapes", // diff --git a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties index 591a648aa1..bad7c0849a 100644 --- a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties +++ b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties @@ -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 @@ -59,9 +56,11 @@ 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 +Property_Enabled=Enabled Property_Energy=Energy Property_Frequency=Frequency Property_Gas=Gas @@ -70,14 +69,18 @@ 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_Moisture=Moisture +Property_Motion=Motion Property_Noise=Noise Property_Oil=Oil -Property_OnOff=On Off -Property_OpenClosed=Open Closed 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_Presence=Presence Property_Pressure=Pressure @@ -88,6 +91,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 @@ -97,15 +101,18 @@ 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_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_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers Equipment_AudioVisual_Screen=Screen,Screens -Equipment_AudioVisual_Television=Television,Televisions,TV,TVs +Equipment_AudioVisual_Speaker=Speaker,Speakers Equipment_Battery=Battery,Batteries 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_Computer=Computer @@ -185,7 +192,6 @@ Equipment_PowerSupply_UPS=UPS,Uninterruptible Power Supply Equipment_PowerSupply_WindGenerator=Wind Generator,Wind Turbine Equipment_Printer=Printer Equipment_Printer_Printer3D=3D Printer -Equipment_Projector=Projector,Projectors,Beamer,Beamers Equipment_Pump=Pump,Pumps Equipment_Pump_WaterFeature=Water Feature,Waterfall,Pond Pump Equipment_RemoteControl=Remote Control,Remote Controls @@ -193,23 +199,26 @@ Equipment_Sensor=Sensor,Sensors Equipment_Sensor_AirQualitySensor=Air Quality Sensor Equipment_Sensor_CO2Sensor=CO2 Sensor Equipment_Sensor_COSensor=CO Sensor +Equipment_Sensor_ContactSensor=Contact Sensor 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_GlassBreakDetector=Glass Break Detector -Equipment_Sensor_HeatDetector=Heat Detector,Flame detector Equipment_Sensor_HumiditySensor=Humidity Sensor,Hygrometer Equipment_Sensor_IlluminanceSensor=Illuminance Sensor Equipment_Sensor_LeakSensor=Leak Sensor Equipment_Sensor_OccupancySensor=Occupancy Sensor 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_VibrationSensor=Vibration Sensor Equipment_Sensor_WaterMeter=Water Meter Equipment_Sensor_WaterQualitySensor=Water Quality Sensor Equipment_Sensor_WeatherStation=Weather Station Equipment_Siren=Siren,Sirens Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones -Equipment_Speaker=Speaker,Speakers Equipment_Tool=Tool Equipment_Tracker=Tracker Equipment_Valve=Valve,Valves @@ -244,4 +253,5 @@ Equipment_WhiteGood_Toaster=Toaster,Toaster Oven Equipment_WhiteGood_WashingMachine=Washing Machine,Washing Machines Equipment_Window=Window,Windows Equipment_WindowCovering=Window Covering +Equipment_WindowCovering_Blinds=Blinds,Rollershutter,Rollershutters,Roller shutter,Roller shutters,Shutter,Shutters Equipment_WindowCovering_Drapes=Drapes,Curtains diff --git a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd index cdae8bca7c..c92c532da6 100644 --- a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd +++ b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd @@ -280,32 +280,38 @@ - + - + + + + + + - - + + + @@ -317,6 +323,7 @@ + @@ -333,14 +340,11 @@ - + - - - @@ -354,6 +358,7 @@ + @@ -372,12 +377,14 @@ + + @@ -388,7 +395,9 @@ + + @@ -478,6 +487,7 @@ +