Merge pull request #1301 from bsaxpi/master

New LGRP type
google · May 16, 2024 · c68a38c · c68a38c
2 parents 602fecd + 7a1757b
commit c68a38c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/LIGHTING/entity_types/ABSTRACT.yaml
@@ -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."

diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml
@@ -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
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -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:
+    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

diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml
@@ -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)."