fixed coulomb conversion, added PLPM

google · Jul 25, 2023 · 98b27c8 · 98b27c8
1 parent cdbac1b
commit 98b27c8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml
@@ -124,16 +124,25 @@ PPWM:
   guid: "aab62bba-a92f-47bf-bf14-dcb8e61ac7a8"
   description: "Phase power monitoring"
   is_abstract: true
-  opt_uses:
-  - phase1_power_sensor
-  - phase2_power_sensor
-  - phase3_power_sensor
   uses:
   - phase1_apparent_power_sensor
   - phase2_apparent_power_sensor
   - phase3_apparent_power_sensor
   - line_frequency_sensor 
 
+PLPM:
+  description: "Phase level power monitoring"
+  is_abstract: true
+  opt_uses:
+  - phase1_apparent_power_sensor
+  - phase2_apparent_power_sensor
+  - phase3_apparent_power_sensor
+  - line_frequency_sensor 
+  uses:
+  - phase1_power_sensor
+  - phase2_power_sensor
+  - phase3_power_sensor
+
 BATM:
   guid: "445a7a7f-9da2-4b56-99cd-9890cdf6fea1"
   description: "Battery typically used with UPS"

diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/UPS.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/UPS.yaml
@@ -84,11 +84,11 @@ UPS_SS_UPSBM:
   - SS
   - UPSBM
 
-UPS_PPWM_OM_BATM:
+UPS_PLPM_OM_BATM:
   description: "UPS with battery and power monitoring."
   is_canonical: true
   implements:
   - UPS
-  - PPWM
+  - PLPM
   - OM
   - BATM
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -3131,7 +3131,7 @@ literals:
 
 - electriccharge_sensor:
     fixed_min: 0.0
-    flexible_max: 10000.0
+    flexible_max: 27777.77778
 
 - purge_command:
   - ON