New GEN type and small WM update

ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml

@@ -111,6 +111,20 @@ PPWM:
   - phase3_apparent_power_sensor
   - line_frequency_sensor
 
+PVCM:
+  guid: "3f5453f5-4b8f-4d62-bd40-ede73d15ccb1"
+  description: "Phase-level current and voltage monitoring."
+  is_abstract: true
+  implements:
+  - /PVCM
+
+AVCM:
+  guid: "9404e6db-62e4-4dab-8540-28a94d1a8890"
+  description: "Average phase (line) level voltage and current monitoring. "
+  is_abstract: true
+  implements:
+  - /AVCM
+
 BATM:
   guid: "445a7a7f-9da2-4b56-99cd-9890cdf6fea1"
   description: "Battery charge and voltage monitoring, typically used with UPS"
@@ -191,3 +205,10 @@ SPM:
   - switch_position_status
   - line_power_status
   - emergency_power_status
+
+MRVM:
+  guid: "0e44f0f0-abf0-4ce5-817a-6fe5aa2c3b12"
+  description: "Rotational velocity monitoring for motors."
+  is_abstract: true
+  uses:
+  - motor_rotationalvelocity_sensor

ontology/yaml/resources/ELECTRICAL/entity_types/GEN.yaml

@@ -25,3 +25,17 @@ GEN_SS_TKLS_OTPM_PWM_RDM_BTEPM:
   - PWM
   - RDM
   - BTEPM
+
+GEN_SS_OTPM_RDM_BTEPM_PVCM_AVCM_MRVM:
+  guid: "8869bf68-9455-44a4-9af9-f3385f7f6d72"
+  description: "Generator with oil temperature and pressure monitoring, motor rpm monitoring, battery and system electrical parameter monitoring, and run duration monitoring."
+  is_canonical: true
+  implements:
+  - GEN
+  - SS
+  - OTPM
+  - RDM
+  - BTEPM
+  - PVCM
+  - AVCM
+  - MRVM

ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml

@@ -42,10 +42,8 @@ AVCM:
   guid: "0329a2b4-d474-444e-82af-c6c0432a9f48"
   description: "Average phase (line) level voltage and current monitoring. "
   is_abstract: true
-  uses:
-  - average_inter_line_voltage_sensor # Line to line
-  - average_line_neutral_voltage_sensor
-  - average_line_current_sensor
+  implements:
+  - /AVCM
 
 PLPM:
   guid: "2007bb49-2824-4e76-8c8c-772d9204bcc2"
@@ -70,18 +68,8 @@ PVCM:
   guid: "97b8b9c1-21dd-4201-9424-c776e28de758"
   description: "Phase-level current and voltage monitoring."
   is_abstract: true
-  opt_uses:
-  - neutral_line_current_sensor
-  uses:
-  - phase1_line_current_sensor
-  - phase2_line_current_sensor
-  - phase3_line_current_sensor
-  - phase1_phase2_line_voltage_sensor
-  - phase1_phase3_line_voltage_sensor
-  - phase2_phase3_line_voltage_sensor
-  - phase1_neutral_line_voltage_sensor
-  - phase2_neutral_line_voltage_sensor
-  - phase3_neutral_line_voltage_sensor
+  implements:
+  - /PVCM
 
 PWMRDM:
   guid: "4bfb27f6-0a27-48d9-8830-81c84d95c8ab"
@@ -115,4 +103,4 @@ GFM:
   is_abstract: true
   uses:
   - gas_flowrate_sensor
-  - gas_volume_accumulator
+  - gas_volume_accumulator

ontology/yaml/resources/METERS/entity_types/WM.yaml

@@ -23,6 +23,7 @@ WM_STANDARD:
   opt_uses:
   - failed_alarm
   - flowrate_sensor
+  - water_temperature_sensor
 
 WM_WF:
   guid: "df942136-4b98-4da7-9e68-acc210d6cf03"
@@ -80,4 +81,4 @@ WM_LM:
   implements:
   - WM
   uses:
-  - water_level_sensor
+  - water_level_sensor

ontology/yaml/resources/entity_types/ABSTRACT.yaml

@@ -85,3 +85,29 @@ REFM:
   - failed_zone_air_refrigerant_concentration_alarm
   uses:
   - zone_air_refrigerant_concentration_sensor
+
+PVCM:
+  guid: "063dcf60-d3e6-41c0-8de7-cac052f336cb"
+  description: "Phase-level current and voltage monitoring."
+  is_abstract: true
+  opt_uses:
+  - neutral_line_current_sensor
+  uses:
+  - phase1_line_current_sensor
+  - phase2_line_current_sensor
+  - phase3_line_current_sensor
+  - phase1_phase2_line_voltage_sensor
+  - phase1_phase3_line_voltage_sensor
+  - phase2_phase3_line_voltage_sensor
+  - phase1_neutral_line_voltage_sensor
+  - phase2_neutral_line_voltage_sensor
+  - phase3_neutral_line_voltage_sensor
+
+AVCM:
+  guid: "f169eb11-5cbe-4c6a-8e09-3272926b52bb"
+  description: "Average phase (line) level voltage and current monitoring. "
+  is_abstract: true
+  uses:
+  - average_inter_line_voltage_sensor # Line to line
+  - average_line_neutral_voltage_sensor
+  - average_line_current_sensor