From c554e76c3dce2fbed40f1a56430a0b37c36e2392 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 15:44:26 +0100 Subject: [PATCH 01/26] Add tag descriptions Signed-off-by: Andrew Fiddian-Green --- .../model/SemanticTags.csv | 447 +++++++++--------- 1 file changed, 225 insertions(+), 222 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index c9bd8f802cf..d64791384ba 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -35,226 +35,229 @@ Location,Garden,Outdoor,Garden,Gardens, Location,Patio,Outdoor,Patio,Patios, Location,Porch,Outdoor,Porch,Porches, 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,, -Property,AirQuality,,Air Quality,, -Property,AQI,AirQuality,AQI,Air Quality Index, -Property,CO,AirQuality,CO,Carbon Monoxide, -Property,CO2,AirQuality,CO2,Carbon Dioxide, -Property,Ozone,AirQuality,Ozone,, -Property,ParticulateMatter,AirQuality,Particulate Matter,PM25, -Property,Pollen,AirQuality,Pollen,, -Property,Radon,AirQuality,Radon,, -Property,VOC,AirQuality,VOC,Volatile Organic Compounds, -Property,Airconditioning,,Airconditioning,, -Property,Airflow,,Airflow,, +Point,Alarm,,Alarm,,Read only data point indicating an alarm condition +Point,Calculation,,Calculation,,Read only analog calculated data point +Point,Control,,Control,,Read/write analog data point +Point,Switch,Control,Switch,,Read/write digital data point +Point,Forecast,,Forecast,,Read only analog predicted data point +Point,Measurement,,Measurement,,Read only analog data point from a sensor +Point,Setpoint,,Setpoint,,Read/write analog data point for a controller +Point,Status,,Status,,Read only data point indicating a status condition +Property,AirQuality,,Air Quality,,Index of air quality +Property,AQI,AirQuality,AQI,Air Quality Index,Aqi reading +Property,CO,AirQuality,CO,Carbon Monoxide,Co reading +Property,CO2,AirQuality,CO2,Carbon Dioxide,Co2 reading +Property,Ozone,AirQuality,Ozone,,Ozone reading +Property,ParticulateMatter,AirQuality,Particulate Matter,PM25,Particulate matter reading +Property,Pollen,AirQuality,Pollen,,Pollen reading +Property,Radon,AirQuality,Radon,,Radon reading +Property,VOC,AirQuality,VOC,Volatile Organic Compounds,Volatile organic compounds reading +Property,Airconditioning,,Airconditioning,,Related to airconditioning +Property,Airflow,,Airflow,,Airflow measurement 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,, -Property,Heating,,Heating,, -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,Moisture,,Moisture,, -Property,Motion,,Motion,, -Property,Noise,,Noise,, -Property,Oil,,Oil,, -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,, -Property,QualityOfService,,Quality of Service,, -Property,Rain,,Rain,, -Property,SignalStrength,,Signal Strength,, -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,, -Property,Ultraviolet,,Ultraviolet,UV, -Property,Ventilation,,Ventilation,, -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,Speaker,AudioVisual,Speaker,Speakers, -Equipment,Bed,,Bed,, -Equipment,Camera,,Camera,Cameras, -Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots", -Equipment,Computer,,Computer,, -Equipment,ControlDevice,,Control Device,, -Equipment,Button,ControlDevice,Button,, -Equipment,Dial,ControlDevice,Dial,Rotary Dial, -Equipment,Keypad,ControlDevice,Keypad,, -Equipment,Slider,ControlDevice,Slider,, -Equipment,WallSwitch,ControlDevice,Wall Switch,Wall Switches, -Equipment,Door,,Door,Doors, -Equipment,BackDoor,Door,Back Door,Back Doors, -Equipment,CellarDoor,Door,Cellar Door,Cellar Doors, -Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors", -Equipment,GarageDoor,Door,Garage Door,Garage Doors, -Equipment,Gate,Door,Gate,Gates, -Equipment,InnerDoor,Door,Inner Door,Inner Doors, -Equipment,SideDoor,Door,Side Door,Side Doors, -Equipment,Doorbell,,Doorbell,Doorbells, -Equipment,DrinkingWater,,Drinking Water,Potable Water, -Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet", -Equipment,WaterFilter,DrinkingWater,Water Filter,, -Equipment,WaterSoftener,DrinkingWater,Water Softener,, -Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC", -Equipment,AirConditioner,HVAC,Air Conditioner,, -Equipment,AirFilter,HVAC,Air Filter,, -Equipment,Boiler,HVAC,Boiler,Boilers, -Equipment,Dehumidifier,HVAC,Dehumidifier,, -Equipment,Fan,HVAC,Fan,Fans, -Equipment,CeilingFan,Fan,Ceiling Fan,Ceiling Fans, -Equipment,ExhaustFan,Fan,Exhaust Fan,"Extract Fan, Toilet Fan", -Equipment,KitchenHood,Fan,Kitchen Hood,Kitchen Hoods, -Equipment,FloorHeating,HVAC,Floor Heating,"Underfloor Heating, Radiant Floor Heating", -Equipment,Furnace,HVAC,Furnace,"Wood Burner, Wood Heater", -Equipment,HeatPump,HVAC,Heat Pump,, -Equipment,HeatRecovery,HVAC,Heat Recovery,Energy Recovery, -Equipment,Humidifier,HVAC,Humidifier,, -Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Radiators", -Equipment,SmartVent,HVAC,Smart Vent,, -Equipment,Thermostat,HVAC,Thermostat,, -Equipment,WaterHeater,HVAC,Water Heater,Water Boiler, -Equipment,Horticulture,,Horticulture,, -Equipment,Irrigation,Horticulture,Irrigation,"Sprinkler, Drip System", -Equipment,LawnMower,Horticulture,Lawn Mower,Lawn Mowers, -Equipment,SoilSensor,Horticulture,Soil Sensor,Moisture Sensor, -Equipment,LightSource,,Light Source,"Lights, Lighting", -Equipment,AccentLight,LightSource,Accent Light,, -Equipment,Chandelier,LightSource,Chandelier,, -Equipment,Downlight,LightSource,Downlight,"Can Light, Pot Light", -Equipment,FloodLight,LightSource,Flood Light,, -Equipment,Lamp,LightSource,Lamp,, -Equipment,LightStrip,LightSource,Light Strip,LED Strip, -Equipment,LightStripe,LightSource,Light Stripe,Light Stripes, -Equipment,Lightbulb,LightSource,Light Bulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps", -Equipment,Pendant,LightSource,Pendant,, -Equipment,Sconce,LightSource,Sconce,, -Equipment,SpotLight,LightSource,Spot Light,, -Equipment,TrackLight,LightSource,Track Light,, -Equipment,WallLight,LightSource,Wall Light,, -Equipment,Lock,,Lock,Locks, -Equipment,NetworkAppliance,,Network Appliance,Network Appliances, -Equipment,Firewall,NetworkAppliance,Firewall,, -Equipment,NetworkSwitch,NetworkAppliance,Network Switch,, -Equipment,Router,NetworkAppliance,Router,, -Equipment,WirelessAccessPoint,NetworkAppliance,Wireless Access Point,"Access Point, WAP, WiFi, WiFi Access Point", -Equipment,PetCare,,Pet Care,, -Equipment,Aquarium,PetCare,Aquarium,Fish Tank, -Equipment,PetFeeder,PetCare,Pet Feeder,, -Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap", -Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs", -Equipment,PowerSupply,,Power Supply,, -Equipment,Battery,PowerSupply,Battery,Batteries, -Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger", -Equipment,Generator,PowerSupply,Generator,Emergency Generator, -Equipment,Inverter,PowerSupply,Inverter,Inverters, -Equipment,SolarPanel,PowerSupply,Solar Panel,, -Equipment,TransferSwitch,PowerSupply,Transfer Switch,, -Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply, -Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine, -Equipment,Printer,,Printer,, -Equipment,Printer3D,Printer,3D Printer,, -Equipment,Pump,,Pump,Pumps, -Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", -Equipment,RemoteControl,,Remote Control,Remote Controls, -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,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,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,Tool,,Tool,, -Equipment,Tracker,,Tracker,, -Equipment,Valve,,Valve,Valves, -Equipment,Vehicle,,Vehicle,, -Equipment,Car,Vehicle,Car,, -Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants, -Equipment,WebService,,Web Service,Web Services, -Equipment,WeatherService,WebService,Weather Service,Weather Services, -Equipment,Wellness,,Wellness,, -Equipment,Chlorinator,Wellness,Chlorinator,, -Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool", -Equipment,PoolCover,Wellness,Pool Cover,, -Equipment,PoolHeater,Wellness,Pool Heater,, -Equipment,Sauna,Wellness,Sauna,Steam Room, -Equipment,Shower,Wellness,Shower,, -Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool", -Equipment,WhiteGood,,White Good,White Goods, -Equipment,AirFryer,WhiteGood,Air Fryer,, -Equipment,CoffeeMaker,WhiteGood,Coffee Maker,"Coffee Makers, Coffee Machine, Coffee Machines", -Equipment,Cooktop,WhiteGood,Cooktop,Hob, -Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers, -Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers", -Equipment,FoodProcessor,WhiteGood,Food Processor,, -Equipment,Freezer,WhiteGood,Freezer,Freezers, -Equipment,Fryer,WhiteGood,Fryer,, -Equipment,IceMaker,WhiteGood,Ice Maker,, -Equipment,Microwave,WhiteGood,Microwave,, -Equipment,Mixer,WhiteGood,Mixer,, -Equipment,Oven,WhiteGood,Oven,Ovens, -Equipment,Range,WhiteGood,Range,, -Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators, -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, -Equipment,Zone,,Zone,, -Equipment,AlarmZone,Zone,Alarm Zone,, +Property,Brightness,,Brightness,,Brightness of a light source +Property,Channel,,Channel,,Radio or TV channel +Property,Color,,Color,,Color of a light source +Property,ColorTemperature,,Color Temperature,,Color temperature of a light source +Property,Current,,Current,,Electric current +Property,Duration,,Duration,,Time duration +Property,Enabled,,Enabled,,Enabled state +Property,Energy,,Energy,,Energy consumption +Property,Frequency,,Frequency,,Electric frequency +Property,Gas,,Gas,,Gas measurement +Property,Heating,,Heating,,Related to heating +Property,Humidity,,Humidity,Moisture,Humidity value +Property,Illuminance,,Illuminance,,Illuminance value +Property,Info,,Information,,General information +Property,Level,,Level,,Fluid level +Property,Light,,Light,"Lights, Lighting",Control/status of a light +Property,LowBattery,,Low Battery,,Low battery indication +Property,MediaControl,,Media Control,,Media control +Property,Mode,,Mode,,Operating mode +Property,Moisture,,Moisture,,Moisture value +Property,Motion,,Motion,,Motion detected +Property,Noise,,Noise,,Noise measurement +Property,Oil,,Oil,,Oil measurement +Property,Opening,,Opening,,Opening of a door/window etc. +Property,OpenLevel,Opening,Open Level,,Open level of a door/window etc. +Property,OpenState,Opening,Open State,Open Closed,Open state of a door/window etc. +Property,Position,,Position,,Position measurement or control +Property,GeoLocation,Position,Geo Location,,Geo location coordinate +Property,Power,,Power,,Power measurement +Property,Presence,,Presence,,Presence detection +Property,Pressure,,Pressure,,Fluid pressure measurement +Property,QualityOfService,,Quality of Service,,Quality of service +Property,Rain,,Rain,,Rain measurement +Property,SignalStrength,,Signal Strength,,Signal strength measurement +Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,Received signal strength indication +Property,Smoke,,Smoke,,Smoke detection +Property,SoundVolume,,Sound Volume,,Sound volume level +Property,Speed,,Speed,,Speed measurement/setting +Property,Tampered,,Tampered,,Tampering detected +Property,Temperature,,Temperature,Temperatures,Temperature measurement +Property,Tilt,,Tilt,,Tilt of a shade or shutter +Property,Timestamp,,Timestamp,,Timestamp of an event +Property,Ultraviolet,,Ultraviolet,UV,Ultraviolet measurement +Property,Ventilation,,Ventilation,,Related to ventilation +Property,Vibration,,Vibration,,Vibration level +Property,Voltage,,Voltage,,Electric voltage +Property,Water,,Water,,Water measurement +Property,Wind,,Wind,,Wind speed or direction +Equipment,AlarmDevice,,Alarm Device,,Alarm device +Equipment,AlarmSystem,,Alarm System,Alarm Systems,Alarm system +Equipment,Application,,Application,"App, Software program",Software program +Equipment,AudioVisual,,Audio Visual,,Audio visual device +Equipment,Display,AudioVisual,Display,,Visual display +Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",Projector +Equipment,Television,Display,Television,"Televisions, TV, TVs",Television +Equipment,MediaPlayer,AudioVisual,Media Player,,Media player +Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",Receiver +Equipment,Screen,AudioVisual,Screen,Screens,Computer screen +Equipment,Speaker,AudioVisual,Speaker,Speakers,Loudspeaker +Equipment,Bed,,Bed,,Bed +Equipment,Camera,,Camera,Cameras,Camera +Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",Cleaning robot +Equipment,Computer,,Computer,,Computer +Equipment,ControlDevice,,Control Device,,Control device +Equipment,Button,ControlDevice,Button,,Push button +Equipment,Dial,ControlDevice,Dial,Rotary Dial,Rotary dial +Equipment,Keypad,ControlDevice,Keypad,,Keypad +Equipment,Slider,ControlDevice,Slider,,Slider control +Equipment,WallSwitch,ControlDevice,Wall Switch,Wall Switches,Wall switch +Equipment,Door,,Door,Doors,Door +Equipment,BackDoor,Door,Back Door,Back Doors,Back door +Equipment,CellarDoor,Door,Cellar Door,Cellar Doors,Cellar door +Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors",Front door +Equipment,GarageDoor,Door,Garage Door,Garage Doors,Garage door +Equipment,Gate,Door,Gate,Gates,Gate +Equipment,InnerDoor,Door,Inner Door,Inner Doors,Inner door +Equipment,SideDoor,Door,Side Door,Side Doors,Side door +Equipment,Doorbell,,Doorbell,Doorbells,Doorbell +Equipment,DrinkingWater,,Drinking Water,Potable Water,Related to drinking water +Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet +Equipment,WaterFilter,DrinkingWater,Water Filter,,Water filter +Equipment,WaterSoftener,DrinkingWater,Water Softener,,Water softener +Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Related to HVAChvac +Equipment,AirConditioner,HVAC,Air Conditioner,,Air conditioner +Equipment,AirFilter,HVAC,Air Filter,,Air filter +Equipment,Boiler,HVAC,Boiler,Boilers,Boiler +Equipment,Dehumidifier,HVAC,Dehumidifier,,Dehumidifier +Equipment,Fan,HVAC,Fan,Fans,Fan +Equipment,CeilingFan,Fan,Ceiling Fan,Ceiling Fans,Ceiling fan +Equipment,ExhaustFan,Fan,Exhaust Fan,"Extract Fan, Toilet Fan",Exhaust fan +Equipment,KitchenHood,Fan,Kitchen Hood,Kitchen Hoods,Kitchen hood +Equipment,FloorHeating,HVAC,Floor Heating,"Underfloor Heating, Radiant Floor Heating",Floor heating +Equipment,Furnace,HVAC,Furnace,"Wood Burner, Wood Heater",Furnace +Equipment,HeatPump,HVAC,Heat Pump,,Heat pump +Equipment,HeatRecovery,HVAC,Heat Recovery,Energy Recovery,Heat recovery +Equipment,Humidifier,HVAC,Humidifier,,Humidifier +Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Radiators",Radiator control +Equipment,SmartVent,HVAC,Smart Vent,,Smart ventilation device +Equipment,Thermostat,HVAC,Thermostat,,Thermostat +Equipment,WaterHeater,HVAC,Water Heater,Water Boiler,Water heater +Equipment,Horticulture,,Horticulture,,Related to horticulture +Equipment,Irrigation,Horticulture,Irrigation,"Sprinkler, Drip System",Related to irrigation +Equipment,LawnMower,Horticulture,Lawn Mower,Lawn Mowers,Lawn mower +Equipment,SoilSensor,Horticulture,Soil Sensor,Moisture Sensor,Soil sensor +Equipment,LightSource,,Light Source,"Lights, Lighting",Light source +Equipment,AccentLight,LightSource,Accent Light,,Accent light +Equipment,Chandelier,LightSource,Chandelier,,Chandelier +Equipment,Downlight,LightSource,Downlight,"Can Light, Pot Light",Downlight +Equipment,FloodLight,LightSource,Flood Light,,Flood light +Equipment,Lamp,LightSource,Lamp,,Lamp +Equipment,LightStrip,LightSource,Light Strip,LED Strip,Light strip +Equipment,LightStripe,LightSource,Light Stripe,Light Stripes,Light stripe +Equipment,Lightbulb,LightSource,Light Bulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps",Light bulb +Equipment,Pendant,LightSource,Pendant,,Pendant light +Equipment,Sconce,LightSource,Sconce,,Sconce light +Equipment,SpotLight,LightSource,Spot Light,,Spot light +Equipment,TrackLight,LightSource,Track Light,,Track light +Equipment,WallLight,LightSource,Wall Light,,Wall light +Equipment,Lock,,Lock,Locks,Door- or window- lock +Equipment,NetworkAppliance,,Network Appliance,Network Appliances,Network appliance +Equipment,Firewall,NetworkAppliance,Firewall,,Firewall +Equipment,NetworkSwitch,NetworkAppliance,Network Switch,,Network switch +Equipment,Router,NetworkAppliance,Router,,Network router +Equipment,WirelessAccessPoint,NetworkAppliance,Wireless Access Point,"Access Point, WAP, WiFi, WiFi Access Point",Wireless access point +Equipment,PetCare,,Pet Care,,Related to pet care +Equipment,Aquarium,PetCare,Aquarium,Fish Tank,Aquarium +Equipment,PetFeeder,PetCare,Pet Feeder,,Pet feeder +Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap",Pet flap +Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs",Power outlet +Equipment,PowerSupply,,Power Supply,,Power supply +Equipment,Battery,PowerSupply,Battery,Batteries,Battery +Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger",Electric vehicle supply equipment +Equipment,Generator,PowerSupply,Generator,Emergency Generator,Electricity generator +Equipment,Inverter,PowerSupply,Inverter,Inverters,Electrical power inverter +Equipment,SolarPanel,PowerSupply,Solar Panel,,Solar panel +Equipment,TransferSwitch,PowerSupply,Transfer Switch,,Electricity transfer switch +Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,Uninterruptible power supply +Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,Wind generator +Equipment,Printer,,Printer,,Printer +Equipment,Printer3D,Printer,3D Printer,,3d printer +Equipment,Pump,,Pump,Pumps,Fluid pump +Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",Garden water feature +Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device +Equipment,Sensor,,Sensor,Sensors,Sensor +Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,Air quality sensor +Equipment,CO2Sensor,Sensor,CO2 Sensor,,Co2 sensor +Equipment,COSensor,Sensor,CO Sensor,,Co sensor +Equipment,ContactSensor,Sensor,Contact Sensor,,Contact sensor +Equipment,ElectricMeter,Sensor,Electric Meter,,Electric meter +Equipment,FireDetector,Sensor,Fire Detector,,Fire detector +Equipment,FlameDetector,FireDetector,Flame Detector,,Flame detector +Equipment,HeatDetector,FireDetector,Heat Detector,,Heat detector +Equipment,SmokeDetector,FireDetector,Smoke Detector,Smoke Detectors,Smoke detector +Equipment,GasMeter,Sensor,Gas Meter,,Gas meter +Equipment,GlassBreakDetector,Sensor,Glass Break Detector,,Glass break detector +Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer,Humidity sensor +Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,,Illuminance sensor +Equipment,LeakSensor,Sensor,Leak Sensor,,Leak sensor +Equipment,OccupancySensor,Sensor,Occupancy Sensor,,Occupancy sensor +Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors",Motion detector +Equipment,TemperatureSensor,Sensor,Temperature Sensor,,Temperature sensor +Equipment,VibrationSensor,Sensor,Vibration Sensor,,Vibration sensor +Equipment,WaterMeter,Sensor,Water Meter,,Water meter +Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,Water quality sensor +Equipment,WeatherStation,Sensor,Weather Station,,Weather station +Equipment,Siren,,Siren,Sirens,Alarm siren +Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",Smartphone +Equipment,Tool,,Tool,,Hand- or machine- tool +Equipment,Tracker,,Tracker,,Location tracker +Equipment,Valve,,Valve,Valves,Fluid valve +Equipment,Vehicle,,Vehicle,,Motor vehicle +Equipment,Car,Vehicle,Car,,Motor car +Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,Voice assistant device +Equipment,WebService,,Web Service,Web Services,Web service +Equipment,WeatherService,WebService,Weather Service,Weather Services,Weather service +Equipment,Wellness,,Wellness,,Related to wellness +Equipment,Chlorinator,Wellness,Chlorinator,,Water chlorinator +Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool",Jacuzzi +Equipment,PoolCover,Wellness,Pool Cover,,Swimming pool cover +Equipment,PoolHeater,Wellness,Pool Heater,,Swimming pool heater +Equipment,Sauna,Wellness,Sauna,Steam Room,Sauna +Equipment,Shower,Wellness,Shower,,Shower +Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool",Swimming pool +Equipment,WhiteGood,,White Good,White Goods,White goods appliance +Equipment,AirFryer,WhiteGood,Air Fryer,,Air fryer +Equipment,CoffeeMaker,WhiteGood,Coffee Maker,"Coffee Makers, Coffee Machine, Coffee Machines",Coffee maker +Equipment,Cooktop,WhiteGood,Cooktop,Hob,Cooktop appliance +Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers,Dishwasher +Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers",Laundry dryer +Equipment,FoodProcessor,WhiteGood,Food Processor,,Food processor +Equipment,Freezer,WhiteGood,Freezer,Freezers,Freezer +Equipment,Fryer,WhiteGood,Fryer,,Deep fryer +Equipment,IceMaker,WhiteGood,Ice Maker,,Ice maker +Equipment,Microwave,WhiteGood,Microwave,,Microwave cooker +Equipment,Mixer,WhiteGood,Mixer,,Food mixer +Equipment,Oven,WhiteGood,Oven,Ovens,Oven +Equipment,Range,WhiteGood,Range,,Kitchen range +Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators,Refrigerator +Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,Toaster +Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,Washing machine +Equipment,Window,,Window,Windows,Window +Equipment,WindowCovering,,Window Covering,,Window covering +Equipment,Blinds,WindowCovering,Blinds,"Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters","Window blinds, shades or shutters" +Equipment,Drapes,WindowCovering,Drapes,Curtains,Curtains or drapes +Equipment,Zone,,Zone,,Equipment zone +Equipment,AlarmZone,Zone,Alarm Zone,,Security alarm zone From ca6df3d9cfd3763748d2f486be2cb9ff48d362fe Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 16:02:04 +0100 Subject: [PATCH 02/26] apply tweaks; run script Signed-off-by: Andrew Fiddian-Green --- .../model/SemanticTags.csv | 32 +- .../model/DefaultSemanticTagProvider.java | 3 + .../semantics/model/DefaultSemanticTags.java | 459 +++++++++--------- .../src/main/resources/tags.properties | 3 + .../schema/thing/thing-description-1.0.0.xsd | 3 + 5 files changed, 262 insertions(+), 238 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index d64791384ba..271e19a5497 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -37,16 +37,16 @@ Location,Porch,Outdoor,Porch,Porches, Location,Terrace,Outdoor,Terrace,"Terraces, Deck, Decks", Point,Alarm,,Alarm,,Read only data point indicating an alarm condition Point,Calculation,,Calculation,,Read only analog calculated data point -Point,Control,,Control,,Read/write analog data point -Point,Switch,Control,Switch,,Read/write digital data point +Point,Control,,Control,,Read-Write analog data point +Point,Switch,Control,Switch,,Read-Write digital data point Point,Forecast,,Forecast,,Read only analog predicted data point Point,Measurement,,Measurement,,Read only analog data point from a sensor -Point,Setpoint,,Setpoint,,Read/write analog data point for a controller +Point,Setpoint,,Setpoint,,Read-Write analog data point for a controller Point,Status,,Status,,Read only data point indicating a status condition Property,AirQuality,,Air Quality,,Index of air quality -Property,AQI,AirQuality,AQI,Air Quality Index,Aqi reading -Property,CO,AirQuality,CO,Carbon Monoxide,Co reading -Property,CO2,AirQuality,CO2,Carbon Dioxide,Co2 reading +Property,AQI,AirQuality,AQI,Air Quality Index,Air Quality Index +Property,CO,AirQuality,CO,Carbon Monoxide,Carbon monoxide +Property,CO2,AirQuality,CO2,Carbon Dioxide,Carbon dioxide Property,Ozone,AirQuality,Ozone,,Ozone reading Property,ParticulateMatter,AirQuality,Particulate Matter,PM25,Particulate matter reading Property,Pollen,AirQuality,Pollen,,Pollen reading @@ -56,13 +56,13 @@ Property,Airconditioning,,Airconditioning,,Related to airconditioning Property,Airflow,,Airflow,,Airflow measurement Property,App,,App,Application,Software program Property,Brightness,,Brightness,,Brightness of a light source -Property,Channel,,Channel,,Radio or TV channel +Property,Channel,,Channel,,Radio or TV channel selection Property,Color,,Color,,Color of a light source Property,ColorTemperature,,Color Temperature,,Color temperature of a light source Property,Current,,Current,,Electric current Property,Duration,,Duration,,Time duration Property,Enabled,,Enabled,,Enabled state -Property,Energy,,Energy,,Energy consumption +Property,Energy,,Energy,,Energy consumption or production Property,Frequency,,Frequency,,Electric frequency Property,Gas,,Gas,,Gas measurement Property,Heating,,Heating,,Related to heating @@ -70,17 +70,17 @@ Property,Humidity,,Humidity,Moisture,Humidity value Property,Illuminance,,Illuminance,,Illuminance value Property,Info,,Information,,General information Property,Level,,Level,,Fluid level -Property,Light,,Light,"Lights, Lighting",Control/status of a light +Property,Light,,Light,"Lights, Lighting",Control or status of a light Property,LowBattery,,Low Battery,,Low battery indication -Property,MediaControl,,Media Control,,Media control +Property,MediaControl,,Media Control,,Audio- or visual- media control Property,Mode,,Mode,,Operating mode Property,Moisture,,Moisture,,Moisture value Property,Motion,,Motion,,Motion detected Property,Noise,,Noise,,Noise measurement Property,Oil,,Oil,,Oil measurement -Property,Opening,,Opening,,Opening of a door/window etc. -Property,OpenLevel,Opening,Open Level,,Open level of a door/window etc. -Property,OpenState,Opening,Open State,Open Closed,Open state of a door/window etc. +Property,Opening,,Opening,,Opening of a door or window etc. +Property,OpenLevel,Opening,Open Level,,Open position (analog) of a door or window etc. +Property,OpenState,Opening,Open State,Open Closed,Open state (digital) of a door or window etc. Property,Position,,Position,,Position measurement or control Property,GeoLocation,Position,Geo Location,,Geo location coordinate Property,Power,,Power,,Power measurement @@ -92,10 +92,10 @@ Property,SignalStrength,,Signal Strength,,Signal strength measurement Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,Received signal strength indication Property,Smoke,,Smoke,,Smoke detection Property,SoundVolume,,Sound Volume,,Sound volume level -Property,Speed,,Speed,,Speed measurement/setting +Property,Speed,,Speed,,Speed measurement or setting Property,Tampered,,Tampered,,Tampering detected Property,Temperature,,Temperature,Temperatures,Temperature measurement -Property,Tilt,,Tilt,,Tilt of a shade or shutter +Property,Tilt,,Tilt,,Tilt of a blind, shade or shutter Property,Timestamp,,Timestamp,,Timestamp of an event Property,Ultraviolet,,Ultraviolet,UV,Ultraviolet measurement Property,Ventilation,,Ventilation,,Related to ventilation @@ -137,7 +137,7 @@ Equipment,DrinkingWater,,Drinking Water,Potable Water,Related to drinking water Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet Equipment,WaterFilter,DrinkingWater,Water Filter,,Water filter Equipment,WaterSoftener,DrinkingWater,Water Softener,,Water softener -Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Related to HVAChvac +Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Related to Heating Ventilation or AirConditioning Equipment,AirConditioner,HVAC,Air Conditioner,,Air conditioner Equipment,AirFilter,HVAC,Air Filter,,Air filter Equipment,Boiler,HVAC,Boiler,Boilers,Boiler 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 a9064ffaae2..ced88259d98 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 @@ -76,6 +76,7 @@ public DefaultSemanticTagProvider() { defaultTags.add(DefaultSemanticTags.Location.PORCH); defaultTags.add(DefaultSemanticTags.Location.TERRACE); defaultTags.add(DefaultSemanticTags.Point.ALARM); + defaultTags.add(DefaultSemanticTags.Point.CALCULATION); defaultTags.add(DefaultSemanticTags.Point.CONTROL); defaultTags.add(DefaultSemanticTags.Point.SWITCH); defaultTags.add(DefaultSemanticTags.Point.FORECAST); @@ -107,6 +108,7 @@ public DefaultSemanticTagProvider() { defaultTags.add(DefaultSemanticTags.Property.HEATING); defaultTags.add(DefaultSemanticTags.Property.HUMIDITY); defaultTags.add(DefaultSemanticTags.Property.ILLUMINANCE); + defaultTags.add(DefaultSemanticTags.Property.INFO); defaultTags.add(DefaultSemanticTags.Property.LEVEL); defaultTags.add(DefaultSemanticTags.Property.LIGHT); defaultTags.add(DefaultSemanticTags.Property.LOW_BATTERY); @@ -143,6 +145,7 @@ public DefaultSemanticTagProvider() { defaultTags.add(DefaultSemanticTags.Property.WIND); defaultTags.add(DefaultSemanticTags.Equipment.ALARM_DEVICE); defaultTags.add(DefaultSemanticTags.Equipment.ALARM_SYSTEM); + defaultTags.add(DefaultSemanticTags.Equipment.APPLICATION); defaultTags.add(DefaultSemanticTags.Equipment.AUDIO_VISUAL); defaultTags.add(DefaultSemanticTags.Equipment.DISPLAY); defaultTags.add(DefaultSemanticTags.Equipment.PROJECTOR); 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 99ff3e37c8d..9f825797b4e 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 @@ -216,37 +216,42 @@ public static class Point { public static final SemanticTag ALARM = new SemanticTagImpl( // "Point_Alarm", // "Alarm", // - "", // + "Read only data point indicating an alarm condition", // + ""); + public static final SemanticTag CALCULATION = new SemanticTagImpl( // + "Point_Calculation", // + "Calculation", // + "Read only analog calculated data point", // ""); public static final SemanticTag CONTROL = new SemanticTagImpl( // "Point_Control", // "Control", // - "", // + "Read-Write analog data point", // ""); public static final SemanticTag SWITCH = new SemanticTagImpl( // "Point_Control_Switch", // "Switch", // - "", // + "Read-Write digital data point", // ""); public static final SemanticTag FORECAST = new SemanticTagImpl( // "Point_Forecast", // "Forecast", // - "", // + "Read only analog predicted data point", // ""); public static final SemanticTag MEASUREMENT = new SemanticTagImpl( // "Point_Measurement", // "Measurement", // - "", // + "Read only analog data point from a sensor", // ""); public static final SemanticTag SETPOINT = new SemanticTagImpl( // "Point_Setpoint", // "Setpoint", // - "", // + "Read-Write analog data point for a controller", // ""); public static final SemanticTag STATUS = new SemanticTagImpl( // "Point_Status", // "Status", // - "", // + "Read only data point indicating a status condition", // ""); } @@ -254,57 +259,57 @@ public static class Property { public static final SemanticTag AIR_QUALITY = new SemanticTagImpl( // "Property_AirQuality", // "Air Quality", // - "", // + "Index of air quality", // ""); public static final SemanticTag AQI = new SemanticTagImpl( // "Property_AirQuality_AQI", // "AQI", // - "", // + "Air Quality Index", // "Air Quality Index"); public static final SemanticTag CO = new SemanticTagImpl( // "Property_AirQuality_CO", // "CO", // - "", // + "Carbon monoxide", // "Carbon Monoxide"); public static final SemanticTag CO2 = new SemanticTagImpl( // "Property_AirQuality_CO2", // "CO2", // - "", // + "Carbon dioxide", // "Carbon Dioxide"); public static final SemanticTag OZONE = new SemanticTagImpl( // "Property_AirQuality_Ozone", // "Ozone", // - "", // + "Ozone reading", // ""); public static final SemanticTag PARTICULATE_MATTER = new SemanticTagImpl( // "Property_AirQuality_ParticulateMatter", // "Particulate Matter", // - "", // + "Particulate matter reading", // "PM25"); public static final SemanticTag POLLEN = new SemanticTagImpl( // "Property_AirQuality_Pollen", // "Pollen", // - "", // + "Pollen reading", // ""); public static final SemanticTag RADON = new SemanticTagImpl( // "Property_AirQuality_Radon", // "Radon", // - "", // + "Radon reading", // ""); public static final SemanticTag VOC = new SemanticTagImpl( // "Property_AirQuality_VOC", // "VOC", // - "", // + "Volatile organic compounds reading", // "Volatile Organic Compounds"); public static final SemanticTag AIRCONDITIONING = new SemanticTagImpl( // "Property_Airconditioning", // "Airconditioning", // - "", // + "Related to airconditioning", // ""); public static final SemanticTag AIRFLOW = new SemanticTagImpl( // "Property_Airflow", // "Airflow", // - "", // + "Airflow measurement", // ""); public static final SemanticTag APP = new SemanticTagImpl( // "Property_App", // @@ -314,237 +319,242 @@ public static class Property { public static final SemanticTag BRIGHTNESS = new SemanticTagImpl( // "Property_Brightness", // "Brightness", // - "", // + "Brightness of a light source", // ""); public static final SemanticTag CHANNEL = new SemanticTagImpl( // "Property_Channel", // "Channel", // - "", // + "Radio or TV channel selection", // ""); public static final SemanticTag COLOR = new SemanticTagImpl( // "Property_Color", // "Color", // - "", // + "Color of a light source", // ""); public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( // "Property_ColorTemperature", // "Color Temperature", // - "", // + "Color temperature of a light source", // ""); public static final SemanticTag CURRENT = new SemanticTagImpl( // "Property_Current", // "Current", // - "", // + "Electric current", // ""); public static final SemanticTag DURATION = new SemanticTagImpl( // "Property_Duration", // "Duration", // - "", // + "Time duration", // ""); public static final SemanticTag ENABLED = new SemanticTagImpl( // "Property_Enabled", // "Enabled", // - "", // + "Enabled state", // ""); public static final SemanticTag ENERGY = new SemanticTagImpl( // "Property_Energy", // "Energy", // - "", // + "Energy consumption or production", // ""); public static final SemanticTag FREQUENCY = new SemanticTagImpl( // "Property_Frequency", // "Frequency", // - "", // + "Electric frequency", // ""); public static final SemanticTag GAS = new SemanticTagImpl( // "Property_Gas", // "Gas", // - "", // + "Gas measurement", // ""); public static final SemanticTag HEATING = new SemanticTagImpl( // "Property_Heating", // "Heating", // - "", // + "Related to heating", // ""); public static final SemanticTag HUMIDITY = new SemanticTagImpl( // "Property_Humidity", // "Humidity", // - "", // + "Humidity value", // "Moisture"); public static final SemanticTag ILLUMINANCE = new SemanticTagImpl( // "Property_Illuminance", // "Illuminance", // - "", // + "Illuminance value", // + ""); + public static final SemanticTag INFO = new SemanticTagImpl( // + "Property_Info", // + "Information", // + "General information", // ""); public static final SemanticTag LEVEL = new SemanticTagImpl( // "Property_Level", // "Level", // - "", // + "Fluid level", // ""); public static final SemanticTag LIGHT = new SemanticTagImpl( // "Property_Light", // "Light", // - "", // + "Control or status of a light", // "Lights, Lighting"); public static final SemanticTag LOW_BATTERY = new SemanticTagImpl( // "Property_LowBattery", // "Low Battery", // - "", // + "Low battery indication", // ""); public static final SemanticTag MEDIA_CONTROL = new SemanticTagImpl( // "Property_MediaControl", // "Media Control", // - "", // + "Audio- or visual- media control", // ""); public static final SemanticTag MODE = new SemanticTagImpl( // "Property_Mode", // "Mode", // - "", // + "Operating mode", // ""); public static final SemanticTag MOISTURE = new SemanticTagImpl( // "Property_Moisture", // "Moisture", // - "", // + "Moisture value", // ""); public static final SemanticTag MOTION = new SemanticTagImpl( // "Property_Motion", // "Motion", // - "", // + "Motion detected", // ""); public static final SemanticTag NOISE = new SemanticTagImpl( // "Property_Noise", // "Noise", // - "", // + "Noise measurement", // ""); public static final SemanticTag OIL = new SemanticTagImpl( // "Property_Oil", // "Oil", // - "", // + "Oil measurement", // ""); public static final SemanticTag OPENING = new SemanticTagImpl( // "Property_Opening", // "Opening", // - "", // + "Opening of a door or window etc.", // ""); public static final SemanticTag OPEN_LEVEL = new SemanticTagImpl( // "Property_Opening_OpenLevel", // "Open Level", // - "", // + "Open position (analog) of a door or window etc.", // ""); public static final SemanticTag OPEN_STATE = new SemanticTagImpl( // "Property_Opening_OpenState", // "Open State", // - "", // + "Open state (digital) of a door or window etc.", // "Open Closed"); public static final SemanticTag POSITION = new SemanticTagImpl( // "Property_Position", // "Position", // - "", // + "Position measurement or control", // ""); public static final SemanticTag GEO_LOCATION = new SemanticTagImpl( // "Property_Position_GeoLocation", // "Geo Location", // - "", // + "Geo location coordinate", // ""); public static final SemanticTag POWER = new SemanticTagImpl( // "Property_Power", // "Power", // - "", // + "Power measurement", // ""); public static final SemanticTag PRESENCE = new SemanticTagImpl( // "Property_Presence", // "Presence", // - "", // + "Presence detection", // ""); public static final SemanticTag PRESSURE = new SemanticTagImpl( // "Property_Pressure", // "Pressure", // - "", // + "Fluid pressure measurement", // ""); public static final SemanticTag QUALITY_OF_SERVICE = new SemanticTagImpl( // "Property_QualityOfService", // "Quality of Service", // - "", // + "Quality of service", // ""); public static final SemanticTag RAIN = new SemanticTagImpl( // "Property_Rain", // "Rain", // - "", // + "Rain measurement", // ""); public static final SemanticTag SIGNAL_STRENGTH = new SemanticTagImpl( // "Property_SignalStrength", // "Signal Strength", // - "", // + "Signal strength measurement", // ""); public static final SemanticTag RSSI = new SemanticTagImpl( // "Property_SignalStrength_RSSI", // "RSSI", // - "", // + "Received signal strength indication", // "Received Signal Strength Indication"); public static final SemanticTag SMOKE = new SemanticTagImpl( // "Property_Smoke", // "Smoke", // - "", // + "Smoke detection", // ""); public static final SemanticTag SOUND_VOLUME = new SemanticTagImpl( // "Property_SoundVolume", // "Sound Volume", // - "", // + "Sound volume level", // ""); public static final SemanticTag SPEED = new SemanticTagImpl( // "Property_Speed", // "Speed", // - "", // + "Speed measurement or setting", // ""); public static final SemanticTag TAMPERED = new SemanticTagImpl( // "Property_Tampered", // "Tampered", // - "", // + "Tampering detected", // ""); public static final SemanticTag TEMPERATURE = new SemanticTagImpl( // "Property_Temperature", // "Temperature", // - "", // + "Temperature measurement", // "Temperatures"); public static final SemanticTag TILT = new SemanticTagImpl( // "Property_Tilt", // "Tilt", // - "", // + "Tilt of a blind", // ""); public static final SemanticTag TIMESTAMP = new SemanticTagImpl( // "Property_Timestamp", // "Timestamp", // - "", // + "Timestamp of an event", // ""); public static final SemanticTag ULTRAVIOLET = new SemanticTagImpl( // "Property_Ultraviolet", // "Ultraviolet", // - "", // + "Ultraviolet measurement", // "UV"); public static final SemanticTag VENTILATION = new SemanticTagImpl( // "Property_Ventilation", // "Ventilation", // - "", // + "Related to ventilation", // ""); public static final SemanticTag VIBRATION = new SemanticTagImpl( // "Property_Vibration", // "Vibration", // - "", // + "Vibration level", // ""); public static final SemanticTag VOLTAGE = new SemanticTagImpl( // "Property_Voltage", // "Voltage", // - "", // + "Electric voltage", // ""); public static final SemanticTag WATER = new SemanticTagImpl( // "Property_Water", // "Water", // - "", // + "Water measurement", // ""); public static final SemanticTag WIND = new SemanticTagImpl( // "Property_Wind", // "Wind", // - "", // + "Wind speed or direction", // ""); } @@ -552,787 +562,792 @@ public static class Equipment { public static final SemanticTag ALARM_DEVICE = new SemanticTagImpl( // "Equipment_AlarmDevice", // "Alarm Device", // - "", // + "Alarm device", // ""); public static final SemanticTag ALARM_SYSTEM = new SemanticTagImpl( // "Equipment_AlarmSystem", // "Alarm System", // - "", // + "Alarm system", // "Alarm Systems"); + public static final SemanticTag APPLICATION = new SemanticTagImpl( // + "Equipment_Application", // + "Application", // + "Software program", // + "App, Software program"); public static final SemanticTag AUDIO_VISUAL = new SemanticTagImpl( // "Equipment_AudioVisual", // "Audio Visual", // - "", // + "Audio visual device", // ""); public static final SemanticTag DISPLAY = new SemanticTagImpl( // "Equipment_AudioVisual_Display", // "Display", // - "", // + "Visual display", // ""); public static final SemanticTag PROJECTOR = new SemanticTagImpl( // "Equipment_AudioVisual_Display_Projector", // "Projector", // - "", // + "Projector", // "Projectors, Beamer, Beamers"); public static final SemanticTag TELEVISION = new SemanticTagImpl( // "Equipment_AudioVisual_Display_Television", // "Television", // - "", // + "Television", // "Televisions, TV, TVs"); public static final SemanticTag MEDIA_PLAYER = new SemanticTagImpl( // "Equipment_AudioVisual_MediaPlayer", // "Media Player", // - "", // + "Media player", // ""); public static final SemanticTag RECEIVER = new SemanticTagImpl( // "Equipment_AudioVisual_Receiver", // "Receiver", // - "", // + "Receiver", // "Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers"); public static final SemanticTag SCREEN = new SemanticTagImpl( // "Equipment_AudioVisual_Screen", // "Screen", // - "", // + "Computer screen", // "Screens"); public static final SemanticTag SPEAKER = new SemanticTagImpl( // "Equipment_AudioVisual_Speaker", // "Speaker", // - "", // + "Loudspeaker", // "Speakers"); public static final SemanticTag BED = new SemanticTagImpl( // "Equipment_Bed", // "Bed", // - "", // + "Bed", // ""); public static final SemanticTag CAMERA = new SemanticTagImpl( // "Equipment_Camera", // "Camera", // - "", // + "Camera", // "Cameras"); public static final SemanticTag CLEANING_ROBOT = new SemanticTagImpl( // "Equipment_CleaningRobot", // "Cleaning Robot", // - "", // + "Cleaning robot", // "Cleaning Robots, Vacuum robot, Vacuum robots"); public static final SemanticTag COMPUTER = new SemanticTagImpl( // "Equipment_Computer", // "Computer", // - "", // + "Computer", // ""); public static final SemanticTag CONTROL_DEVICE = new SemanticTagImpl( // "Equipment_ControlDevice", // "Control Device", // - "", // + "Control device", // ""); public static final SemanticTag BUTTON = new SemanticTagImpl( // "Equipment_ControlDevice_Button", // "Button", // - "", // + "Push button", // ""); public static final SemanticTag DIAL = new SemanticTagImpl( // "Equipment_ControlDevice_Dial", // "Dial", // - "", // + "Rotary dial", // "Rotary Dial"); public static final SemanticTag KEYPAD = new SemanticTagImpl( // "Equipment_ControlDevice_Keypad", // "Keypad", // - "", // + "Keypad", // ""); public static final SemanticTag SLIDER = new SemanticTagImpl( // "Equipment_ControlDevice_Slider", // "Slider", // - "", // + "Slider control", // ""); public static final SemanticTag WALL_SWITCH = new SemanticTagImpl( // "Equipment_ControlDevice_WallSwitch", // "Wall Switch", // - "", // + "Wall switch", // "Wall Switches"); public static final SemanticTag DOOR = new SemanticTagImpl( // "Equipment_Door", // "Door", // - "", // + "Door", // "Doors"); public static final SemanticTag BACK_DOOR = new SemanticTagImpl( // "Equipment_Door_BackDoor", // "Back Door", // - "", // + "Back door", // "Back Doors"); public static final SemanticTag CELLAR_DOOR = new SemanticTagImpl( // "Equipment_Door_CellarDoor", // "Cellar Door", // - "", // + "Cellar door", // "Cellar Doors"); public static final SemanticTag FRONT_DOOR = new SemanticTagImpl( // "Equipment_Door_FrontDoor", // "Front Door", // - "", // + "Front door", // "Front Doors, Frontdoor, Frontdoors"); public static final SemanticTag GARAGE_DOOR = new SemanticTagImpl( // "Equipment_Door_GarageDoor", // "Garage Door", // - "", // + "Garage door", // "Garage Doors"); public static final SemanticTag GATE = new SemanticTagImpl( // "Equipment_Door_Gate", // "Gate", // - "", // + "Gate", // "Gates"); public static final SemanticTag INNER_DOOR = new SemanticTagImpl( // "Equipment_Door_InnerDoor", // "Inner Door", // - "", // + "Inner door", // "Inner Doors"); public static final SemanticTag SIDE_DOOR = new SemanticTagImpl( // "Equipment_Door_SideDoor", // "Side Door", // - "", // + "Side door", // "Side Doors"); public static final SemanticTag DOORBELL = new SemanticTagImpl( // "Equipment_Doorbell", // "Doorbell", // - "", // + "Doorbell", // "Doorbells"); public static final SemanticTag DRINKING_WATER = new SemanticTagImpl( // "Equipment_DrinkingWater", // "Drinking Water", // - "", // + "Related to drinking water", // "Potable Water"); public static final SemanticTag HOT_WATER_FAUCET = new SemanticTagImpl( // "Equipment_DrinkingWater_HotWaterFaucet", // "Hot Water Faucet", // - "", // + "Hot water faucet", // "Hot Water Tap, Boiling Water Tap, Boiling Water Faucet"); public static final SemanticTag WATER_FILTER = new SemanticTagImpl( // "Equipment_DrinkingWater_WaterFilter", // "Water Filter", // - "", // + "Water filter", // ""); public static final SemanticTag WATER_SOFTENER = new SemanticTagImpl( // "Equipment_DrinkingWater_WaterSoftener", // "Water Softener", // - "", // + "Water softener", // ""); public static final SemanticTag HVAC = new SemanticTagImpl( // "Equipment_HVAC", // "HVAC", // - "", // + "Related to Heating Ventilation or AirConditioning", // "Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC"); public static final SemanticTag AIR_CONDITIONER = new SemanticTagImpl( // "Equipment_HVAC_AirConditioner", // "Air Conditioner", // - "", // + "Air conditioner", // ""); public static final SemanticTag AIR_FILTER = new SemanticTagImpl( // "Equipment_HVAC_AirFilter", // "Air Filter", // - "", // + "Air filter", // ""); public static final SemanticTag BOILER = new SemanticTagImpl( // "Equipment_HVAC_Boiler", // "Boiler", // - "", // + "Boiler", // "Boilers"); public static final SemanticTag DEHUMIDIFIER = new SemanticTagImpl( // "Equipment_HVAC_Dehumidifier", // "Dehumidifier", // - "", // + "Dehumidifier", // ""); public static final SemanticTag FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan", // "Fan", // - "", // + "Fan", // "Fans"); public static final SemanticTag CEILING_FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan_CeilingFan", // "Ceiling Fan", // - "", // + "Ceiling fan", // "Ceiling Fans"); public static final SemanticTag EXHAUST_FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan_ExhaustFan", // "Exhaust Fan", // - "", // + "Exhaust fan", // "Extract Fan, Toilet Fan"); public static final SemanticTag KITCHEN_HOOD = new SemanticTagImpl( // "Equipment_HVAC_Fan_KitchenHood", // "Kitchen Hood", // - "", // + "Kitchen hood", // "Kitchen Hoods"); public static final SemanticTag FLOOR_HEATING = new SemanticTagImpl( // "Equipment_HVAC_FloorHeating", // "Floor Heating", // - "", // + "Floor heating", // "Underfloor Heating, Radiant Floor Heating"); public static final SemanticTag FURNACE = new SemanticTagImpl( // "Equipment_HVAC_Furnace", // "Furnace", // - "", // + "Furnace", // "Wood Burner, Wood Heater"); public static final SemanticTag HEAT_PUMP = new SemanticTagImpl( // "Equipment_HVAC_HeatPump", // "Heat Pump", // - "", // + "Heat pump", // ""); public static final SemanticTag HEAT_RECOVERY = new SemanticTagImpl( // "Equipment_HVAC_HeatRecovery", // "Heat Recovery", // - "", // + "Heat recovery", // "Energy Recovery"); public static final SemanticTag HUMIDIFIER = new SemanticTagImpl( // "Equipment_HVAC_Humidifier", // "Humidifier", // - "", // + "Humidifier", // ""); public static final SemanticTag RADIATOR_CONTROL = new SemanticTagImpl( // "Equipment_HVAC_RadiatorControl", // "Radiator Control", // - "", // + "Radiator control", // "Radiator Controls, Radiator, Radiators"); public static final SemanticTag SMART_VENT = new SemanticTagImpl( // "Equipment_HVAC_SmartVent", // "Smart Vent", // - "", // + "Smart ventilation device", // ""); public static final SemanticTag THERMOSTAT = new SemanticTagImpl( // "Equipment_HVAC_Thermostat", // "Thermostat", // - "", // + "Thermostat", // ""); public static final SemanticTag WATER_HEATER = new SemanticTagImpl( // "Equipment_HVAC_WaterHeater", // "Water Heater", // - "", // + "Water heater", // "Water Boiler"); public static final SemanticTag HORTICULTURE = new SemanticTagImpl( // "Equipment_Horticulture", // "Horticulture", // - "", // + "Related to horticulture", // ""); public static final SemanticTag IRRIGATION = new SemanticTagImpl( // "Equipment_Horticulture_Irrigation", // "Irrigation", // - "", // + "Related to irrigation", // "Sprinkler, Drip System"); public static final SemanticTag LAWN_MOWER = new SemanticTagImpl( // "Equipment_Horticulture_LawnMower", // "Lawn Mower", // - "", // + "Lawn mower", // "Lawn Mowers"); public static final SemanticTag SOIL_SENSOR = new SemanticTagImpl( // "Equipment_Horticulture_SoilSensor", // "Soil Sensor", // - "", // + "Soil sensor", // "Moisture Sensor"); public static final SemanticTag LIGHT_SOURCE = new SemanticTagImpl( // "Equipment_LightSource", // "Light Source", // - "", // + "Light source", // "Lights, Lighting"); public static final SemanticTag ACCENT_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_AccentLight", // "Accent Light", // - "", // + "Accent light", // ""); public static final SemanticTag CHANDELIER = new SemanticTagImpl( // "Equipment_LightSource_Chandelier", // "Chandelier", // - "", // + "Chandelier", // ""); public static final SemanticTag DOWNLIGHT = new SemanticTagImpl( // "Equipment_LightSource_Downlight", // "Downlight", // - "", // + "Downlight", // "Can Light, Pot Light"); public static final SemanticTag FLOOD_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_FloodLight", // "Flood Light", // - "", // + "Flood light", // ""); public static final SemanticTag LAMP = new SemanticTagImpl( // "Equipment_LightSource_Lamp", // "Lamp", // - "", // + "Lamp", // ""); public static final SemanticTag LIGHT_STRIP = new SemanticTagImpl( // "Equipment_LightSource_LightStrip", // "Light Strip", // - "", // + "Light strip", // "LED Strip"); public static final SemanticTag LIGHT_STRIPE = new SemanticTagImpl( // "Equipment_LightSource_LightStripe", // "Light Stripe", // - "", // + "Light stripe", // "Light Stripes"); public static final SemanticTag LIGHTBULB = new SemanticTagImpl( // "Equipment_LightSource_Lightbulb", // "Light Bulb", // - "", // + "Light bulb", // "Lightbulbs, Bulb, Bulbs, Lamp, Lamps"); public static final SemanticTag PENDANT = new SemanticTagImpl( // "Equipment_LightSource_Pendant", // "Pendant", // - "", // + "Pendant light", // ""); public static final SemanticTag SCONCE = new SemanticTagImpl( // "Equipment_LightSource_Sconce", // "Sconce", // - "", // + "Sconce light", // ""); public static final SemanticTag SPOT_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_SpotLight", // "Spot Light", // - "", // + "Spot light", // ""); public static final SemanticTag TRACK_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_TrackLight", // "Track Light", // - "", // + "Track light", // ""); public static final SemanticTag WALL_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_WallLight", // "Wall Light", // - "", // + "Wall light", // ""); public static final SemanticTag LOCK = new SemanticTagImpl( // "Equipment_Lock", // "Lock", // - "", // + "Door- or window- lock", // "Locks"); public static final SemanticTag NETWORK_APPLIANCE = new SemanticTagImpl( // "Equipment_NetworkAppliance", // "Network Appliance", // - "", // + "Network appliance", // "Network Appliances"); public static final SemanticTag FIREWALL = new SemanticTagImpl( // "Equipment_NetworkAppliance_Firewall", // "Firewall", // - "", // + "Firewall", // ""); public static final SemanticTag NETWORK_SWITCH = new SemanticTagImpl( // "Equipment_NetworkAppliance_NetworkSwitch", // "Network Switch", // - "", // + "Network switch", // ""); public static final SemanticTag ROUTER = new SemanticTagImpl( // "Equipment_NetworkAppliance_Router", // "Router", // - "", // + "Network router", // ""); public static final SemanticTag WIRELESS_ACCESS_POINT = new SemanticTagImpl( // "Equipment_NetworkAppliance_WirelessAccessPoint", // "Wireless Access Point", // - "", // + "Wireless access point", // "Access Point, WAP, WiFi, WiFi Access Point"); public static final SemanticTag PET_CARE = new SemanticTagImpl( // "Equipment_PetCare", // "Pet Care", // - "", // + "Related to pet care", // ""); public static final SemanticTag AQUARIUM = new SemanticTagImpl( // "Equipment_PetCare_Aquarium", // "Aquarium", // - "", // + "Aquarium", // "Fish Tank"); public static final SemanticTag PET_FEEDER = new SemanticTagImpl( // "Equipment_PetCare_PetFeeder", // "Pet Feeder", // - "", // + "Pet feeder", // ""); public static final SemanticTag PET_FLAP = new SemanticTagImpl( // "Equipment_PetCare_PetFlap", // "Pet Flap", // - "", // + "Pet flap", // "Cat Flap, Dog Flap"); public static final SemanticTag POWER_OUTLET = new SemanticTagImpl( // "Equipment_PowerOutlet", // "Power Outlet", // - "", // + "Power outlet", // "Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs"); public static final SemanticTag POWER_SUPPLY = new SemanticTagImpl( // "Equipment_PowerSupply", // "Power Supply", // - "", // + "Power supply", // ""); public static final SemanticTag BATTERY = new SemanticTagImpl( // "Equipment_PowerSupply_Battery", // "Battery", // - "", // + "Battery", // "Batteries"); public static final SemanticTag EVSE = new SemanticTagImpl( // "Equipment_PowerSupply_EVSE", // "Electric Vehicle Supply Equipment", // - "", // + "Electric vehicle supply equipment", // "EV Charger, Car Charger"); public static final SemanticTag GENERATOR = new SemanticTagImpl( // "Equipment_PowerSupply_Generator", // "Generator", // - "", // + "Electricity generator", // "Emergency Generator"); public static final SemanticTag INVERTER = new SemanticTagImpl( // "Equipment_PowerSupply_Inverter", // "Inverter", // - "", // + "Electrical power inverter", // "Inverters"); public static final SemanticTag SOLAR_PANEL = new SemanticTagImpl( // "Equipment_PowerSupply_SolarPanel", // "Solar Panel", // - "", // + "Solar panel", // ""); public static final SemanticTag TRANSFER_SWITCH = new SemanticTagImpl( // "Equipment_PowerSupply_TransferSwitch", // "Transfer Switch", // - "", // + "Electricity transfer switch", // ""); public static final SemanticTag UPS = new SemanticTagImpl( // "Equipment_PowerSupply_UPS", // "UPS", // - "", // + "Uninterruptible power supply", // "Uninterruptible Power Supply"); public static final SemanticTag WIND_GENERATOR = new SemanticTagImpl( // "Equipment_PowerSupply_WindGenerator", // "Wind Generator", // - "", // + "Wind generator", // "Wind Turbine"); public static final SemanticTag PRINTER = new SemanticTagImpl( // "Equipment_Printer", // "Printer", // - "", // + "Printer", // ""); public static final SemanticTag PRINTER3D = new SemanticTagImpl( // "Equipment_Printer_Printer3D", // "3D Printer", // - "", // + "3d printer", // ""); public static final SemanticTag PUMP = new SemanticTagImpl( // "Equipment_Pump", // "Pump", // - "", // + "Fluid pump", // "Pumps"); public static final SemanticTag WATER_FEATURE = new SemanticTagImpl( // "Equipment_Pump_WaterFeature", // "Water Feature", // - "", // + "Garden water feature", // "Waterfall, Pond Pump"); public static final SemanticTag REMOTE_CONTROL = new SemanticTagImpl( // "Equipment_RemoteControl", // "Remote Control", // - "", // + "Remote control device", // "Remote Controls"); public static final SemanticTag SENSOR = new SemanticTagImpl( // "Equipment_Sensor", // "Sensor", // - "", // + "Sensor", // "Sensors"); public static final SemanticTag AIR_QUALITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_AirQualitySensor", // "Air Quality Sensor", // - "", // + "Air quality sensor", // ""); public static final SemanticTag CO2_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_CO2Sensor", // "CO2 Sensor", // - "", // + "Co2 sensor", // ""); public static final SemanticTag CO_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_COSensor", // "CO Sensor", // - "", // + "Co sensor", // ""); public static final SemanticTag CONTACT_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_ContactSensor", // "Contact Sensor", // - "", // + "Contact sensor", // ""); public static final SemanticTag ELECTRIC_METER = new SemanticTagImpl( // "Equipment_Sensor_ElectricMeter", // "Electric Meter", // - "", // + "Electric meter", // ""); public static final SemanticTag FIRE_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector", // "Fire Detector", // - "", // + "Fire detector", // ""); public static final SemanticTag FLAME_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_FlameDetector", // "Flame Detector", // - "", // + "Flame detector", // ""); public static final SemanticTag HEAT_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_HeatDetector", // "Heat Detector", // - "", // + "Heat detector", // ""); public static final SemanticTag SMOKE_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_SmokeDetector", // "Smoke Detector", // - "", // + "Smoke detector", // "Smoke Detectors"); public static final SemanticTag GAS_METER = new SemanticTagImpl( // "Equipment_Sensor_GasMeter", // "Gas Meter", // - "", // + "Gas meter", // ""); public static final SemanticTag GLASS_BREAK_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_GlassBreakDetector", // "Glass Break Detector", // - "", // + "Glass break detector", // ""); public static final SemanticTag HUMIDITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_HumiditySensor", // "Humidity Sensor", // - "", // + "Humidity sensor", // "Hygrometer"); public static final SemanticTag ILLUMINANCE_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_IlluminanceSensor", // "Illuminance Sensor", // - "", // + "Illuminance sensor", // ""); public static final SemanticTag LEAK_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_LeakSensor", // "Leak Sensor", // - "", // + "Leak sensor", // ""); public static final SemanticTag OCCUPANCY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_OccupancySensor", // "Occupancy Sensor", // - "", // + "Occupancy sensor", // ""); public static final SemanticTag MOTION_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_OccupancySensor_MotionDetector", // "Motion Detector", // - "", // + "Motion detector", // "Motion Detectors, Motion Sensor, Motion Sensors"); public static final SemanticTag TEMPERATURE_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_TemperatureSensor", // "Temperature Sensor", // - "", // + "Temperature sensor", // ""); public static final SemanticTag VIBRATION_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_VibrationSensor", // "Vibration Sensor", // - "", // + "Vibration sensor", // ""); public static final SemanticTag WATER_METER = new SemanticTagImpl( // "Equipment_Sensor_WaterMeter", // "Water Meter", // - "", // + "Water meter", // ""); public static final SemanticTag WATER_QUALITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_WaterQualitySensor", // "Water Quality Sensor", // - "", // + "Water quality sensor", // ""); public static final SemanticTag WEATHER_STATION = new SemanticTagImpl( // "Equipment_Sensor_WeatherStation", // "Weather Station", // - "", // + "Weather station", // ""); public static final SemanticTag SIREN = new SemanticTagImpl( // "Equipment_Siren", // "Siren", // - "", // + "Alarm siren", // "Sirens"); public static final SemanticTag SMARTPHONE = new SemanticTagImpl( // "Equipment_Smartphone", // "Smartphone", // - "", // + "Smartphone", // "Smartphones, Phone, Phones"); public static final SemanticTag TOOL = new SemanticTagImpl( // "Equipment_Tool", // "Tool", // - "", // + "Hand- or machine- tool", // ""); public static final SemanticTag TRACKER = new SemanticTagImpl( // "Equipment_Tracker", // "Tracker", // - "", // + "Location tracker", // ""); public static final SemanticTag VALVE = new SemanticTagImpl( // "Equipment_Valve", // "Valve", // - "", // + "Fluid valve", // "Valves"); public static final SemanticTag VEHICLE = new SemanticTagImpl( // "Equipment_Vehicle", // "Vehicle", // - "", // + "Motor vehicle", // ""); public static final SemanticTag CAR = new SemanticTagImpl( // "Equipment_Vehicle_Car", // "Car", // - "", // + "Motor car", // ""); public static final SemanticTag VOICE_ASSISTANT = new SemanticTagImpl( // "Equipment_VoiceAssistant", // "Voice Assistant", // - "", // + "Voice assistant device", // "Voice Assistants"); public static final SemanticTag WEB_SERVICE = new SemanticTagImpl( // "Equipment_WebService", // "Web Service", // - "", // + "Web service", // "Web Services"); public static final SemanticTag WEATHER_SERVICE = new SemanticTagImpl( // "Equipment_WebService_WeatherService", // "Weather Service", // - "", // + "Weather service", // "Weather Services"); public static final SemanticTag WELLNESS = new SemanticTagImpl( // "Equipment_Wellness", // "Wellness", // - "", // + "Related to wellness", // ""); public static final SemanticTag CHLORINATOR = new SemanticTagImpl( // "Equipment_Wellness_Chlorinator", // "Chlorinator", // - "", // + "Water chlorinator", // ""); public static final SemanticTag JACUZZI = new SemanticTagImpl( // "Equipment_Wellness_Jacuzzi", // "Jacuzzi", // - "", // + "Jacuzzi", // "Spa, Hot Tub, Whirlpool"); public static final SemanticTag POOL_COVER = new SemanticTagImpl( // "Equipment_Wellness_PoolCover", // "Pool Cover", // - "", // + "Swimming pool cover", // ""); public static final SemanticTag POOL_HEATER = new SemanticTagImpl( // "Equipment_Wellness_PoolHeater", // "Pool Heater", // - "", // + "Swimming pool heater", // ""); public static final SemanticTag SAUNA = new SemanticTagImpl( // "Equipment_Wellness_Sauna", // "Sauna", // - "", // + "Sauna", // "Steam Room"); public static final SemanticTag SHOWER = new SemanticTagImpl( // "Equipment_Wellness_Shower", // "Shower", // - "", // + "Shower", // ""); public static final SemanticTag SWIMMING_POOL = new SemanticTagImpl( // "Equipment_Wellness_SwimmingPool", // "Swimming Pool", // - "", // + "Swimming pool", // "Swimming Pool, Pool"); public static final SemanticTag WHITE_GOOD = new SemanticTagImpl( // "Equipment_WhiteGood", // "White Good", // - "", // + "White goods appliance", // "White Goods"); public static final SemanticTag AIR_FRYER = new SemanticTagImpl( // "Equipment_WhiteGood_AirFryer", // "Air Fryer", // - "", // + "Air fryer", // ""); public static final SemanticTag COFFEE_MAKER = new SemanticTagImpl( // "Equipment_WhiteGood_CoffeeMaker", // "Coffee Maker", // - "", // + "Coffee maker", // "Coffee Makers, Coffee Machine, Coffee Machines"); public static final SemanticTag COOKTOP = new SemanticTagImpl( // "Equipment_WhiteGood_Cooktop", // "Cooktop", // - "", // + "Cooktop appliance", // "Hob"); public static final SemanticTag DISHWASHER = new SemanticTagImpl( // "Equipment_WhiteGood_Dishwasher", // "Dishwasher", // - "", // + "Dishwasher", // "Dishwashers"); public static final SemanticTag DRYER = new SemanticTagImpl( // "Equipment_WhiteGood_Dryer", // "Dryer", // - "", // + "Laundry dryer", // "Dryers, Tumble Dryer, Tumble Dryers"); public static final SemanticTag FOOD_PROCESSOR = new SemanticTagImpl( // "Equipment_WhiteGood_FoodProcessor", // "Food Processor", // - "", // + "Food processor", // ""); public static final SemanticTag FREEZER = new SemanticTagImpl( // "Equipment_WhiteGood_Freezer", // "Freezer", // - "", // + "Freezer", // "Freezers"); public static final SemanticTag FRYER = new SemanticTagImpl( // "Equipment_WhiteGood_Fryer", // "Fryer", // - "", // + "Deep fryer", // ""); public static final SemanticTag ICE_MAKER = new SemanticTagImpl( // "Equipment_WhiteGood_IceMaker", // "Ice Maker", // - "", // + "Ice maker", // ""); public static final SemanticTag MICROWAVE = new SemanticTagImpl( // "Equipment_WhiteGood_Microwave", // "Microwave", // - "", // + "Microwave cooker", // ""); public static final SemanticTag MIXER = new SemanticTagImpl( // "Equipment_WhiteGood_Mixer", // "Mixer", // - "", // + "Food mixer", // ""); public static final SemanticTag OVEN = new SemanticTagImpl( // "Equipment_WhiteGood_Oven", // "Oven", // - "", // + "Oven", // "Ovens"); public static final SemanticTag RANGE = new SemanticTagImpl( // "Equipment_WhiteGood_Range", // "Range", // - "", // + "Kitchen range", // ""); public static final SemanticTag REFRIGERATOR = new SemanticTagImpl( // "Equipment_WhiteGood_Refrigerator", // "Refrigerator", // - "", // + "Refrigerator", // "Refrigerators"); public static final SemanticTag TOASTER = new SemanticTagImpl( // "Equipment_WhiteGood_Toaster", // "Toaster", // - "", // + "Toaster", // "Toaster Oven"); public static final SemanticTag WASHING_MACHINE = new SemanticTagImpl( // "Equipment_WhiteGood_WashingMachine", // "Washing Machine", // - "", // + "Washing machine", // "Washing Machines"); public static final SemanticTag WINDOW = new SemanticTagImpl( // "Equipment_Window", // "Window", // - "", // + "Window", // "Windows"); public static final SemanticTag WINDOW_COVERING = new SemanticTagImpl( // "Equipment_WindowCovering", // "Window Covering", // - "", // + "Window covering", // ""); public static final SemanticTag BLINDS = new SemanticTagImpl( // "Equipment_WindowCovering_Blinds", // "Blinds", // - "", // + "Window blinds, shades or shutters", // "Rollershutter, Rollershutters, Roller shutter, Roller shutters, Shutter, Shutters"); public static final SemanticTag DRAPES = new SemanticTagImpl( // "Equipment_WindowCovering_Drapes", // "Drapes", // - "", // + "Curtains or drapes", // "Curtains"); public static final SemanticTag ZONE = new SemanticTagImpl( // "Equipment_Zone", // "Zone", // - "", // + "Equipment zone", // ""); public static final SemanticTag ALARM_ZONE = new SemanticTagImpl( // "Equipment_Zone_AlarmZone", // "Alarm Zone", // - "", // + "Security alarm zone", // ""); } } 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 721fbea76ea..6fa9580af2f 100644 --- a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties +++ b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties @@ -36,6 +36,7 @@ Location_Outdoor_Patio=Patio,Patios Location_Outdoor_Porch=Porch,Porches Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks Point_Alarm=Alarm +Point_Calculation=Calculation Point_Control=Control Point_Control_Switch=Switch Point_Forecast=Forecast @@ -67,6 +68,7 @@ Property_Gas=Gas Property_Heating=Heating Property_Humidity=Humidity,Moisture Property_Illuminance=Illuminance +Property_Info=Information Property_Level=Level Property_Light=Light,Lights,Lighting Property_LowBattery=Low Battery @@ -103,6 +105,7 @@ Property_Water=Water Property_Wind=Wind Equipment_AlarmDevice=Alarm Device Equipment_AlarmSystem=Alarm System,Alarm Systems +Equipment_Application=Application,App,Software program Equipment_AudioVisual=Audio Visual Equipment_AudioVisual_Display=Display Equipment_AudioVisual_Display_Projector=Projector,Projectors,Beamer,Beamers 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 a50fc35edab..6b471a74250 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 @@ -296,6 +296,7 @@ + @@ -339,6 +340,7 @@ + @@ -361,6 +363,7 @@ + From 84b27df649aa9151f25a8826fb996a25c009c3b3 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:13:28 +0100 Subject: [PATCH 03/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 271e19a5497..8365c34ecfa 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -43,7 +43,7 @@ Point,Forecast,,Forecast,,Read only analog predicted data point Point,Measurement,,Measurement,,Read only analog data point from a sensor Point,Setpoint,,Setpoint,,Read-Write analog data point for a controller Point,Status,,Status,,Read only data point indicating a status condition -Property,AirQuality,,Air Quality,,Index of air quality +Property,AirQuality,,Air Quality,, Property,AQI,AirQuality,AQI,Air Quality Index,Air Quality Index Property,CO,AirQuality,CO,Carbon Monoxide,Carbon monoxide Property,CO2,AirQuality,CO2,Carbon Dioxide,Carbon dioxide From 482f41ff64d1b307d5320632f02bbc3c14b0afc1 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:13:43 +0100 Subject: [PATCH 04/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 8365c34ecfa..f2bc534ed09 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -53,7 +53,7 @@ Property,Pollen,AirQuality,Pollen,,Pollen reading Property,Radon,AirQuality,Radon,,Radon reading Property,VOC,AirQuality,VOC,Volatile Organic Compounds,Volatile organic compounds reading Property,Airconditioning,,Airconditioning,,Related to airconditioning -Property,Airflow,,Airflow,,Airflow measurement +Property,Airflow,,Airflow,, Property,App,,App,Application,Software program Property,Brightness,,Brightness,,Brightness of a light source Property,Channel,,Channel,,Radio or TV channel selection From be8997dce7070d22afe9a1266721152d353ea448 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:13:56 +0100 Subject: [PATCH 05/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index f2bc534ed09..44d3a83a16c 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -63,7 +63,7 @@ Property,Current,,Current,,Electric current Property,Duration,,Duration,,Time duration Property,Enabled,,Enabled,,Enabled state Property,Energy,,Energy,,Energy consumption or production -Property,Frequency,,Frequency,,Electric frequency +Property,Frequency,,Frequency,, Property,Gas,,Gas,,Gas measurement Property,Heating,,Heating,,Related to heating Property,Humidity,,Humidity,Moisture,Humidity value From 1166b1bc12573a7414bb07a1ac175d28316ebefd Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:15:22 +0100 Subject: [PATCH 06/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 44d3a83a16c..d21f35c95ea 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -69,7 +69,7 @@ Property,Heating,,Heating,,Related to heating Property,Humidity,,Humidity,Moisture,Humidity value Property,Illuminance,,Illuminance,,Illuminance value Property,Info,,Information,,General information -Property,Level,,Level,,Fluid level +Property,Level,,Level,, Property,Light,,Light,"Lights, Lighting",Control or status of a light Property,LowBattery,,Low Battery,,Low battery indication Property,MediaControl,,Media Control,,Audio- or visual- media control From 0e29196b52848f3475bfbd9486a8fd88b3d4887c Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:16:02 +0100 Subject: [PATCH 07/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index d21f35c95ea..fdd96b1af06 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -195,7 +195,7 @@ Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,Uninterruptible power Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,Wind generator Equipment,Printer,,Printer,,Printer Equipment,Printer3D,Printer,3D Printer,,3d printer -Equipment,Pump,,Pump,Pumps,Fluid pump +Equipment,Pump,,Pump,Pumps, Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",Garden water feature Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device Equipment,Sensor,,Sensor,Sensors,Sensor From cb505c23bf28f74cd723e98dcfd6b1df235267cc Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:16:30 +0100 Subject: [PATCH 08/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index fdd96b1af06..83541e18785 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -66,7 +66,7 @@ Property,Energy,,Energy,,Energy consumption or production Property,Frequency,,Frequency,, Property,Gas,,Gas,,Gas measurement Property,Heating,,Heating,,Related to heating -Property,Humidity,,Humidity,Moisture,Humidity value +Property,Humidity,,Humidity,,Humidity value Property,Illuminance,,Illuminance,,Illuminance value Property,Info,,Information,,General information Property,Level,,Level,, From d35d96e79af775a72486d81b113e93a98593266f Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:17:02 +0100 Subject: [PATCH 09/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 83541e18785..1fdb9fe706e 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -225,7 +225,7 @@ Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",Smartphone Equipment,Tool,,Tool,,Hand- or machine- tool Equipment,Tracker,,Tracker,,Location tracker Equipment,Valve,,Valve,Valves,Fluid valve -Equipment,Vehicle,,Vehicle,,Motor vehicle +Equipment,Vehicle,,Vehicle,, Equipment,Car,Vehicle,Car,,Motor car Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,Voice assistant device Equipment,WebService,,Web Service,Web Services,Web service From a6bde4ef93145024c225320ae40a3f7459ba05e3 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:17:31 +0100 Subject: [PATCH 10/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 1fdb9fe706e..26ec0c5a61c 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -83,7 +83,7 @@ Property,OpenLevel,Opening,Open Level,,Open position (analog) of a door or windo Property,OpenState,Opening,Open State,Open Closed,Open state (digital) of a door or window etc. Property,Position,,Position,,Position measurement or control Property,GeoLocation,Position,Geo Location,,Geo location coordinate -Property,Power,,Power,,Power measurement +Property,Power,,Power,, Property,Presence,,Presence,,Presence detection Property,Pressure,,Pressure,,Fluid pressure measurement Property,QualityOfService,,Quality of Service,,Quality of service From 85bf5e6107055a8a05188bb21ae76cc5cb8075c5 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:18:07 +0100 Subject: [PATCH 11/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 26ec0c5a61c..7c47c0bba3e 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -85,7 +85,7 @@ Property,Position,,Position,,Position measurement or control Property,GeoLocation,Position,Geo Location,,Geo location coordinate Property,Power,,Power,, Property,Presence,,Presence,,Presence detection -Property,Pressure,,Pressure,,Fluid pressure measurement +Property,Pressure,,Pressure,, Property,QualityOfService,,Quality of Service,,Quality of service Property,Rain,,Rain,,Rain measurement Property,SignalStrength,,Signal Strength,,Signal strength measurement From 20b65a107690dac145b14d7672e952ffbb1c1e40 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:18:38 +0100 Subject: [PATCH 12/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 7c47c0bba3e..6b2e3c836b9 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -196,7 +196,7 @@ Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,Wind generator Equipment,Printer,,Printer,,Printer Equipment,Printer3D,Printer,3D Printer,,3d printer Equipment,Pump,,Pump,Pumps, -Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump",Garden water feature +Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device Equipment,Sensor,,Sensor,Sensors,Sensor Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,Air quality sensor From 0f6310fa351c0bbf793fc5f2131e48e0d5ddad95 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:19:05 +0100 Subject: [PATCH 13/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 6b2e3c836b9..25de1b67c89 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -88,7 +88,7 @@ Property,Presence,,Presence,,Presence detection Property,Pressure,,Pressure,, Property,QualityOfService,,Quality of Service,,Quality of service Property,Rain,,Rain,,Rain measurement -Property,SignalStrength,,Signal Strength,,Signal strength measurement +Property,SignalStrength,,Signal Strength,, Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,Received signal strength indication Property,Smoke,,Smoke,,Smoke detection Property,SoundVolume,,Sound Volume,,Sound volume level From 9c3b85173692ca79720b81afd1cdad346318b0db Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:19:49 +0100 Subject: [PATCH 14/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 25de1b67c89..6a1dc23cc7a 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -95,7 +95,7 @@ Property,SoundVolume,,Sound Volume,,Sound volume level Property,Speed,,Speed,,Speed measurement or setting Property,Tampered,,Tampered,,Tampering detected Property,Temperature,,Temperature,Temperatures,Temperature measurement -Property,Tilt,,Tilt,,Tilt of a blind, shade or shutter +Property,Tilt,,Tilt,,"Tilt of a blind, shade or shutter" Property,Timestamp,,Timestamp,,Timestamp of an event Property,Ultraviolet,,Ultraviolet,UV,Ultraviolet measurement Property,Ventilation,,Ventilation,,Related to ventilation From 24751f374aac974eb341985c01c5e3d1462d0a39 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:20:09 +0100 Subject: [PATCH 15/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 6a1dc23cc7a..537e9215131 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -226,7 +226,7 @@ Equipment,Tool,,Tool,,Hand- or machine- tool Equipment,Tracker,,Tracker,,Location tracker Equipment,Valve,,Valve,Valves,Fluid valve Equipment,Vehicle,,Vehicle,, -Equipment,Car,Vehicle,Car,,Motor car +Equipment,Car,Vehicle,Car,, Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,Voice assistant device Equipment,WebService,,Web Service,Web Services,Web service Equipment,WeatherService,WebService,Weather Service,Weather Services,Weather service From 289ac4199915a962331b72186cc89dce78f53a07 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:20:31 +0100 Subject: [PATCH 16/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 537e9215131..6fc02217f1b 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -57,7 +57,7 @@ Property,Airflow,,Airflow,, Property,App,,App,Application,Software program Property,Brightness,,Brightness,,Brightness of a light source Property,Channel,,Channel,,Radio or TV channel selection -Property,Color,,Color,,Color of a light source +Property,Color,,Color,, Property,ColorTemperature,,Color Temperature,,Color temperature of a light source Property,Current,,Current,,Electric current Property,Duration,,Duration,,Time duration From f4b8fb7a218b07633fd284f627eefbdfa4f5d309 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:21:26 +0100 Subject: [PATCH 17/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 6fc02217f1b..1b07584f980 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -111,7 +111,7 @@ Equipment,Display,AudioVisual,Display,,Visual display Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",Projector Equipment,Television,Display,Television,"Televisions, TV, TVs",Television Equipment,MediaPlayer,AudioVisual,Media Player,,Media player -Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers",Receiver +Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", AV Receiver Equipment,Screen,AudioVisual,Screen,Screens,Computer screen Equipment,Speaker,AudioVisual,Speaker,Speakers,Loudspeaker Equipment,Bed,,Bed,,Bed From e8664ee3d580010ed69ae81d01670b53c9d3551b Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:23:37 +0100 Subject: [PATCH 18/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 1b07584f980..39213eb37b4 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -173,7 +173,7 @@ Equipment,Sconce,LightSource,Sconce,,Sconce light Equipment,SpotLight,LightSource,Spot Light,,Spot light Equipment,TrackLight,LightSource,Track Light,,Track light Equipment,WallLight,LightSource,Wall Light,,Wall light -Equipment,Lock,,Lock,Locks,Door- or window- lock +Equipment,Lock,,Lock,Locks, Equipment,NetworkAppliance,,Network Appliance,Network Appliances,Network appliance Equipment,Firewall,NetworkAppliance,Firewall,,Firewall Equipment,NetworkSwitch,NetworkAppliance,Network Switch,,Network switch From ea0122a2904ddedd05101ffc9b80aa76e26f2f48 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Fri, 25 Apr 2025 18:24:26 +0100 Subject: [PATCH 19/26] Update bundles/org.openhab.core.semantics/model/SemanticTags.csv Co-authored-by: jimtng <2554958+jimtng@users.noreply.github.com> Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 39213eb37b4..5f41a041df1 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -194,7 +194,7 @@ Equipment,TransferSwitch,PowerSupply,Transfer Switch,,Electricity transfer switc Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,Uninterruptible power supply Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,Wind generator Equipment,Printer,,Printer,,Printer -Equipment,Printer3D,Printer,3D Printer,,3d printer +Equipment,Printer3D,Printer,3D Printer,,3D printer Equipment,Pump,,Pump,Pumps, Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device From 830d9a77de43bfb4ff53e60f3b26f10d229ea762 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sat, 26 Apr 2025 11:33:33 +0100 Subject: [PATCH 20/26] Adopt reviewer suggestions and re-run script Signed-off-by: Andrew Fiddian-Green --- .../model/SemanticTags.csv | 26 ++++---- .../semantics/model/DefaultSemanticTags.java | 60 +++++++++---------- .../src/main/resources/tags.properties | 2 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 5f41a041df1..8685a97a271 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -52,11 +52,11 @@ Property,ParticulateMatter,AirQuality,Particulate Matter,PM25,Particulate matter Property,Pollen,AirQuality,Pollen,,Pollen reading Property,Radon,AirQuality,Radon,,Radon reading Property,VOC,AirQuality,VOC,Volatile Organic Compounds,Volatile organic compounds reading -Property,Airconditioning,,Airconditioning,,Related to airconditioning +Property,Airconditioning,,Airconditioning,, Property,Airflow,,Airflow,, Property,App,,App,Application,Software program Property,Brightness,,Brightness,,Brightness of a light source -Property,Channel,,Channel,,Radio or TV channel selection +Property,Channel,,Channel,,Media channel selection Property,Color,,Color,, Property,ColorTemperature,,Color Temperature,,Color temperature of a light source Property,Current,,Current,,Electric current @@ -64,8 +64,8 @@ Property,Duration,,Duration,,Time duration Property,Enabled,,Enabled,,Enabled state Property,Energy,,Energy,,Energy consumption or production Property,Frequency,,Frequency,, -Property,Gas,,Gas,,Gas measurement -Property,Heating,,Heating,,Related to heating +Property,Gas,,Gas,, +Property,Heating,,Heating,, Property,Humidity,,Humidity,,Humidity value Property,Illuminance,,Illuminance,,Illuminance value Property,Info,,Information,,General information @@ -98,7 +98,7 @@ Property,Temperature,,Temperature,Temperatures,Temperature measurement Property,Tilt,,Tilt,,"Tilt of a blind, shade or shutter" Property,Timestamp,,Timestamp,,Timestamp of an event Property,Ultraviolet,,Ultraviolet,UV,Ultraviolet measurement -Property,Ventilation,,Ventilation,,Related to ventilation +Property,Ventilation,,Ventilation,, Property,Vibration,,Vibration,,Vibration level Property,Voltage,,Voltage,,Electric voltage Property,Water,,Water,,Water measurement @@ -112,14 +112,14 @@ Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",Projector Equipment,Television,Display,Television,"Televisions, TV, TVs",Television Equipment,MediaPlayer,AudioVisual,Media Player,,Media player Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", AV Receiver -Equipment,Screen,AudioVisual,Screen,Screens,Computer screen +Equipment,Screen,AudioVisual,Screen,Screens,Visual display screen Equipment,Speaker,AudioVisual,Speaker,Speakers,Loudspeaker Equipment,Bed,,Bed,,Bed Equipment,Camera,,Camera,Cameras,Camera Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",Cleaning robot Equipment,Computer,,Computer,,Computer Equipment,ControlDevice,,Control Device,,Control device -Equipment,Button,ControlDevice,Button,,Push button +Equipment,Button,ControlDevice,Button,,Push or touch button Equipment,Dial,ControlDevice,Dial,Rotary Dial,Rotary dial Equipment,Keypad,ControlDevice,Keypad,,Keypad Equipment,Slider,ControlDevice,Slider,,Slider control @@ -133,11 +133,11 @@ Equipment,Gate,Door,Gate,Gates,Gate Equipment,InnerDoor,Door,Inner Door,Inner Doors,Inner door Equipment,SideDoor,Door,Side Door,Side Doors,Side door Equipment,Doorbell,,Doorbell,Doorbells,Doorbell -Equipment,DrinkingWater,,Drinking Water,Potable Water,Related to drinking water +Equipment,DrinkingWater,,Drinking Water,Potable Water, Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet Equipment,WaterFilter,DrinkingWater,Water Filter,,Water filter Equipment,WaterSoftener,DrinkingWater,Water Softener,,Water softener -Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Related to Heating Ventilation or AirConditioning +Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Heating Ventilation or AirConditioning Equipment,AirConditioner,HVAC,Air Conditioner,,Air conditioner Equipment,AirFilter,HVAC,Air Filter,,Air filter Equipment,Boiler,HVAC,Boiler,Boilers,Boiler @@ -155,8 +155,8 @@ Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Ra Equipment,SmartVent,HVAC,Smart Vent,,Smart ventilation device Equipment,Thermostat,HVAC,Thermostat,,Thermostat Equipment,WaterHeater,HVAC,Water Heater,Water Boiler,Water heater -Equipment,Horticulture,,Horticulture,,Related to horticulture -Equipment,Irrigation,Horticulture,Irrigation,"Sprinkler, Drip System",Related to irrigation +Equipment,Horticulture,,Horticulture,, +Equipment,Irrigation,Horticulture,Irrigation,"Sprinkler, Drip System", Equipment,LawnMower,Horticulture,Lawn Mower,Lawn Mowers,Lawn mower Equipment,SoilSensor,Horticulture,Soil Sensor,Moisture Sensor,Soil sensor Equipment,LightSource,,Light Source,"Lights, Lighting",Light source @@ -179,7 +179,7 @@ Equipment,Firewall,NetworkAppliance,Firewall,,Firewall Equipment,NetworkSwitch,NetworkAppliance,Network Switch,,Network switch Equipment,Router,NetworkAppliance,Router,,Network router Equipment,WirelessAccessPoint,NetworkAppliance,Wireless Access Point,"Access Point, WAP, WiFi, WiFi Access Point",Wireless access point -Equipment,PetCare,,Pet Care,,Related to pet care +Equipment,PetCare,,Pet Care,, Equipment,Aquarium,PetCare,Aquarium,Fish Tank,Aquarium Equipment,PetFeeder,PetCare,Pet Feeder,,Pet feeder Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap",Pet flap @@ -230,7 +230,7 @@ Equipment,Car,Vehicle,Car,, Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,Voice assistant device Equipment,WebService,,Web Service,Web Services,Web service Equipment,WeatherService,WebService,Weather Service,Weather Services,Weather service -Equipment,Wellness,,Wellness,,Related to wellness +Equipment,Wellness,,Wellness,, Equipment,Chlorinator,Wellness,Chlorinator,,Water chlorinator Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool",Jacuzzi Equipment,PoolCover,Wellness,Pool Cover,,Swimming pool cover 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 9f825797b4e..f71b957d974 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 @@ -259,7 +259,7 @@ public static class Property { public static final SemanticTag AIR_QUALITY = new SemanticTagImpl( // "Property_AirQuality", // "Air Quality", // - "Index of air quality", // + "", // ""); public static final SemanticTag AQI = new SemanticTagImpl( // "Property_AirQuality_AQI", // @@ -304,12 +304,12 @@ public static class Property { public static final SemanticTag AIRCONDITIONING = new SemanticTagImpl( // "Property_Airconditioning", // "Airconditioning", // - "Related to airconditioning", // + "", // ""); public static final SemanticTag AIRFLOW = new SemanticTagImpl( // "Property_Airflow", // "Airflow", // - "Airflow measurement", // + "", // ""); public static final SemanticTag APP = new SemanticTagImpl( // "Property_App", // @@ -324,12 +324,12 @@ public static class Property { public static final SemanticTag CHANNEL = new SemanticTagImpl( // "Property_Channel", // "Channel", // - "Radio or TV channel selection", // + "Media channel selection", // ""); public static final SemanticTag COLOR = new SemanticTagImpl( // "Property_Color", // "Color", // - "Color of a light source", // + "", // ""); public static final SemanticTag COLOR_TEMPERATURE = new SemanticTagImpl( // "Property_ColorTemperature", // @@ -359,23 +359,23 @@ public static class Property { public static final SemanticTag FREQUENCY = new SemanticTagImpl( // "Property_Frequency", // "Frequency", // - "Electric frequency", // + "", // ""); public static final SemanticTag GAS = new SemanticTagImpl( // "Property_Gas", // "Gas", // - "Gas measurement", // + "", // ""); public static final SemanticTag HEATING = new SemanticTagImpl( // "Property_Heating", // "Heating", // - "Related to heating", // + "", // ""); public static final SemanticTag HUMIDITY = new SemanticTagImpl( // "Property_Humidity", // "Humidity", // "Humidity value", // - "Moisture"); + ""); public static final SemanticTag ILLUMINANCE = new SemanticTagImpl( // "Property_Illuminance", // "Illuminance", // @@ -389,7 +389,7 @@ public static class Property { public static final SemanticTag LEVEL = new SemanticTagImpl( // "Property_Level", // "Level", // - "Fluid level", // + "", // ""); public static final SemanticTag LIGHT = new SemanticTagImpl( // "Property_Light", // @@ -459,7 +459,7 @@ public static class Property { public static final SemanticTag POWER = new SemanticTagImpl( // "Property_Power", // "Power", // - "Power measurement", // + "", // ""); public static final SemanticTag PRESENCE = new SemanticTagImpl( // "Property_Presence", // @@ -469,7 +469,7 @@ public static class Property { public static final SemanticTag PRESSURE = new SemanticTagImpl( // "Property_Pressure", // "Pressure", // - "Fluid pressure measurement", // + "", // ""); public static final SemanticTag QUALITY_OF_SERVICE = new SemanticTagImpl( // "Property_QualityOfService", // @@ -484,7 +484,7 @@ public static class Property { public static final SemanticTag SIGNAL_STRENGTH = new SemanticTagImpl( // "Property_SignalStrength", // "Signal Strength", // - "Signal strength measurement", // + "", // ""); public static final SemanticTag RSSI = new SemanticTagImpl( // "Property_SignalStrength_RSSI", // @@ -519,7 +519,7 @@ public static class Property { public static final SemanticTag TILT = new SemanticTagImpl( // "Property_Tilt", // "Tilt", // - "Tilt of a blind", // + "Tilt of a blind, shade or shutter", // ""); public static final SemanticTag TIMESTAMP = new SemanticTagImpl( // "Property_Timestamp", // @@ -534,7 +534,7 @@ public static class Property { public static final SemanticTag VENTILATION = new SemanticTagImpl( // "Property_Ventilation", // "Ventilation", // - "Related to ventilation", // + "", // ""); public static final SemanticTag VIBRATION = new SemanticTagImpl( // "Property_Vibration", // @@ -602,12 +602,12 @@ public static class Equipment { public static final SemanticTag RECEIVER = new SemanticTagImpl( // "Equipment_AudioVisual_Receiver", // "Receiver", // - "Receiver", // + " AV Receiver", // "Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers"); public static final SemanticTag SCREEN = new SemanticTagImpl( // "Equipment_AudioVisual_Screen", // "Screen", // - "Computer screen", // + "Visual display screen", // "Screens"); public static final SemanticTag SPEAKER = new SemanticTagImpl( // "Equipment_AudioVisual_Speaker", // @@ -642,7 +642,7 @@ public static class Equipment { public static final SemanticTag BUTTON = new SemanticTagImpl( // "Equipment_ControlDevice_Button", // "Button", // - "Push button", // + "Push or touch button", // ""); public static final SemanticTag DIAL = new SemanticTagImpl( // "Equipment_ControlDevice_Dial", // @@ -712,7 +712,7 @@ public static class Equipment { public static final SemanticTag DRINKING_WATER = new SemanticTagImpl( // "Equipment_DrinkingWater", // "Drinking Water", // - "Related to drinking water", // + "", // "Potable Water"); public static final SemanticTag HOT_WATER_FAUCET = new SemanticTagImpl( // "Equipment_DrinkingWater_HotWaterFaucet", // @@ -732,7 +732,7 @@ public static class Equipment { public static final SemanticTag HVAC = new SemanticTagImpl( // "Equipment_HVAC", // "HVAC", // - "Related to Heating Ventilation or AirConditioning", // + "Heating Ventilation or AirConditioning", // "Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC"); public static final SemanticTag AIR_CONDITIONER = new SemanticTagImpl( // "Equipment_HVAC_AirConditioner", // @@ -822,12 +822,12 @@ public static class Equipment { public static final SemanticTag HORTICULTURE = new SemanticTagImpl( // "Equipment_Horticulture", // "Horticulture", // - "Related to horticulture", // + "", // ""); public static final SemanticTag IRRIGATION = new SemanticTagImpl( // "Equipment_Horticulture_Irrigation", // "Irrigation", // - "Related to irrigation", // + "", // "Sprinkler, Drip System"); public static final SemanticTag LAWN_MOWER = new SemanticTagImpl( // "Equipment_Horticulture_LawnMower", // @@ -912,7 +912,7 @@ public static class Equipment { public static final SemanticTag LOCK = new SemanticTagImpl( // "Equipment_Lock", // "Lock", // - "Door- or window- lock", // + "", // "Locks"); public static final SemanticTag NETWORK_APPLIANCE = new SemanticTagImpl( // "Equipment_NetworkAppliance", // @@ -942,7 +942,7 @@ public static class Equipment { public static final SemanticTag PET_CARE = new SemanticTagImpl( // "Equipment_PetCare", // "Pet Care", // - "Related to pet care", // + "", // ""); public static final SemanticTag AQUARIUM = new SemanticTagImpl( // "Equipment_PetCare_Aquarium", // @@ -1017,17 +1017,17 @@ public static class Equipment { public static final SemanticTag PRINTER3D = new SemanticTagImpl( // "Equipment_Printer_Printer3D", // "3D Printer", // - "3d printer", // + "3D printer", // ""); public static final SemanticTag PUMP = new SemanticTagImpl( // "Equipment_Pump", // "Pump", // - "Fluid pump", // + "", // "Pumps"); public static final SemanticTag WATER_FEATURE = new SemanticTagImpl( // "Equipment_Pump_WaterFeature", // "Water Feature", // - "Garden water feature", // + "", // "Waterfall, Pond Pump"); public static final SemanticTag REMOTE_CONTROL = new SemanticTagImpl( // "Equipment_RemoteControl", // @@ -1172,12 +1172,12 @@ public static class Equipment { public static final SemanticTag VEHICLE = new SemanticTagImpl( // "Equipment_Vehicle", // "Vehicle", // - "Motor vehicle", // + "", // ""); public static final SemanticTag CAR = new SemanticTagImpl( // "Equipment_Vehicle_Car", // "Car", // - "Motor car", // + "", // ""); public static final SemanticTag VOICE_ASSISTANT = new SemanticTagImpl( // "Equipment_VoiceAssistant", // @@ -1197,7 +1197,7 @@ public static class Equipment { public static final SemanticTag WELLNESS = new SemanticTagImpl( // "Equipment_Wellness", // "Wellness", // - "Related to wellness", // + "", // ""); public static final SemanticTag CHLORINATOR = new SemanticTagImpl( // "Equipment_Wellness_Chlorinator", // 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 6fa9580af2f..f2ab6c694e4 100644 --- a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties +++ b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties @@ -66,7 +66,7 @@ Property_Energy=Energy Property_Frequency=Frequency Property_Gas=Gas Property_Heating=Heating -Property_Humidity=Humidity,Moisture +Property_Humidity=Humidity Property_Illuminance=Illuminance Property_Info=Information Property_Level=Level From 97d07ef3c0d7b9e9bd075c4afc2b1c60b6695ac6 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sat, 26 Apr 2025 12:25:48 +0100 Subject: [PATCH 21/26] prevent merge conflict (hopefully) Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 1 + .../core/semantics/model/DefaultSemanticTagProvider.java | 1 + .../openhab/core/semantics/model/DefaultSemanticTags.java | 5 +++++ .../src/main/resources/tags.properties | 1 + .../schema/thing/thing-description-1.0.0.xsd | 1 + 5 files changed, 9 insertions(+) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 8685a97a271..2b4e274da24 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -86,6 +86,7 @@ Property,GeoLocation,Position,Geo Location,,Geo location coordinate Property,Power,,Power,, Property,Presence,,Presence,,Presence detection Property,Pressure,,Pressure,, +Property,Progress,,Progress,, Property,QualityOfService,,Quality of Service,,Quality of service Property,Rain,,Rain,,Rain measurement Property,SignalStrength,,Signal Strength,, 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 ced88259d98..12a0bd75d3a 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 @@ -126,6 +126,7 @@ public DefaultSemanticTagProvider() { defaultTags.add(DefaultSemanticTags.Property.POWER); defaultTags.add(DefaultSemanticTags.Property.PRESENCE); defaultTags.add(DefaultSemanticTags.Property.PRESSURE); + defaultTags.add(DefaultSemanticTags.Property.PROGRESS); defaultTags.add(DefaultSemanticTags.Property.QUALITY_OF_SERVICE); defaultTags.add(DefaultSemanticTags.Property.RAIN); defaultTags.add(DefaultSemanticTags.Property.SIGNAL_STRENGTH); 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 f71b957d974..d3b0cd148b8 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 @@ -471,6 +471,11 @@ public static class Property { "Pressure", // "", // ""); + public static final SemanticTag PROGRESS = new SemanticTagImpl( // + "Property_Progress", // + "Progress", // + "", // + ""); public static final SemanticTag QUALITY_OF_SERVICE = new SemanticTagImpl( // "Property_QualityOfService", // "Quality of Service", // 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 f2ab6c694e4..39a332d026c 100644 --- a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties +++ b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties @@ -86,6 +86,7 @@ Property_Position_GeoLocation=Geo Location Property_Power=Power Property_Presence=Presence Property_Pressure=Pressure +Property_Progress=Progress Property_QualityOfService=Quality of Service Property_Rain=Rain Property_SignalStrength=Signal Strength 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 6b471a74250..4c3ad173877 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 @@ -316,6 +316,7 @@ + From bb26274f931c51b7e1cf77437fd067c2f75a6cfb Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sat, 26 Apr 2025 15:01:30 +0100 Subject: [PATCH 22/26] revert unnecessary labels Signed-off-by: Andrew Fiddian-Green --- .../model/SemanticTags.csv | 266 +++++++++--------- .../semantics/model/DefaultSemanticTags.java | 266 +++++++++--------- 2 files changed, 266 insertions(+), 266 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 2b4e274da24..69e62080c50 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -47,11 +47,11 @@ Property,AirQuality,,Air Quality,, Property,AQI,AirQuality,AQI,Air Quality Index,Air Quality Index Property,CO,AirQuality,CO,Carbon Monoxide,Carbon monoxide Property,CO2,AirQuality,CO2,Carbon Dioxide,Carbon dioxide -Property,Ozone,AirQuality,Ozone,,Ozone reading -Property,ParticulateMatter,AirQuality,Particulate Matter,PM25,Particulate matter reading -Property,Pollen,AirQuality,Pollen,,Pollen reading -Property,Radon,AirQuality,Radon,,Radon reading -Property,VOC,AirQuality,VOC,Volatile Organic Compounds,Volatile organic compounds reading +Property,Ozone,AirQuality,Ozone,, +Property,ParticulateMatter,AirQuality,Particulate Matter,PM25, +Property,Pollen,AirQuality,Pollen,, +Property,Radon,AirQuality,Radon,, +Property,VOC,AirQuality,VOC,Volatile Organic Compounds, Property,Airconditioning,,Airconditioning,, Property,Airflow,,Airflow,, Property,App,,App,Application,Software program @@ -62,22 +62,22 @@ Property,ColorTemperature,,Color Temperature,,Color temperature of a light sourc Property,Current,,Current,,Electric current Property,Duration,,Duration,,Time duration Property,Enabled,,Enabled,,Enabled state -Property,Energy,,Energy,,Energy consumption or production +Property,Energy,,Energy,, Property,Frequency,,Frequency,, Property,Gas,,Gas,, Property,Heating,,Heating,, -Property,Humidity,,Humidity,,Humidity value -Property,Illuminance,,Illuminance,,Illuminance value +Property,Humidity,,Humidity,, +Property,Illuminance,,Illuminance,, Property,Info,,Information,,General information Property,Level,,Level,, Property,Light,,Light,"Lights, Lighting",Control or status of a light Property,LowBattery,,Low Battery,,Low battery indication Property,MediaControl,,Media Control,,Audio- or visual- media control Property,Mode,,Mode,,Operating mode -Property,Moisture,,Moisture,,Moisture value +Property,Moisture,,Moisture,, Property,Motion,,Motion,,Motion detected -Property,Noise,,Noise,,Noise measurement -Property,Oil,,Oil,,Oil measurement +Property,Noise,,Noise,, +Property,Oil,,Oil,, Property,Opening,,Opening,,Opening of a door or window etc. Property,OpenLevel,Opening,Open Level,,Open position (analog) of a door or window etc. Property,OpenState,Opening,Open State,Open Closed,Open state (digital) of a door or window etc. @@ -87,25 +87,25 @@ Property,Power,,Power,, Property,Presence,,Presence,,Presence detection Property,Pressure,,Pressure,, Property,Progress,,Progress,, -Property,QualityOfService,,Quality of Service,,Quality of service -Property,Rain,,Rain,,Rain measurement +Property,QualityOfService,,Quality of Service,, +Property,Rain,,Rain,, Property,SignalStrength,,Signal Strength,, -Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication,Received signal strength indication +Property,RSSI,SignalStrength,RSSI,Received Signal Strength Indication, Property,Smoke,,Smoke,,Smoke detection Property,SoundVolume,,Sound Volume,,Sound volume level -Property,Speed,,Speed,,Speed measurement or setting +Property,Speed,,Speed,, Property,Tampered,,Tampered,,Tampering detected -Property,Temperature,,Temperature,Temperatures,Temperature measurement +Property,Temperature,,Temperature,Temperatures, Property,Tilt,,Tilt,,"Tilt of a blind, shade or shutter" Property,Timestamp,,Timestamp,,Timestamp of an event -Property,Ultraviolet,,Ultraviolet,UV,Ultraviolet measurement +Property,Ultraviolet,,Ultraviolet,UV, Property,Ventilation,,Ventilation,, -Property,Vibration,,Vibration,,Vibration level -Property,Voltage,,Voltage,,Electric voltage -Property,Water,,Water,,Water measurement +Property,Vibration,,Vibration,, +Property,Voltage,,Voltage,, +Property,Water,,Water,, Property,Wind,,Wind,,Wind speed or direction -Equipment,AlarmDevice,,Alarm Device,,Alarm device -Equipment,AlarmSystem,,Alarm System,Alarm Systems,Alarm system +Equipment,AlarmDevice,,Alarm Device,, +Equipment,AlarmSystem,,Alarm System,Alarm Systems, Equipment,Application,,Application,"App, Software program",Software program Equipment,AudioVisual,,Audio Visual,,Audio visual device Equipment,Display,AudioVisual,Display,,Visual display @@ -114,150 +114,150 @@ Equipment,Television,Display,Television,"Televisions, TV, TVs",Television Equipment,MediaPlayer,AudioVisual,Media Player,,Media player Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", AV Receiver Equipment,Screen,AudioVisual,Screen,Screens,Visual display screen -Equipment,Speaker,AudioVisual,Speaker,Speakers,Loudspeaker -Equipment,Bed,,Bed,,Bed -Equipment,Camera,,Camera,Cameras,Camera -Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots",Cleaning robot -Equipment,Computer,,Computer,,Computer -Equipment,ControlDevice,,Control Device,,Control device +Equipment,Speaker,AudioVisual,Speaker,Speakers,Loud-speaker +Equipment,Bed,,Bed,, +Equipment,Camera,,Camera,Cameras, +Equipment,CleaningRobot,,Cleaning Robot,"Cleaning Robots, Vacuum robot, Vacuum robots", +Equipment,Computer,,Computer,, +Equipment,ControlDevice,,Control Device,, Equipment,Button,ControlDevice,Button,,Push or touch button Equipment,Dial,ControlDevice,Dial,Rotary Dial,Rotary dial -Equipment,Keypad,ControlDevice,Keypad,,Keypad +Equipment,Keypad,ControlDevice,Keypad,, Equipment,Slider,ControlDevice,Slider,,Slider control Equipment,WallSwitch,ControlDevice,Wall Switch,Wall Switches,Wall switch -Equipment,Door,,Door,Doors,Door -Equipment,BackDoor,Door,Back Door,Back Doors,Back door -Equipment,CellarDoor,Door,Cellar Door,Cellar Doors,Cellar door -Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors",Front door -Equipment,GarageDoor,Door,Garage Door,Garage Doors,Garage door -Equipment,Gate,Door,Gate,Gates,Gate -Equipment,InnerDoor,Door,Inner Door,Inner Doors,Inner door -Equipment,SideDoor,Door,Side Door,Side Doors,Side door -Equipment,Doorbell,,Doorbell,Doorbells,Doorbell +Equipment,Door,,Door,Doors, +Equipment,BackDoor,Door,Back Door,Back Doors, +Equipment,CellarDoor,Door,Cellar Door,Cellar Doors, +Equipment,FrontDoor,Door,Front Door,"Front Doors, Frontdoor, Frontdoors", +Equipment,GarageDoor,Door,Garage Door,Garage Doors, +Equipment,Gate,Door,Gate,Gates, +Equipment,InnerDoor,Door,Inner Door,Inner Doors, +Equipment,SideDoor,Door,Side Door,Side Doors, +Equipment,Doorbell,,Doorbell,Doorbells, Equipment,DrinkingWater,,Drinking Water,Potable Water, -Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet -Equipment,WaterFilter,DrinkingWater,Water Filter,,Water filter -Equipment,WaterSoftener,DrinkingWater,Water Softener,,Water softener -Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC",Heating Ventilation or AirConditioning -Equipment,AirConditioner,HVAC,Air Conditioner,,Air conditioner -Equipment,AirFilter,HVAC,Air Filter,,Air filter -Equipment,Boiler,HVAC,Boiler,Boilers,Boiler -Equipment,Dehumidifier,HVAC,Dehumidifier,,Dehumidifier -Equipment,Fan,HVAC,Fan,Fans,Fan -Equipment,CeilingFan,Fan,Ceiling Fan,Ceiling Fans,Ceiling fan -Equipment,ExhaustFan,Fan,Exhaust Fan,"Extract Fan, Toilet Fan",Exhaust fan -Equipment,KitchenHood,Fan,Kitchen Hood,Kitchen Hoods,Kitchen hood -Equipment,FloorHeating,HVAC,Floor Heating,"Underfloor Heating, Radiant Floor Heating",Floor heating -Equipment,Furnace,HVAC,Furnace,"Wood Burner, Wood Heater",Furnace -Equipment,HeatPump,HVAC,Heat Pump,,Heat pump -Equipment,HeatRecovery,HVAC,Heat Recovery,Energy Recovery,Heat recovery -Equipment,Humidifier,HVAC,Humidifier,,Humidifier -Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Radiators",Radiator control +Equipment,HotWaterFaucet,DrinkingWater,Hot Water Faucet,"Hot Water Tap, Boiling Water Tap, Boiling Water Faucet",Hot water faucet or tap +Equipment,WaterFilter,DrinkingWater,Water Filter,, +Equipment,WaterSoftener,DrinkingWater,Water Softener,, +Equipment,HVAC,,HVAC,"Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC","Heating, Ventilation or AirConditioning" +Equipment,AirConditioner,HVAC,Air Conditioner,, +Equipment,AirFilter,HVAC,Air Filter,, +Equipment,Boiler,HVAC,Boiler,Boilers, +Equipment,Dehumidifier,HVAC,Dehumidifier,, +Equipment,Fan,HVAC,Fan,Fans, +Equipment,CeilingFan,Fan,Ceiling Fan,Ceiling Fans, +Equipment,ExhaustFan,Fan,Exhaust Fan,"Extract Fan, Toilet Fan", +Equipment,KitchenHood,Fan,Kitchen Hood,Kitchen Hoods, +Equipment,FloorHeating,HVAC,Floor Heating,"Underfloor Heating, Radiant Floor Heating", +Equipment,Furnace,HVAC,Furnace,"Wood Burner, Wood Heater", +Equipment,HeatPump,HVAC,Heat Pump,, +Equipment,HeatRecovery,HVAC,Heat Recovery,Energy Recovery, +Equipment,Humidifier,HVAC,Humidifier,, +Equipment,RadiatorControl,HVAC,Radiator Control,"Radiator Controls, Radiator, Radiators", Equipment,SmartVent,HVAC,Smart Vent,,Smart ventilation device -Equipment,Thermostat,HVAC,Thermostat,,Thermostat -Equipment,WaterHeater,HVAC,Water Heater,Water Boiler,Water heater +Equipment,Thermostat,HVAC,Thermostat,, +Equipment,WaterHeater,HVAC,Water Heater,Water Boiler, Equipment,Horticulture,,Horticulture,, Equipment,Irrigation,Horticulture,Irrigation,"Sprinkler, Drip System", -Equipment,LawnMower,Horticulture,Lawn Mower,Lawn Mowers,Lawn mower -Equipment,SoilSensor,Horticulture,Soil Sensor,Moisture Sensor,Soil sensor -Equipment,LightSource,,Light Source,"Lights, Lighting",Light source -Equipment,AccentLight,LightSource,Accent Light,,Accent light -Equipment,Chandelier,LightSource,Chandelier,,Chandelier -Equipment,Downlight,LightSource,Downlight,"Can Light, Pot Light",Downlight -Equipment,FloodLight,LightSource,Flood Light,,Flood light -Equipment,Lamp,LightSource,Lamp,,Lamp -Equipment,LightStrip,LightSource,Light Strip,LED Strip,Light strip -Equipment,LightStripe,LightSource,Light Stripe,Light Stripes,Light stripe -Equipment,Lightbulb,LightSource,Light Bulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps",Light bulb +Equipment,LawnMower,Horticulture,Lawn Mower,Lawn Mowers, +Equipment,SoilSensor,Horticulture,Soil Sensor,Moisture Sensor, +Equipment,LightSource,,Light Source,"Lights, Lighting", +Equipment,AccentLight,LightSource,Accent Light,, +Equipment,Chandelier,LightSource,Chandelier,, +Equipment,Downlight,LightSource,Downlight,"Can Light, Pot Light", +Equipment,FloodLight,LightSource,Flood Light,, +Equipment,Lamp,LightSource,Lamp,, +Equipment,LightStrip,LightSource,Light Strip,LED Strip, +Equipment,LightStripe,LightSource,Light Stripe,Light Stripes, +Equipment,Lightbulb,LightSource,Light Bulb,"Lightbulbs, Bulb, Bulbs, Lamp, Lamps", Equipment,Pendant,LightSource,Pendant,,Pendant light Equipment,Sconce,LightSource,Sconce,,Sconce light -Equipment,SpotLight,LightSource,Spot Light,,Spot light -Equipment,TrackLight,LightSource,Track Light,,Track light -Equipment,WallLight,LightSource,Wall Light,,Wall light +Equipment,SpotLight,LightSource,Spot Light,, +Equipment,TrackLight,LightSource,Track Light,, +Equipment,WallLight,LightSource,Wall Light,, Equipment,Lock,,Lock,Locks, -Equipment,NetworkAppliance,,Network Appliance,Network Appliances,Network appliance -Equipment,Firewall,NetworkAppliance,Firewall,,Firewall -Equipment,NetworkSwitch,NetworkAppliance,Network Switch,,Network switch -Equipment,Router,NetworkAppliance,Router,,Network router -Equipment,WirelessAccessPoint,NetworkAppliance,Wireless Access Point,"Access Point, WAP, WiFi, WiFi Access Point",Wireless access point +Equipment,NetworkAppliance,,Network Appliance,Network Appliances, +Equipment,Firewall,NetworkAppliance,Firewall,, +Equipment,NetworkSwitch,NetworkAppliance,Network Switch,, +Equipment,Router,NetworkAppliance,Router,, +Equipment,WirelessAccessPoint,NetworkAppliance,Wireless Access Point,"Access Point, WAP, WiFi, WiFi Access Point", Equipment,PetCare,,Pet Care,, -Equipment,Aquarium,PetCare,Aquarium,Fish Tank,Aquarium -Equipment,PetFeeder,PetCare,Pet Feeder,,Pet feeder -Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap",Pet flap -Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs",Power outlet -Equipment,PowerSupply,,Power Supply,,Power supply -Equipment,Battery,PowerSupply,Battery,Batteries,Battery -Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger",Electric vehicle supply equipment +Equipment,Aquarium,PetCare,Aquarium,Fish Tank, +Equipment,PetFeeder,PetCare,Pet Feeder,, +Equipment,PetFlap,PetCare,Pet Flap,"Cat Flap, Dog Flap", +Equipment,PowerOutlet,,Power Outlet,"Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs", +Equipment,PowerSupply,,Power Supply,, +Equipment,Battery,PowerSupply,Battery,Batteries, +Equipment,EVSE,PowerSupply,Electric Vehicle Supply Equipment,"EV Charger, Car Charger", Equipment,Generator,PowerSupply,Generator,Emergency Generator,Electricity generator Equipment,Inverter,PowerSupply,Inverter,Inverters,Electrical power inverter -Equipment,SolarPanel,PowerSupply,Solar Panel,,Solar panel +Equipment,SolarPanel,PowerSupply,Solar Panel,, Equipment,TransferSwitch,PowerSupply,Transfer Switch,,Electricity transfer switch -Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply,Uninterruptible power supply -Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine,Wind generator -Equipment,Printer,,Printer,,Printer -Equipment,Printer3D,Printer,3D Printer,,3D printer +Equipment,UPS,PowerSupply,UPS,Uninterruptible Power Supply, +Equipment,WindGenerator,PowerSupply,Wind Generator,Wind Turbine, +Equipment,Printer,,Printer,, +Equipment,Printer3D,Printer,3D Printer,, Equipment,Pump,,Pump,Pumps, Equipment,WaterFeature,Pump,Water Feature,"Waterfall, Pond Pump", Equipment,RemoteControl,,Remote Control,Remote Controls,Remote control device -Equipment,Sensor,,Sensor,Sensors,Sensor -Equipment,AirQualitySensor,Sensor,Air Quality Sensor,,Air quality sensor -Equipment,CO2Sensor,Sensor,CO2 Sensor,,Co2 sensor -Equipment,COSensor,Sensor,CO Sensor,,Co sensor -Equipment,ContactSensor,Sensor,Contact Sensor,,Contact sensor -Equipment,ElectricMeter,Sensor,Electric Meter,,Electric meter -Equipment,FireDetector,Sensor,Fire Detector,,Fire detector -Equipment,FlameDetector,FireDetector,Flame Detector,,Flame detector -Equipment,HeatDetector,FireDetector,Heat Detector,,Heat detector -Equipment,SmokeDetector,FireDetector,Smoke Detector,Smoke Detectors,Smoke detector -Equipment,GasMeter,Sensor,Gas Meter,,Gas meter -Equipment,GlassBreakDetector,Sensor,Glass Break Detector,,Glass break detector -Equipment,HumiditySensor,Sensor,Humidity Sensor,Hygrometer,Humidity sensor -Equipment,IlluminanceSensor,Sensor,Illuminance Sensor,,Illuminance sensor -Equipment,LeakSensor,Sensor,Leak Sensor,,Leak sensor -Equipment,OccupancySensor,Sensor,Occupancy Sensor,,Occupancy sensor -Equipment,MotionDetector,OccupancySensor,Motion Detector,"Motion Detectors, Motion Sensor, Motion Sensors",Motion detector -Equipment,TemperatureSensor,Sensor,Temperature Sensor,,Temperature sensor -Equipment,VibrationSensor,Sensor,Vibration Sensor,,Vibration sensor -Equipment,WaterMeter,Sensor,Water Meter,,Water meter -Equipment,WaterQualitySensor,Sensor,Water Quality Sensor,,Water quality sensor -Equipment,WeatherStation,Sensor,Weather Station,,Weather station +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,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,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,Alarm siren -Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones",Smartphone +Equipment,Smartphone,,Smartphone,"Smartphones, Phone, Phones", Equipment,Tool,,Tool,,Hand- or machine- tool Equipment,Tracker,,Tracker,,Location tracker -Equipment,Valve,,Valve,Valves,Fluid valve +Equipment,Valve,,Valve,Valves, Equipment,Vehicle,,Vehicle,, Equipment,Car,Vehicle,Car,, -Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants,Voice assistant device -Equipment,WebService,,Web Service,Web Services,Web service -Equipment,WeatherService,WebService,Weather Service,Weather Services,Weather service +Equipment,VoiceAssistant,,Voice Assistant,Voice Assistants, +Equipment,WebService,,Web Service,Web Services, +Equipment,WeatherService,WebService,Weather Service,Weather Services, Equipment,Wellness,,Wellness,, Equipment,Chlorinator,Wellness,Chlorinator,,Water chlorinator -Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool",Jacuzzi +Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool", Equipment,PoolCover,Wellness,Pool Cover,,Swimming pool cover Equipment,PoolHeater,Wellness,Pool Heater,,Swimming pool heater -Equipment,Sauna,Wellness,Sauna,Steam Room,Sauna -Equipment,Shower,Wellness,Shower,,Shower -Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool",Swimming pool +Equipment,Sauna,Wellness,Sauna,Steam Room, +Equipment,Shower,Wellness,Shower,, +Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool", Equipment,WhiteGood,,White Good,White Goods,White goods appliance -Equipment,AirFryer,WhiteGood,Air Fryer,,Air fryer -Equipment,CoffeeMaker,WhiteGood,Coffee Maker,"Coffee Makers, Coffee Machine, Coffee Machines",Coffee maker +Equipment,AirFryer,WhiteGood,Air Fryer,, +Equipment,CoffeeMaker,WhiteGood,Coffee Maker,"Coffee Makers, Coffee Machine, Coffee Machines", Equipment,Cooktop,WhiteGood,Cooktop,Hob,Cooktop appliance -Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers,Dishwasher -Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers",Laundry dryer -Equipment,FoodProcessor,WhiteGood,Food Processor,,Food processor -Equipment,Freezer,WhiteGood,Freezer,Freezers,Freezer +Equipment,Dishwasher,WhiteGood,Dishwasher,Dishwashers, +Equipment,Dryer,WhiteGood,Dryer,"Dryers, Tumble Dryer, Tumble Dryers",Laundry (tumble) dryer +Equipment,FoodProcessor,WhiteGood,Food Processor,, +Equipment,Freezer,WhiteGood,Freezer,Freezers, Equipment,Fryer,WhiteGood,Fryer,,Deep fryer -Equipment,IceMaker,WhiteGood,Ice Maker,,Ice maker +Equipment,IceMaker,WhiteGood,Ice Maker,, Equipment,Microwave,WhiteGood,Microwave,,Microwave cooker Equipment,Mixer,WhiteGood,Mixer,,Food mixer -Equipment,Oven,WhiteGood,Oven,Ovens,Oven +Equipment,Oven,WhiteGood,Oven,Ovens, Equipment,Range,WhiteGood,Range,,Kitchen range -Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators,Refrigerator -Equipment,Toaster,WhiteGood,Toaster,Toaster Oven,Toaster -Equipment,WashingMachine,WhiteGood,Washing Machine,Washing Machines,Washing machine -Equipment,Window,,Window,Windows,Window -Equipment,WindowCovering,,Window Covering,,Window covering +Equipment,Refrigerator,WhiteGood,Refrigerator,Refrigerators, +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","Window blinds, shades or shutters" Equipment,Drapes,WindowCovering,Drapes,Curtains,Curtains or drapes Equipment,Zone,,Zone,,Equipment zone 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 d3b0cd148b8..c7a73bd6b2c 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 @@ -279,27 +279,27 @@ public static class Property { public static final SemanticTag OZONE = new SemanticTagImpl( // "Property_AirQuality_Ozone", // "Ozone", // - "Ozone reading", // + "", // ""); public static final SemanticTag PARTICULATE_MATTER = new SemanticTagImpl( // "Property_AirQuality_ParticulateMatter", // "Particulate Matter", // - "Particulate matter reading", // + "", // "PM25"); public static final SemanticTag POLLEN = new SemanticTagImpl( // "Property_AirQuality_Pollen", // "Pollen", // - "Pollen reading", // + "", // ""); public static final SemanticTag RADON = new SemanticTagImpl( // "Property_AirQuality_Radon", // "Radon", // - "Radon reading", // + "", // ""); public static final SemanticTag VOC = new SemanticTagImpl( // "Property_AirQuality_VOC", // "VOC", // - "Volatile organic compounds reading", // + "", // "Volatile Organic Compounds"); public static final SemanticTag AIRCONDITIONING = new SemanticTagImpl( // "Property_Airconditioning", // @@ -354,7 +354,7 @@ public static class Property { public static final SemanticTag ENERGY = new SemanticTagImpl( // "Property_Energy", // "Energy", // - "Energy consumption or production", // + "", // ""); public static final SemanticTag FREQUENCY = new SemanticTagImpl( // "Property_Frequency", // @@ -374,12 +374,12 @@ public static class Property { public static final SemanticTag HUMIDITY = new SemanticTagImpl( // "Property_Humidity", // "Humidity", // - "Humidity value", // + "", // ""); public static final SemanticTag ILLUMINANCE = new SemanticTagImpl( // "Property_Illuminance", // "Illuminance", // - "Illuminance value", // + "", // ""); public static final SemanticTag INFO = new SemanticTagImpl( // "Property_Info", // @@ -414,7 +414,7 @@ public static class Property { public static final SemanticTag MOISTURE = new SemanticTagImpl( // "Property_Moisture", // "Moisture", // - "Moisture value", // + "", // ""); public static final SemanticTag MOTION = new SemanticTagImpl( // "Property_Motion", // @@ -424,12 +424,12 @@ public static class Property { public static final SemanticTag NOISE = new SemanticTagImpl( // "Property_Noise", // "Noise", // - "Noise measurement", // + "", // ""); public static final SemanticTag OIL = new SemanticTagImpl( // "Property_Oil", // "Oil", // - "Oil measurement", // + "", // ""); public static final SemanticTag OPENING = new SemanticTagImpl( // "Property_Opening", // @@ -479,12 +479,12 @@ public static class Property { public static final SemanticTag QUALITY_OF_SERVICE = new SemanticTagImpl( // "Property_QualityOfService", // "Quality of Service", // - "Quality of service", // + "", // ""); public static final SemanticTag RAIN = new SemanticTagImpl( // "Property_Rain", // "Rain", // - "Rain measurement", // + "", // ""); public static final SemanticTag SIGNAL_STRENGTH = new SemanticTagImpl( // "Property_SignalStrength", // @@ -494,7 +494,7 @@ public static class Property { public static final SemanticTag RSSI = new SemanticTagImpl( // "Property_SignalStrength_RSSI", // "RSSI", // - "Received signal strength indication", // + "", // "Received Signal Strength Indication"); public static final SemanticTag SMOKE = new SemanticTagImpl( // "Property_Smoke", // @@ -509,7 +509,7 @@ public static class Property { public static final SemanticTag SPEED = new SemanticTagImpl( // "Property_Speed", // "Speed", // - "Speed measurement or setting", // + "", // ""); public static final SemanticTag TAMPERED = new SemanticTagImpl( // "Property_Tampered", // @@ -519,7 +519,7 @@ public static class Property { public static final SemanticTag TEMPERATURE = new SemanticTagImpl( // "Property_Temperature", // "Temperature", // - "Temperature measurement", // + "", // "Temperatures"); public static final SemanticTag TILT = new SemanticTagImpl( // "Property_Tilt", // @@ -534,7 +534,7 @@ public static class Property { public static final SemanticTag ULTRAVIOLET = new SemanticTagImpl( // "Property_Ultraviolet", // "Ultraviolet", // - "Ultraviolet measurement", // + "", // "UV"); public static final SemanticTag VENTILATION = new SemanticTagImpl( // "Property_Ventilation", // @@ -544,17 +544,17 @@ public static class Property { public static final SemanticTag VIBRATION = new SemanticTagImpl( // "Property_Vibration", // "Vibration", // - "Vibration level", // + "", // ""); public static final SemanticTag VOLTAGE = new SemanticTagImpl( // "Property_Voltage", // "Voltage", // - "Electric voltage", // + "", // ""); public static final SemanticTag WATER = new SemanticTagImpl( // "Property_Water", // "Water", // - "Water measurement", // + "", // ""); public static final SemanticTag WIND = new SemanticTagImpl( // "Property_Wind", // @@ -567,12 +567,12 @@ public static class Equipment { public static final SemanticTag ALARM_DEVICE = new SemanticTagImpl( // "Equipment_AlarmDevice", // "Alarm Device", // - "Alarm device", // + "", // ""); public static final SemanticTag ALARM_SYSTEM = new SemanticTagImpl( // "Equipment_AlarmSystem", // "Alarm System", // - "Alarm system", // + "", // "Alarm Systems"); public static final SemanticTag APPLICATION = new SemanticTagImpl( // "Equipment_Application", // @@ -617,32 +617,32 @@ public static class Equipment { public static final SemanticTag SPEAKER = new SemanticTagImpl( // "Equipment_AudioVisual_Speaker", // "Speaker", // - "Loudspeaker", // + "Loud-speaker", // "Speakers"); public static final SemanticTag BED = new SemanticTagImpl( // "Equipment_Bed", // "Bed", // - "Bed", // + "", // ""); public static final SemanticTag CAMERA = new SemanticTagImpl( // "Equipment_Camera", // "Camera", // - "Camera", // + "", // "Cameras"); public static final SemanticTag CLEANING_ROBOT = new SemanticTagImpl( // "Equipment_CleaningRobot", // "Cleaning Robot", // - "Cleaning robot", // + "", // "Cleaning Robots, Vacuum robot, Vacuum robots"); public static final SemanticTag COMPUTER = new SemanticTagImpl( // "Equipment_Computer", // "Computer", // - "Computer", // + "", // ""); public static final SemanticTag CONTROL_DEVICE = new SemanticTagImpl( // "Equipment_ControlDevice", // "Control Device", // - "Control device", // + "", // ""); public static final SemanticTag BUTTON = new SemanticTagImpl( // "Equipment_ControlDevice_Button", // @@ -657,7 +657,7 @@ public static class Equipment { public static final SemanticTag KEYPAD = new SemanticTagImpl( // "Equipment_ControlDevice_Keypad", // "Keypad", // - "Keypad", // + "", // ""); public static final SemanticTag SLIDER = new SemanticTagImpl( // "Equipment_ControlDevice_Slider", // @@ -672,47 +672,47 @@ public static class Equipment { public static final SemanticTag DOOR = new SemanticTagImpl( // "Equipment_Door", // "Door", // - "Door", // + "", // "Doors"); public static final SemanticTag BACK_DOOR = new SemanticTagImpl( // "Equipment_Door_BackDoor", // "Back Door", // - "Back door", // + "", // "Back Doors"); public static final SemanticTag CELLAR_DOOR = new SemanticTagImpl( // "Equipment_Door_CellarDoor", // "Cellar Door", // - "Cellar door", // + "", // "Cellar Doors"); public static final SemanticTag FRONT_DOOR = new SemanticTagImpl( // "Equipment_Door_FrontDoor", // "Front Door", // - "Front door", // + "", // "Front Doors, Frontdoor, Frontdoors"); public static final SemanticTag GARAGE_DOOR = new SemanticTagImpl( // "Equipment_Door_GarageDoor", // "Garage Door", // - "Garage door", // + "", // "Garage Doors"); public static final SemanticTag GATE = new SemanticTagImpl( // "Equipment_Door_Gate", // "Gate", // - "Gate", // + "", // "Gates"); public static final SemanticTag INNER_DOOR = new SemanticTagImpl( // "Equipment_Door_InnerDoor", // "Inner Door", // - "Inner door", // + "", // "Inner Doors"); public static final SemanticTag SIDE_DOOR = new SemanticTagImpl( // "Equipment_Door_SideDoor", // "Side Door", // - "Side door", // + "", // "Side Doors"); public static final SemanticTag DOORBELL = new SemanticTagImpl( // "Equipment_Doorbell", // "Doorbell", // - "Doorbell", // + "", // "Doorbells"); public static final SemanticTag DRINKING_WATER = new SemanticTagImpl( // "Equipment_DrinkingWater", // @@ -722,92 +722,92 @@ public static class Equipment { public static final SemanticTag HOT_WATER_FAUCET = new SemanticTagImpl( // "Equipment_DrinkingWater_HotWaterFaucet", // "Hot Water Faucet", // - "Hot water faucet", // + "Hot water faucet or tap", // "Hot Water Tap, Boiling Water Tap, Boiling Water Faucet"); public static final SemanticTag WATER_FILTER = new SemanticTagImpl( // "Equipment_DrinkingWater_WaterFilter", // "Water Filter", // - "Water filter", // + "", // ""); public static final SemanticTag WATER_SOFTENER = new SemanticTagImpl( // "Equipment_DrinkingWater_WaterSoftener", // "Water Softener", // - "Water softener", // + "", // ""); public static final SemanticTag HVAC = new SemanticTagImpl( // "Equipment_HVAC", // "HVAC", // - "Heating Ventilation or AirConditioning", // + "Heating, Ventilation or AirConditioning", // "Heating, Ventilation, Air Conditioning, A/C, A/Cs, AC"); public static final SemanticTag AIR_CONDITIONER = new SemanticTagImpl( // "Equipment_HVAC_AirConditioner", // "Air Conditioner", // - "Air conditioner", // + "", // ""); public static final SemanticTag AIR_FILTER = new SemanticTagImpl( // "Equipment_HVAC_AirFilter", // "Air Filter", // - "Air filter", // + "", // ""); public static final SemanticTag BOILER = new SemanticTagImpl( // "Equipment_HVAC_Boiler", // "Boiler", // - "Boiler", // + "", // "Boilers"); public static final SemanticTag DEHUMIDIFIER = new SemanticTagImpl( // "Equipment_HVAC_Dehumidifier", // "Dehumidifier", // - "Dehumidifier", // + "", // ""); public static final SemanticTag FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan", // "Fan", // - "Fan", // + "", // "Fans"); public static final SemanticTag CEILING_FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan_CeilingFan", // "Ceiling Fan", // - "Ceiling fan", // + "", // "Ceiling Fans"); public static final SemanticTag EXHAUST_FAN = new SemanticTagImpl( // "Equipment_HVAC_Fan_ExhaustFan", // "Exhaust Fan", // - "Exhaust fan", // + "", // "Extract Fan, Toilet Fan"); public static final SemanticTag KITCHEN_HOOD = new SemanticTagImpl( // "Equipment_HVAC_Fan_KitchenHood", // "Kitchen Hood", // - "Kitchen hood", // + "", // "Kitchen Hoods"); public static final SemanticTag FLOOR_HEATING = new SemanticTagImpl( // "Equipment_HVAC_FloorHeating", // "Floor Heating", // - "Floor heating", // + "", // "Underfloor Heating, Radiant Floor Heating"); public static final SemanticTag FURNACE = new SemanticTagImpl( // "Equipment_HVAC_Furnace", // "Furnace", // - "Furnace", // + "", // "Wood Burner, Wood Heater"); public static final SemanticTag HEAT_PUMP = new SemanticTagImpl( // "Equipment_HVAC_HeatPump", // "Heat Pump", // - "Heat pump", // + "", // ""); public static final SemanticTag HEAT_RECOVERY = new SemanticTagImpl( // "Equipment_HVAC_HeatRecovery", // "Heat Recovery", // - "Heat recovery", // + "", // "Energy Recovery"); public static final SemanticTag HUMIDIFIER = new SemanticTagImpl( // "Equipment_HVAC_Humidifier", // "Humidifier", // - "Humidifier", // + "", // ""); public static final SemanticTag RADIATOR_CONTROL = new SemanticTagImpl( // "Equipment_HVAC_RadiatorControl", // "Radiator Control", // - "Radiator control", // + "", // "Radiator Controls, Radiator, Radiators"); public static final SemanticTag SMART_VENT = new SemanticTagImpl( // "Equipment_HVAC_SmartVent", // @@ -817,12 +817,12 @@ public static class Equipment { public static final SemanticTag THERMOSTAT = new SemanticTagImpl( // "Equipment_HVAC_Thermostat", // "Thermostat", // - "Thermostat", // + "", // ""); public static final SemanticTag WATER_HEATER = new SemanticTagImpl( // "Equipment_HVAC_WaterHeater", // "Water Heater", // - "Water heater", // + "", // "Water Boiler"); public static final SemanticTag HORTICULTURE = new SemanticTagImpl( // "Equipment_Horticulture", // @@ -837,57 +837,57 @@ public static class Equipment { public static final SemanticTag LAWN_MOWER = new SemanticTagImpl( // "Equipment_Horticulture_LawnMower", // "Lawn Mower", // - "Lawn mower", // + "", // "Lawn Mowers"); public static final SemanticTag SOIL_SENSOR = new SemanticTagImpl( // "Equipment_Horticulture_SoilSensor", // "Soil Sensor", // - "Soil sensor", // + "", // "Moisture Sensor"); public static final SemanticTag LIGHT_SOURCE = new SemanticTagImpl( // "Equipment_LightSource", // "Light Source", // - "Light source", // + "", // "Lights, Lighting"); public static final SemanticTag ACCENT_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_AccentLight", // "Accent Light", // - "Accent light", // + "", // ""); public static final SemanticTag CHANDELIER = new SemanticTagImpl( // "Equipment_LightSource_Chandelier", // "Chandelier", // - "Chandelier", // + "", // ""); public static final SemanticTag DOWNLIGHT = new SemanticTagImpl( // "Equipment_LightSource_Downlight", // "Downlight", // - "Downlight", // + "", // "Can Light, Pot Light"); public static final SemanticTag FLOOD_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_FloodLight", // "Flood Light", // - "Flood light", // + "", // ""); public static final SemanticTag LAMP = new SemanticTagImpl( // "Equipment_LightSource_Lamp", // "Lamp", // - "Lamp", // + "", // ""); public static final SemanticTag LIGHT_STRIP = new SemanticTagImpl( // "Equipment_LightSource_LightStrip", // "Light Strip", // - "Light strip", // + "", // "LED Strip"); public static final SemanticTag LIGHT_STRIPE = new SemanticTagImpl( // "Equipment_LightSource_LightStripe", // "Light Stripe", // - "Light stripe", // + "", // "Light Stripes"); public static final SemanticTag LIGHTBULB = new SemanticTagImpl( // "Equipment_LightSource_Lightbulb", // "Light Bulb", // - "Light bulb", // + "", // "Lightbulbs, Bulb, Bulbs, Lamp, Lamps"); public static final SemanticTag PENDANT = new SemanticTagImpl( // "Equipment_LightSource_Pendant", // @@ -902,17 +902,17 @@ public static class Equipment { public static final SemanticTag SPOT_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_SpotLight", // "Spot Light", // - "Spot light", // + "", // ""); public static final SemanticTag TRACK_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_TrackLight", // "Track Light", // - "Track light", // + "", // ""); public static final SemanticTag WALL_LIGHT = new SemanticTagImpl( // "Equipment_LightSource_WallLight", // "Wall Light", // - "Wall light", // + "", // ""); public static final SemanticTag LOCK = new SemanticTagImpl( // "Equipment_Lock", // @@ -922,27 +922,27 @@ public static class Equipment { public static final SemanticTag NETWORK_APPLIANCE = new SemanticTagImpl( // "Equipment_NetworkAppliance", // "Network Appliance", // - "Network appliance", // + "", // "Network Appliances"); public static final SemanticTag FIREWALL = new SemanticTagImpl( // "Equipment_NetworkAppliance_Firewall", // "Firewall", // - "Firewall", // + "", // ""); public static final SemanticTag NETWORK_SWITCH = new SemanticTagImpl( // "Equipment_NetworkAppliance_NetworkSwitch", // "Network Switch", // - "Network switch", // + "", // ""); public static final SemanticTag ROUTER = new SemanticTagImpl( // "Equipment_NetworkAppliance_Router", // "Router", // - "Network router", // + "", // ""); public static final SemanticTag WIRELESS_ACCESS_POINT = new SemanticTagImpl( // "Equipment_NetworkAppliance_WirelessAccessPoint", // "Wireless Access Point", // - "Wireless access point", // + "", // "Access Point, WAP, WiFi, WiFi Access Point"); public static final SemanticTag PET_CARE = new SemanticTagImpl( // "Equipment_PetCare", // @@ -952,37 +952,37 @@ public static class Equipment { public static final SemanticTag AQUARIUM = new SemanticTagImpl( // "Equipment_PetCare_Aquarium", // "Aquarium", // - "Aquarium", // + "", // "Fish Tank"); public static final SemanticTag PET_FEEDER = new SemanticTagImpl( // "Equipment_PetCare_PetFeeder", // "Pet Feeder", // - "Pet feeder", // + "", // ""); public static final SemanticTag PET_FLAP = new SemanticTagImpl( // "Equipment_PetCare_PetFlap", // "Pet Flap", // - "Pet flap", // + "", // "Cat Flap, Dog Flap"); public static final SemanticTag POWER_OUTLET = new SemanticTagImpl( // "Equipment_PowerOutlet", // "Power Outlet", // - "Power outlet", // + "", // "Power Outlets, Outlet, Outlets, Smart Plug, Smart Plugs"); public static final SemanticTag POWER_SUPPLY = new SemanticTagImpl( // "Equipment_PowerSupply", // "Power Supply", // - "Power supply", // + "", // ""); public static final SemanticTag BATTERY = new SemanticTagImpl( // "Equipment_PowerSupply_Battery", // "Battery", // - "Battery", // + "", // "Batteries"); public static final SemanticTag EVSE = new SemanticTagImpl( // "Equipment_PowerSupply_EVSE", // "Electric Vehicle Supply Equipment", // - "Electric vehicle supply equipment", // + "", // "EV Charger, Car Charger"); public static final SemanticTag GENERATOR = new SemanticTagImpl( // "Equipment_PowerSupply_Generator", // @@ -997,7 +997,7 @@ public static class Equipment { public static final SemanticTag SOLAR_PANEL = new SemanticTagImpl( // "Equipment_PowerSupply_SolarPanel", // "Solar Panel", // - "Solar panel", // + "", // ""); public static final SemanticTag TRANSFER_SWITCH = new SemanticTagImpl( // "Equipment_PowerSupply_TransferSwitch", // @@ -1007,22 +1007,22 @@ public static class Equipment { public static final SemanticTag UPS = new SemanticTagImpl( // "Equipment_PowerSupply_UPS", // "UPS", // - "Uninterruptible power supply", // + "", // "Uninterruptible Power Supply"); public static final SemanticTag WIND_GENERATOR = new SemanticTagImpl( // "Equipment_PowerSupply_WindGenerator", // "Wind Generator", // - "Wind generator", // + "", // "Wind Turbine"); public static final SemanticTag PRINTER = new SemanticTagImpl( // "Equipment_Printer", // "Printer", // - "Printer", // + "", // ""); public static final SemanticTag PRINTER3D = new SemanticTagImpl( // "Equipment_Printer_Printer3D", // "3D Printer", // - "3D printer", // + "", // ""); public static final SemanticTag PUMP = new SemanticTagImpl( // "Equipment_Pump", // @@ -1042,112 +1042,112 @@ public static class Equipment { public static final SemanticTag SENSOR = new SemanticTagImpl( // "Equipment_Sensor", // "Sensor", // - "Sensor", // + "", // "Sensors"); public static final SemanticTag AIR_QUALITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_AirQualitySensor", // "Air Quality Sensor", // - "Air quality sensor", // + "", // ""); public static final SemanticTag CO2_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_CO2Sensor", // "CO2 Sensor", // - "Co2 sensor", // + "", // ""); public static final SemanticTag CO_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_COSensor", // "CO Sensor", // - "Co sensor", // + "", // ""); public static final SemanticTag CONTACT_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_ContactSensor", // "Contact Sensor", // - "Contact sensor", // + "", // ""); public static final SemanticTag ELECTRIC_METER = new SemanticTagImpl( // "Equipment_Sensor_ElectricMeter", // "Electric Meter", // - "Electric meter", // + "", // ""); public static final SemanticTag FIRE_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector", // "Fire Detector", // - "Fire detector", // + "", // ""); public static final SemanticTag FLAME_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_FlameDetector", // "Flame Detector", // - "Flame detector", // + "", // ""); public static final SemanticTag HEAT_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_HeatDetector", // "Heat Detector", // - "Heat detector", // + "", // ""); public static final SemanticTag SMOKE_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_FireDetector_SmokeDetector", // "Smoke Detector", // - "Smoke detector", // + "", // "Smoke Detectors"); public static final SemanticTag GAS_METER = new SemanticTagImpl( // "Equipment_Sensor_GasMeter", // "Gas Meter", // - "Gas meter", // + "", // ""); public static final SemanticTag GLASS_BREAK_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_GlassBreakDetector", // "Glass Break Detector", // - "Glass break detector", // + "", // ""); public static final SemanticTag HUMIDITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_HumiditySensor", // "Humidity Sensor", // - "Humidity sensor", // + "", // "Hygrometer"); public static final SemanticTag ILLUMINANCE_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_IlluminanceSensor", // "Illuminance Sensor", // - "Illuminance sensor", // + "", // ""); public static final SemanticTag LEAK_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_LeakSensor", // "Leak Sensor", // - "Leak sensor", // + "", // ""); public static final SemanticTag OCCUPANCY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_OccupancySensor", // "Occupancy Sensor", // - "Occupancy sensor", // + "", // ""); public static final SemanticTag MOTION_DETECTOR = new SemanticTagImpl( // "Equipment_Sensor_OccupancySensor_MotionDetector", // "Motion Detector", // - "Motion detector", // + "", // "Motion Detectors, Motion Sensor, Motion Sensors"); public static final SemanticTag TEMPERATURE_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_TemperatureSensor", // "Temperature Sensor", // - "Temperature sensor", // + "", // ""); public static final SemanticTag VIBRATION_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_VibrationSensor", // "Vibration Sensor", // - "Vibration sensor", // + "", // ""); public static final SemanticTag WATER_METER = new SemanticTagImpl( // "Equipment_Sensor_WaterMeter", // "Water Meter", // - "Water meter", // + "", // ""); public static final SemanticTag WATER_QUALITY_SENSOR = new SemanticTagImpl( // "Equipment_Sensor_WaterQualitySensor", // "Water Quality Sensor", // - "Water quality sensor", // + "", // ""); public static final SemanticTag WEATHER_STATION = new SemanticTagImpl( // "Equipment_Sensor_WeatherStation", // "Weather Station", // - "Weather station", // + "", // ""); public static final SemanticTag SIREN = new SemanticTagImpl( // "Equipment_Siren", // @@ -1157,7 +1157,7 @@ public static class Equipment { public static final SemanticTag SMARTPHONE = new SemanticTagImpl( // "Equipment_Smartphone", // "Smartphone", // - "Smartphone", // + "", // "Smartphones, Phone, Phones"); public static final SemanticTag TOOL = new SemanticTagImpl( // "Equipment_Tool", // @@ -1172,7 +1172,7 @@ public static class Equipment { public static final SemanticTag VALVE = new SemanticTagImpl( // "Equipment_Valve", // "Valve", // - "Fluid valve", // + "", // "Valves"); public static final SemanticTag VEHICLE = new SemanticTagImpl( // "Equipment_Vehicle", // @@ -1187,17 +1187,17 @@ public static class Equipment { public static final SemanticTag VOICE_ASSISTANT = new SemanticTagImpl( // "Equipment_VoiceAssistant", // "Voice Assistant", // - "Voice assistant device", // + "", // "Voice Assistants"); public static final SemanticTag WEB_SERVICE = new SemanticTagImpl( // "Equipment_WebService", // "Web Service", // - "Web service", // + "", // "Web Services"); public static final SemanticTag WEATHER_SERVICE = new SemanticTagImpl( // "Equipment_WebService_WeatherService", // "Weather Service", // - "Weather service", // + "", // "Weather Services"); public static final SemanticTag WELLNESS = new SemanticTagImpl( // "Equipment_Wellness", // @@ -1212,7 +1212,7 @@ public static class Equipment { public static final SemanticTag JACUZZI = new SemanticTagImpl( // "Equipment_Wellness_Jacuzzi", // "Jacuzzi", // - "Jacuzzi", // + "", // "Spa, Hot Tub, Whirlpool"); public static final SemanticTag POOL_COVER = new SemanticTagImpl( // "Equipment_Wellness_PoolCover", // @@ -1227,17 +1227,17 @@ public static class Equipment { public static final SemanticTag SAUNA = new SemanticTagImpl( // "Equipment_Wellness_Sauna", // "Sauna", // - "Sauna", // + "", // "Steam Room"); public static final SemanticTag SHOWER = new SemanticTagImpl( // "Equipment_Wellness_Shower", // "Shower", // - "Shower", // + "", // ""); public static final SemanticTag SWIMMING_POOL = new SemanticTagImpl( // "Equipment_Wellness_SwimmingPool", // "Swimming Pool", // - "Swimming pool", // + "", // "Swimming Pool, Pool"); public static final SemanticTag WHITE_GOOD = new SemanticTagImpl( // "Equipment_WhiteGood", // @@ -1247,12 +1247,12 @@ public static class Equipment { public static final SemanticTag AIR_FRYER = new SemanticTagImpl( // "Equipment_WhiteGood_AirFryer", // "Air Fryer", // - "Air fryer", // + "", // ""); public static final SemanticTag COFFEE_MAKER = new SemanticTagImpl( // "Equipment_WhiteGood_CoffeeMaker", // "Coffee Maker", // - "Coffee maker", // + "", // "Coffee Makers, Coffee Machine, Coffee Machines"); public static final SemanticTag COOKTOP = new SemanticTagImpl( // "Equipment_WhiteGood_Cooktop", // @@ -1262,22 +1262,22 @@ public static class Equipment { public static final SemanticTag DISHWASHER = new SemanticTagImpl( // "Equipment_WhiteGood_Dishwasher", // "Dishwasher", // - "Dishwasher", // + "", // "Dishwashers"); public static final SemanticTag DRYER = new SemanticTagImpl( // "Equipment_WhiteGood_Dryer", // "Dryer", // - "Laundry dryer", // + "Laundry (tumble) dryer", // "Dryers, Tumble Dryer, Tumble Dryers"); public static final SemanticTag FOOD_PROCESSOR = new SemanticTagImpl( // "Equipment_WhiteGood_FoodProcessor", // "Food Processor", // - "Food processor", // + "", // ""); public static final SemanticTag FREEZER = new SemanticTagImpl( // "Equipment_WhiteGood_Freezer", // "Freezer", // - "Freezer", // + "", // "Freezers"); public static final SemanticTag FRYER = new SemanticTagImpl( // "Equipment_WhiteGood_Fryer", // @@ -1287,7 +1287,7 @@ public static class Equipment { public static final SemanticTag ICE_MAKER = new SemanticTagImpl( // "Equipment_WhiteGood_IceMaker", // "Ice Maker", // - "Ice maker", // + "", // ""); public static final SemanticTag MICROWAVE = new SemanticTagImpl( // "Equipment_WhiteGood_Microwave", // @@ -1302,7 +1302,7 @@ public static class Equipment { public static final SemanticTag OVEN = new SemanticTagImpl( // "Equipment_WhiteGood_Oven", // "Oven", // - "Oven", // + "", // "Ovens"); public static final SemanticTag RANGE = new SemanticTagImpl( // "Equipment_WhiteGood_Range", // @@ -1312,27 +1312,27 @@ public static class Equipment { public static final SemanticTag REFRIGERATOR = new SemanticTagImpl( // "Equipment_WhiteGood_Refrigerator", // "Refrigerator", // - "Refrigerator", // + "", // "Refrigerators"); public static final SemanticTag TOASTER = new SemanticTagImpl( // "Equipment_WhiteGood_Toaster", // "Toaster", // - "Toaster", // + "", // "Toaster Oven"); public static final SemanticTag WASHING_MACHINE = new SemanticTagImpl( // "Equipment_WhiteGood_WashingMachine", // "Washing Machine", // - "Washing machine", // + "", // "Washing Machines"); public static final SemanticTag WINDOW = new SemanticTagImpl( // "Equipment_Window", // "Window", // - "Window", // + "", // "Windows"); public static final SemanticTag WINDOW_COVERING = new SemanticTagImpl( // "Equipment_WindowCovering", // "Window Covering", // - "Window covering", // + "", // ""); public static final SemanticTag BLINDS = new SemanticTagImpl( // "Equipment_WindowCovering_Blinds", // From c9edc0dc6efcda09af9bf44c498dbe152cd79ae2 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Mon, 12 May 2025 18:57:39 +0100 Subject: [PATCH 23/26] resolve merge conflicts Signed-off-by: Andrew Fiddian-Green --- .../openhab/core/semantics/model/DefaultSemanticTags.java | 5 ----- 1 file changed, 5 deletions(-) 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 82eb992731f..c7a73bd6b2c 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 @@ -223,11 +223,6 @@ public static class Point { "Calculation", // "Read only analog calculated data point", // ""); - public static final SemanticTag CALCULATION = new SemanticTagImpl( // - "Point_Calculation", // - "Calculation", // - "", // - ""); public static final SemanticTag CONTROL = new SemanticTagImpl( // "Point_Control", // "Control", // From 1acc551a960cecd7c1ffc3c32f479234fb696a71 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Mon, 12 May 2025 22:51:24 +0100 Subject: [PATCH 24/26] adopt reviewer suggestion Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 4 ++-- .../org/openhab/core/semantics/model/DefaultSemanticTags.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 69e62080c50..8a1f6e246fc 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -234,8 +234,8 @@ Equipment,WeatherService,WebService,Weather Service,Weather Services, Equipment,Wellness,,Wellness,, Equipment,Chlorinator,Wellness,Chlorinator,,Water chlorinator Equipment,Jacuzzi,Wellness,Jacuzzi,"Spa, Hot Tub, Whirlpool", -Equipment,PoolCover,Wellness,Pool Cover,,Swimming pool cover -Equipment,PoolHeater,Wellness,Pool Heater,,Swimming pool heater +Equipment,PoolCover,Wellness,Pool Cover,,Swimming or wellness pool cover +Equipment,PoolHeater,Wellness,Pool Heater,,Swimming or wellness pool heater Equipment,Sauna,Wellness,Sauna,Steam Room, Equipment,Shower,Wellness,Shower,, Equipment,SwimmingPool,Wellness,Swimming Pool,"Swimming Pool, Pool", 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 c7a73bd6b2c..27c15628904 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 @@ -1217,12 +1217,12 @@ public static class Equipment { public static final SemanticTag POOL_COVER = new SemanticTagImpl( // "Equipment_Wellness_PoolCover", // "Pool Cover", // - "Swimming pool cover", // + "Swimming or wellness pool cover", // ""); public static final SemanticTag POOL_HEATER = new SemanticTagImpl( // "Equipment_Wellness_PoolHeater", // "Pool Heater", // - "Swimming pool heater", // + "Swimming or wellness pool heater", // ""); public static final SemanticTag SAUNA = new SemanticTagImpl( // "Equipment_Wellness_Sauna", // From b94c25a5b847404bb393461aad3fb7794f986aee Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Mon, 12 May 2025 23:11:39 +0100 Subject: [PATCH 25/26] av receiver Signed-off-by: Andrew Fiddian-Green --- bundles/org.openhab.core.semantics/model/SemanticTags.csv | 2 +- .../org/openhab/core/semantics/model/DefaultSemanticTags.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.core.semantics/model/SemanticTags.csv b/bundles/org.openhab.core.semantics/model/SemanticTags.csv index 8a1f6e246fc..2e5b9327b50 100644 --- a/bundles/org.openhab.core.semantics/model/SemanticTags.csv +++ b/bundles/org.openhab.core.semantics/model/SemanticTags.csv @@ -112,7 +112,7 @@ Equipment,Display,AudioVisual,Display,,Visual display Equipment,Projector,Display,Projector,"Projectors, Beamer, Beamers",Projector Equipment,Television,Display,Television,"Televisions, TV, TVs",Television Equipment,MediaPlayer,AudioVisual,Media Player,,Media player -Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers", AV Receiver +Equipment,Receiver,AudioVisual,Receiver,"Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers","Audio-(visual) receiver, amplifier, tuner, sound processor" Equipment,Screen,AudioVisual,Screen,Screens,Visual display screen Equipment,Speaker,AudioVisual,Speaker,Speakers,Loud-speaker Equipment,Bed,,Bed,, 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 27c15628904..c8d6ed092b5 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 @@ -607,7 +607,7 @@ public static class Equipment { public static final SemanticTag RECEIVER = new SemanticTagImpl( // "Equipment_AudioVisual_Receiver", // "Receiver", // - " AV Receiver", // + "Audio-(visual) receiver, amplifier, tuner, sound processor", // "Receivers, Audio Receiver, Audio Receivers, AV Receiver, AV Receivers"); public static final SemanticTag SCREEN = new SemanticTagImpl( // "Equipment_AudioVisual_Screen", // From 5b97280188589c62a89df8f1da2fe159f5fae2f9 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Sun, 18 May 2025 16:20:31 +0100 Subject: [PATCH 26/26] rerun script Signed-off-by: Andrew Fiddian-Green --- .../src/main/resources/tags.properties | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) 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 c542f111502..526e2c41636 100644 --- a/bundles/org.openhab.core.semantics/src/main/resources/tags.properties +++ b/bundles/org.openhab.core.semantics/src/main/resources/tags.properties @@ -37,17 +37,28 @@ Location_Outdoor_Patio=Patio,Patios Location_Outdoor_Porch=Porch,Porches Location_Outdoor_Terrace=Terrace,Terraces,Deck,Decks Point_Alarm=Alarm +Point_Alarm__description=Read only data point indicating an alarm condition Point_Calculation=Calculation +Point_Calculation__description=Read only analog calculated data point Point_Control=Control +Point_Control__description=Read-Write analog data point Point_Control_Switch=Switch +Point_Control_Switch__description=Read-Write digital data point Point_Forecast=Forecast +Point_Forecast__description=Read only analog predicted data point Point_Measurement=Measurement +Point_Measurement__description=Read only analog data point from a sensor Point_Setpoint=Setpoint +Point_Setpoint__description=Read-Write analog data point for a controller Point_Status=Status +Point_Status__description=Read only data point indicating a status condition Property_AirQuality=Air Quality Property_AirQuality_AQI=AQI,Air Quality Index +Property_AirQuality_AQI__description=Air Quality Index Property_AirQuality_CO=CO,Carbon Monoxide +Property_AirQuality_CO__description=Carbon monoxide Property_AirQuality_CO2=CO2,Carbon Dioxide +Property_AirQuality_CO2__description=Carbon dioxide Property_AirQuality_Ozone=Ozone Property_AirQuality_ParticulateMatter=Particulate Matter,PM25 Property_AirQuality_Pollen=Pollen @@ -58,12 +69,18 @@ Property_Airflow=Airflow Property_App=App,Application Property_App__description=Software program Property_Brightness=Brightness +Property_Brightness__description=Brightness of a light source Property_Channel=Channel +Property_Channel__description=Media channel selection Property_Color=Color Property_ColorTemperature=Color Temperature +Property_ColorTemperature__description=Color temperature of a light source Property_Current=Current +Property_Current__description=Electric current Property_Duration=Duration +Property_Duration__description=Time duration Property_Enabled=Enabled +Property_Enabled__description=Enabled state Property_Energy=Energy Property_Frequency=Frequency Property_Gas=Gas @@ -71,22 +88,34 @@ Property_Heating=Heating Property_Humidity=Humidity Property_Illuminance=Illuminance Property_Info=Information +Property_Info__description=General information Property_Level=Level Property_Light=Light,Lights,Lighting +Property_Light__description=Control or status of a light Property_LowBattery=Low Battery +Property_LowBattery__description=Low battery indication Property_MediaControl=Media Control +Property_MediaControl__description=Audio- or visual- media control Property_Mode=Mode +Property_Mode__description=Operating mode Property_Moisture=Moisture Property_Motion=Motion +Property_Motion__description=Motion detected Property_Noise=Noise Property_Oil=Oil Property_Opening=Opening +Property_Opening__description=Opening of a door or window etc. Property_Opening_OpenLevel=Open Level +Property_Opening_OpenLevel__description=Open position (analog) of a door or window etc. Property_Opening_OpenState=Open State,Open Closed +Property_Opening_OpenState__description=Open state (digital) of a door or window etc. Property_Position=Position +Property_Position__description=Position measurement or control Property_Position_GeoLocation=Geo Location +Property_Position_GeoLocation__description=Geo location coordinate Property_Power=Power Property_Presence=Presence +Property_Presence__description=Presence detection Property_Pressure=Pressure Property_Progress=Progress Property_QualityOfService=Quality of Service @@ -94,39 +123,58 @@ Property_Rain=Rain Property_SignalStrength=Signal Strength Property_SignalStrength_RSSI=RSSI,Received Signal Strength Indication Property_Smoke=Smoke +Property_Smoke__description=Smoke detection Property_SoundVolume=Sound Volume +Property_SoundVolume__description=Sound volume level Property_Speed=Speed Property_Tampered=Tampered +Property_Tampered__description=Tampering detected Property_Temperature=Temperature,Temperatures Property_Tilt=Tilt +Property_Tilt__description=Tilt of a blind, shade or shutter Property_Timestamp=Timestamp +Property_Timestamp__description=Timestamp of an event Property_Ultraviolet=Ultraviolet,UV Property_Ventilation=Ventilation Property_Vibration=Vibration Property_Voltage=Voltage Property_Water=Water Property_Wind=Wind +Property_Wind__description=Wind speed or direction Equipment_AlarmDevice=Alarm Device Equipment_AlarmSystem=Alarm System,Alarm Systems Equipment_Application=Application,App,Software program +Equipment_Application__description=Software program Equipment_AudioVisual=Audio Visual +Equipment_AudioVisual__description=Audio visual device Equipment_AudioVisual_Display=Display +Equipment_AudioVisual_Display__description=Visual display Equipment_AudioVisual_Display_Projector=Projector,Projectors,Beamer,Beamers +Equipment_AudioVisual_Display_Projector__description=Projector Equipment_AudioVisual_Display_Television=Television,Televisions,TV,TVs +Equipment_AudioVisual_Display_Television__description=Television Equipment_AudioVisual_MediaPlayer=Media Player +Equipment_AudioVisual_MediaPlayer__description=Media player Equipment_AudioVisual_Receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers +Equipment_AudioVisual_Receiver__description=Audio-(visual) receiver, amplifier, tuner, sound processor Equipment_AudioVisual_Screen=Screen,Screens +Equipment_AudioVisual_Screen__description=Visual display screen Equipment_AudioVisual_Speaker=Speaker,Speakers +Equipment_AudioVisual_Speaker__description=Loud-speaker Equipment_Bed=Bed Equipment_Camera=Camera,Cameras Equipment_CleaningRobot=Cleaning Robot,Cleaning Robots,Vacuum robot,Vacuum robots Equipment_Computer=Computer Equipment_ControlDevice=Control Device Equipment_ControlDevice_Button=Button +Equipment_ControlDevice_Button__description=Push or touch button Equipment_ControlDevice_Dial=Dial,Rotary Dial +Equipment_ControlDevice_Dial__description=Rotary dial Equipment_ControlDevice_Keypad=Keypad Equipment_ControlDevice_Slider=Slider +Equipment_ControlDevice_Slider__description=Slider control Equipment_ControlDevice_WallSwitch=Wall Switch,Wall Switches +Equipment_ControlDevice_WallSwitch__description=Wall switch Equipment_Door=Door,Doors Equipment_Door_BackDoor=Back Door,Back Doors Equipment_Door_CellarDoor=Cellar Door,Cellar Doors @@ -138,9 +186,11 @@ Equipment_Door_SideDoor=Side Door,Side Doors Equipment_Doorbell=Doorbell,Doorbells Equipment_DrinkingWater=Drinking Water,Potable Water Equipment_DrinkingWater_HotWaterFaucet=Hot Water Faucet,Hot Water Tap,Boiling Water Tap,Boiling Water Faucet +Equipment_DrinkingWater_HotWaterFaucet__description=Hot water faucet or tap Equipment_DrinkingWater_WaterFilter=Water Filter Equipment_DrinkingWater_WaterSoftener=Water Softener Equipment_HVAC=HVAC,Heating,Ventilation,Air Conditioning,A/C,A/Cs,AC +Equipment_HVAC__description=Heating, Ventilation or AirConditioning Equipment_HVAC_AirConditioner=Air Conditioner Equipment_HVAC_AirFilter=Air Filter Equipment_HVAC_Boiler=Boiler,Boilers @@ -156,6 +206,7 @@ Equipment_HVAC_HeatRecovery=Heat Recovery,Energy Recovery Equipment_HVAC_Humidifier=Humidifier Equipment_HVAC_RadiatorControl=Radiator Control,Radiator Controls,Radiator,Radiators Equipment_HVAC_SmartVent=Smart Vent +Equipment_HVAC_SmartVent__description=Smart ventilation device Equipment_HVAC_Thermostat=Thermostat Equipment_HVAC_WaterHeater=Water Heater,Water Boiler Equipment_Horticulture=Horticulture @@ -172,7 +223,9 @@ Equipment_LightSource_LightStrip=Light Strip,LED Strip Equipment_LightSource_LightStripe=Light Stripe,Light Stripes Equipment_LightSource_Lightbulb=Light Bulb,Lightbulbs,Bulb,Bulbs,Lamp,Lamps Equipment_LightSource_Pendant=Pendant +Equipment_LightSource_Pendant__description=Pendant light Equipment_LightSource_Sconce=Sconce +Equipment_LightSource_Sconce__description=Sconce light Equipment_LightSource_SpotLight=Spot Light Equipment_LightSource_TrackLight=Track Light Equipment_LightSource_WallLight=Wall Light @@ -191,9 +244,12 @@ Equipment_PowerSupply=Power Supply Equipment_PowerSupply_Battery=Battery,Batteries Equipment_PowerSupply_EVSE=Electric Vehicle Supply Equipment,EV Charger,Car Charger Equipment_PowerSupply_Generator=Generator,Emergency Generator +Equipment_PowerSupply_Generator__description=Electricity generator Equipment_PowerSupply_Inverter=Inverter,Inverters +Equipment_PowerSupply_Inverter__description=Electrical power inverter Equipment_PowerSupply_SolarPanel=Solar Panel Equipment_PowerSupply_TransferSwitch=Transfer Switch +Equipment_PowerSupply_TransferSwitch__description=Electricity transfer switch Equipment_PowerSupply_UPS=UPS,Uninterruptible Power Supply Equipment_PowerSupply_WindGenerator=Wind Generator,Wind Turbine Equipment_Printer=Printer @@ -201,6 +257,7 @@ Equipment_Printer_Printer3D=3D Printer Equipment_Pump=Pump,Pumps Equipment_Pump_WaterFeature=Water Feature,Waterfall,Pond Pump Equipment_RemoteControl=Remote Control,Remote Controls +Equipment_RemoteControl__description=Remote control device Equipment_Sensor=Sensor,Sensors Equipment_Sensor_AirQualitySensor=Air Quality Sensor Equipment_Sensor_CO2Sensor=CO2 Sensor @@ -224,9 +281,12 @@ Equipment_Sensor_WaterMeter=Water Meter Equipment_Sensor_WaterQualitySensor=Water Quality Sensor Equipment_Sensor_WeatherStation=Weather Station Equipment_Siren=Siren,Sirens +Equipment_Siren__description=Alarm siren Equipment_Smartphone=Smartphone,Smartphones,Phone,Phones Equipment_Tool=Tool +Equipment_Tool__description=Hand- or machine- tool Equipment_Tracker=Tracker +Equipment_Tracker__description=Location tracker Equipment_Valve=Valve,Valves Equipment_Vehicle=Vehicle Equipment_Vehicle_Car=Car @@ -235,32 +295,46 @@ Equipment_WebService=Web Service,Web Services Equipment_WebService_WeatherService=Weather Service,Weather Services Equipment_Wellness=Wellness Equipment_Wellness_Chlorinator=Chlorinator +Equipment_Wellness_Chlorinator__description=Water chlorinator Equipment_Wellness_Jacuzzi=Jacuzzi,Spa,Hot Tub,Whirlpool Equipment_Wellness_PoolCover=Pool Cover +Equipment_Wellness_PoolCover__description=Swimming or wellness pool cover Equipment_Wellness_PoolHeater=Pool Heater +Equipment_Wellness_PoolHeater__description=Swimming or wellness pool heater Equipment_Wellness_Sauna=Sauna,Steam Room Equipment_Wellness_Shower=Shower Equipment_Wellness_SwimmingPool=Swimming Pool,Swimming Pool,Pool Equipment_WhiteGood=White Good,White Goods +Equipment_WhiteGood__description=White goods appliance Equipment_WhiteGood_AirFryer=Air Fryer Equipment_WhiteGood_CoffeeMaker=Coffee Maker,Coffee Makers,Coffee Machine,Coffee Machines Equipment_WhiteGood_Cooktop=Cooktop,Hob +Equipment_WhiteGood_Cooktop__description=Cooktop appliance Equipment_WhiteGood_Dishwasher=Dishwasher,Dishwashers Equipment_WhiteGood_Dryer=Dryer,Dryers,Tumble Dryer,Tumble Dryers +Equipment_WhiteGood_Dryer__description=Laundry (tumble) dryer Equipment_WhiteGood_FoodProcessor=Food Processor Equipment_WhiteGood_Freezer=Freezer,Freezers Equipment_WhiteGood_Fryer=Fryer +Equipment_WhiteGood_Fryer__description=Deep fryer Equipment_WhiteGood_IceMaker=Ice Maker Equipment_WhiteGood_Microwave=Microwave +Equipment_WhiteGood_Microwave__description=Microwave cooker Equipment_WhiteGood_Mixer=Mixer +Equipment_WhiteGood_Mixer__description=Food mixer Equipment_WhiteGood_Oven=Oven,Ovens Equipment_WhiteGood_Range=Range +Equipment_WhiteGood_Range__description=Kitchen range Equipment_WhiteGood_Refrigerator=Refrigerator,Refrigerators 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_Blinds__description=Window blinds, shades or shutters Equipment_WindowCovering_Drapes=Drapes,Curtains +Equipment_WindowCovering_Drapes__description=Curtains or drapes Equipment_Zone=Zone +Equipment_Zone__description=Equipment zone Equipment_Zone_AlarmZone=Alarm Zone +Equipment_Zone_AlarmZone__description=Security alarm zone