Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new sensor & meters #1092

Merged
merged 36 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
55bb821
new sensor, new fields, soundintensitylevel subfield
adelin-diac Jul 21, 2023
bf1dfe4
water meter
adelin-diac Jul 21, 2023
b417cfa
typo
adelin-diac Jul 21, 2023
385c719
move extra fields into optional values of previous type
adelin-diac Jul 21, 2023
ce42958
occupancy sensor
adelin-diac Jul 21, 2023
698b70d
Merge branch 'master' into ash-new-meters-&-sensors
cstirdivant Jul 24, 2023
9e1b5ca
Merge remote-tracking branch 'upstream/master' into ash-new-meters-&-…
adelin-diac Jul 25, 2023
8f19b3e
update soundintensitylevel to pressure
adelin-diac Jul 25, 2023
47b4be9
fixed based off feedback
adelin-diac Jul 25, 2023
2577f7e
Merge remote-tracking branch 'upstream/master' into ash-new-meters-&-…
adelin-diac Aug 2, 2023
3945674
added temperature to occupancy count sensor
adelin-diac Aug 14, 2023
7970c54
new indoor sensor
adelin-diac Aug 14, 2023
f597b4f
co monitoring
adelin-diac Aug 14, 2023
8213488
completed fields for new sensor
adelin-diac Aug 14, 2023
b0dcc09
fix field states
adelin-diac Aug 14, 2023
8e4c882
complete entity type name
adelin-diac Aug 14, 2023
19c08c5
fix smoke range
adelin-diac Aug 15, 2023
d77b06b
Merge remote-tracking branch 'upstream/master' into ash-new-meters-&-…
adelin-diac Aug 21, 2023
fc05e62
Update ABSTRACT.yaml
adelin-diac Aug 21, 2023
a8f1ea7
fix auto formatter
adelin-diac Aug 21, 2023
6412c66
more auto formatting fixes
adelin-diac Aug 21, 2023
2782b87
Update telemetry_fields.yaml
adelin-diac Aug 21, 2023
4283127
add occupancy counter sensor
adelin-diac Aug 21, 2023
5138f33
added an abstract type for zone aqi indexes
adelin-diac Aug 21, 2023
dfed75e
Merge branch 'google:master' into ash-new-meters-&-sensors
adelin-diac Aug 22, 2023
2267006
added new aqi unit
adelin-diac Aug 22, 2023
8ae8957
Merge branch 'master' into ash-new-meters-&-sensors
cstirdivant Aug 23, 2023
249acc8
changes based on feedback
adelin-diac Aug 24, 2023
f5fd090
Update SENSOR.yaml
adelin-diac Aug 24, 2023
5301232
Update ABSTRACT.yaml
adelin-diac Aug 24, 2023
c8196c6
update forgotten abstract types
adelin-diac Aug 24, 2023
b4f6339
removed mistake
adelin-diac Aug 30, 2023
b704712
Merge branch 'master' into ash-new-meters-&-sensors
kevin-hereworks Sep 26, 2023
0d88e47
Merge branch 'master' into ash-new-meters-&-sensors
kevin-hereworks Oct 3, 2023
8b24153
Merge branch 'master' into ash-new-meters-&-sensors
kevin-hereworks Oct 4, 2023
721e4a0
Merge branch 'master' into ash-new-meters-&-sensors
cstirdivant Oct 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -6804,4 +6811,30 @@ VSMC:
opt_uses:
- low_speed_status
- high_speed_status
- schedule_run_command
- schedule_run_command

ZOC:
description: "Occupancy counter monitoring"
is_abstract: true
uses:
- zone_occupant_counter
adelin-diac marked this conversation as resolved.
Show resolved Hide resolved
implements:
- MONITORING

SPLM:
description: "Sound pressure level monitoring"
is_abstract: true
uses:
- soundpressurelevel_sensor
implements:
- MONITORING

ZAQI:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this ZAQIM please

description: "Zone air quality indexes monitoring"
is_abstract: true
uses:
- zone_air_aqi_sensor
- zone_air_voc_aqi_sensor
adelin-diac marked this conversation as resolved.
Show resolved Hide resolved
- zone_air_smoke_aqi_sensor
implements:
- MONITORING
63 changes: 63 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/SENSOR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,66 @@ 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_PML_SPLM:
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
- SPLM
uses:
- zone_air_aqi_sensor
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implement your newly-created type ZAQIM and remove this field

- illuminance_sensor
- zone_air_pm2pt5_density_sensor
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
- zone_air_pm10pt0_density_sensor

SENSOR_ZTM_ZHM_CO2M_VOCM_PML:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
description: "Indoor Air Quality sensor with temperature, humidity, CO2, VOC, particulates (density) monitoring."
is_canonical: true
implements:
- /SENSOR
- ZTM
- ZHM
- CO2M
- VOCM
uses:
- zone_air_pm2pt5_density_sensor
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
- zone_air_pm10pt0_density_sensor

SENSOR_ZTM_ZHM_CO2M_SPLM_PLM_COM_ZSPM_MS_ZAQI_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."
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
is_canonical: true
implements:
- /SENSOR
- ZTM
- ZHM
- CO2M
- SPLM
- COM
- ZSPM
uses:
- illuminance_sensor
- zone_air_pm2pt5_density_sensor
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
- zone_air_formaldehyde_concentration_sensor
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
- motion_status
- tamper_status

SENSOR_ZOC:
description: "Zone occupant counter sensor."
is_canonical: true
implements:
- /SENSOR
- ZOC
21 changes: 21 additions & 0 deletions ontology/yaml/resources/fields/telemetry_fields.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3182,3 +3182,24 @@ literals:
- low_discharge_air_static_pressure_alarm:
- ACTIVE
- INACTIVE

- soundpressurelevel_sensor:
fixed_min: -60
flexible_max: 200

- zone_occupant_counter:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
fixed_min: 0
flexible_max: 1000

- zone_air_voc_aqi_sensor:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
fixed_min: 0
flexible_max: 500

- zone_air_smoke_aqi_sensor:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
fixed_min: 0
flexible_max: 80

- tamper_status:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
- ON
- OFF

3 changes: 3 additions & 0 deletions ontology/yaml/resources/subfields/subfields.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ descriptor:
no2: "Nitrogen dioxide."
north: "Cardinal direction; opposite of south"
occupancy: "State of being occupied."
occupant: "A person who occupies a space."
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
occupied: "State of being within scheduled (time of day or week) run-time parameters."
oil: "A viscous liquid derived from petroleum, especially for use as a fuel or lubricant."
ongoing: "Hapenning currently, right now."
Expand Down Expand Up @@ -237,6 +238,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.)."
Expand Down Expand Up @@ -312,6 +314,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."
Expand Down
5 changes: 5 additions & 0 deletions ontology/yaml/resources/units/units.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -429,6 +432,8 @@ resistance:
offset: 0
rotationalvelocity:
revolutions_per_minute: STANDARD
soundpressurelevel:
decibels: STANDARD
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
specificenergy:
joules_per_kilogram_kelvin: STANDARD
specificenthalpy:
Expand Down