Merge pull request #1092 from adelin-diac/ash-new-meters-&-sensors

new sensor & meters

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -329,6 +329,13 @@ COC:
   opt_uses:
   - high_zone_air_co_concentration_alarm
 
+COM:
+  description: "Carbon monoxide monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - zone_air_co_concentration_sensor
 
 BPC:
   guid: "8199ef48-de0b-4112-bf7a-15876a4acaff"
@@ -1484,6 +1491,8 @@ VOCM:
   is_abstract: true
   uses:
   - zone_air_voc_concentration_sensor
+  opt_uses:
+  - zone_air_formaldehyde_concentration_sensor
   implements:
   - MONITORING
 
@@ -6839,3 +6848,39 @@ VSMC:
   - high_speed_status
   - schedule_run_command
 
+ZOC:
+  description: "Occupancy counter monitoring"
+  is_abstract: true
+  uses:
+  - zone_occupancy_count
+  implements:
+  - MONITORING
+
+SPLM:
+  description: "Sound pressure level monitoring"
+  is_abstract: true
+  uses:
+  - soundpressurelevel_sensor
+  implements:
+  - MONITORING
+
+ZAQIM:
+  description: "Zone air quality indexes monitoring"
+  is_abstract: true
+  uses:
+  - zone_air_aqi_sensor
+  opt_uses:
+  - zone_air_voc_aqi_sensor
+  - zone_air_smoke_aqi_sensor
+  implements:
+  - MONITORING  
+
+PMDM:
+  description: "Particulate matter density monitoring"
+  is_abstract: true
+  uses:
+  - zone_air_pm2pt5_density_sensor
+  - zone_air_pm10pt0_density_sensor
+  implements:
+  - MONITORING
+

ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml

@@ -255,3 +255,64 @@ SENSOR_ZTM_ZHM_CO2M_VOCM_PMM:
   - CO2M
   - VOCM
   - PMM
+
+SENSOR_ZTM_ZHM_ZOC:
+  description: "Zone occupant counter with zone temperature & humidity monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - ZTM
+  - ZHM
+  - ZOC
+
+SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM_SPLM_ZAQIM:
+  description: "Indoor Air Quality sensor with temperature, humidity, CO2, VOC, particulates (density), illuminance and sound monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - ZTM
+  - ZHM
+  - CO2M
+  - VOCM
+  - PMDM
+  - SPLM
+  - ZAQIM
+  uses:
+  - illuminance_sensor
+
+SENSOR_ZTM_ZHM_CO2M_VOCM_PMDM:
+  description: "Indoor Air Quality sensor with temperature, humidity, CO2, VOC, particulates (density) monitoring."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - ZTM
+  - ZHM
+  - CO2M
+  - VOCM
+  - PMDM
+
+SENSOR_ZTM_ZHM_CO2M_SPLM_PMDM_COM_ZSPM_VOCM_ZAQIM_MS_TMPR:
+  description: "Indoor Air Quality sensor with temperature, humidity, CO2, CO, sound, particulates (density), illuminance, formaldehyde, pressure sensors with air quality, vape, TVOC indexes and motion & tamper detection."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - ZTM
+  - ZHM
+  - CO2M
+  - SPLM
+  - PMDM
+  - COM
+  - ZSPM
+  - VOCM
+  - ZAQIM
+  uses:
+  - illuminance_sensor
+  - motion_status
+  - tamper_alarm
+
+SENSOR_ZOC:
+  description: "Zone occupant counter sensor."
+  is_canonical: true
+  implements:
+  - /SENSOR
+  - ZOC

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -3193,3 +3193,23 @@ literals:
   - ACTIVE
   - INACTIVE
 
+- soundpressurelevel_sensor:
+    fixed_min: -60
+    flexible_max: 200
+
+- zone_occupancy_count:
+    fixed_min: 0
+    flexible_max: 1000
+
+- zone_air_voc_aqi_sensor:
+    fixed_min: 0
+    flexible_max: 500
+
+- zone_air_smoke_aqi_sensor:
+    fixed_min: 0
+    flexible_max: 80
+
+- tamper_alarm:
+  - ACTIVE
+  - INACTIVE
+

ontology/yaml/resources/subfields/subfields.yaml

@@ -237,6 +237,7 @@ descriptor:
   standby: "A state of waiting to secure an unreserved place for a journey or performance, allocated on the basis of earliest availability."
   sweeper: "Action performed in a sump to prevent sediment build-up via water turbulence."
   sync: "The simultaneous operation or activity of two or more things."
+  tamper: "To interfere with (something, eg. a device) in order to cause damage or make unauthorized alterations."
   tertiary: "Associated with the tertiary (peripheral) loops of a production process."
   totaldissolvedsolids: "Total dissolved solids (TDS) is the amount of minerals, metals, organic material and salts that are dissolved in a certain water volume."
   transducer: "A device that converts energy from one form to another (e.g., sound energy to electrical energy in a microphone, electrical energy to sound energy in a speaker, etc.)."
@@ -312,6 +313,7 @@ measurement:
   rotationalvelocity: "Vector measure of rotation rate, that refers to how fast an object rotates or revolves relative to another point."
   specificenergy: "Energy per unit mass."
   specificenthalpy: "Measure of energy of air per unit mass."
+  soundpressurelevel: "Logarithmic measure of the sound intensity in comparison to a reference value (1e10-12 W/m^2)."
   temperature: "Measures the temperature of media within a process or system."
   thermalconductivity: "Measure of a material's ability to conduct heat."
   thermalcapacity: "Amount of heat to be supplied to an object to produce a unit change in its temperature."

ontology/yaml/resources/units/units.yaml

@@ -38,6 +38,9 @@ aqi:
   uba: # Umwelt Bundesamt, German air quality standard
     multiplier: 1
     offset: 0
+  awair: # Awair Air Quality Score
+    multiplier: 1
+    offset: 0
 area:
   square_meters: STANDARD
   square_centimeters:
@@ -429,6 +432,8 @@ resistance:
     offset: 0
 rotationalvelocity:
   revolutions_per_minute: STANDARD
+soundpressurelevel:
+  decibels: STANDARD
 specificenergy:
   joules_per_kilogram_kelvin: STANDARD
 specificenthalpy: