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.

Sign up for GitHub

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

Jump to bottom

New LGRP type #1301

Merged
merged 9 commits into from
May 16, 2024
Merged

New LGRP type #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6049a7c
Changes on Lighting Group
bsaxpi Mar 26, 2024
27ff550
additional subfield
bsaxpi Mar 26, 2024
5dc0ad6
Correct entity type name
bsaxpi Mar 26, 2024
49119f1
Clarifications / Changes
bsaxpi Mar 27, 2024
6e19f0a
Merge branch 'master' into master
cstirdivant Apr 23, 2024
dd06352
Removed "LC_" on "LC_AVIC"
bsaxpi Apr 26, 2024
d69bec5
Removed "LC_" on "LC_AVIC"
bsaxpi Apr 26, 2024
09282b6
Update LGRP.yaml
bsaxpi Apr 26, 2024
7a1757b
Merge branch 'master' into master
cstirdivant May 16, 2024
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
12 changes: 12 additions & 0 deletions ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ DC:
uses:
- brightness_percentage_command

AWIC:
guid: "58b91ab7-a475-4800-bf15-f918fa95f829"
description: "Luminance control with separate aisle and window brightness command."
is_abstract: true
opt_uses:
- brightness_percentage_sensor
uses:
- illuminance_sensor
- illuminance_setpoint
- aisle_brightness_percentage_command
- window_brightness_percentage_command

MS:
guid: "d5244d01-e5e9-4592-8c76-bf3a7e196a28"
description: "Motion sensing monitoring."
Expand Down
10 changes: 10 additions & 0 deletions ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,3 +308,13 @@ LGRP_SS_OS_IM:
uses:
- group_mode

LGRP_OS_AWIC:
guid: "ac5f1146-2734-44f8-b3d1-99e4226fc72a"
description: "Standard lighting fixture group control with zone occupancy montoring and luminance control"
is_canonical: true
implements:
- LGRP
- OS
- AWIC
uses:
- group_mode
6 changes: 6 additions & 0 deletions ontology/yaml/resources/fields/telemetry_fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,12 @@ literals:
- dimmer_percentage_command: # Should be adjusted to brightness_percentage_command
fixed_min: 0.0
fixed_max: 100.0
- aisle_brightness_percentage_command:
cstirdivant marked this conversation as resolved.
Show resolved Hide resolved
fixed_min: 0.0
fixed_max: 100.0
- window_brightness_percentage_command:
fixed_min: 0.0
fixed_max: 100.0
- calendar_sync_status:
- ACCESS_FAILED
- CALENDAR_STARTUP
Expand Down
3 changes: 2 additions & 1 deletion ontology/yaml/resources/subfields/subfields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ descriptor:
water: "Water in liquid form, conditioned or unconditioned."
west: "Cardinal direction; opposite of east"
wind: "Movement of ambient air."
winter: "Method or process used during colder weather (i.e., winter season)."
window: "Transparent part of the facade"
winter: "Method or process used during colder weather (i.e. winter season)."
wireless: "Devices capable of communication wirelessly through electromagnetic fields.(e.g., wireless_sensors)."
xaxis: "Horizontal axis of a three-dimensional Cartesian coordinate system (i.e., abscissa)."
yaxis: "Horizontal axis of a three-dimensional Cartesian coordinate system (i.e., ordinate)."
Expand Down
Loading