From f671230d0c8c4ad4560ab8d3618c724d3e923d04 Mon Sep 17 00:00:00 2001
From: Darshan <jain.darshan64@gmail.com>
Date: Tue, 15 Oct 2024 12:52:31 +0530
Subject: [PATCH] Changing as per recent comments

i. Added SFVSC4X optional points as suggested.
ii. Changed SFSS to SFSS4X
iii. Changed SFVSC to SFVSC4X
iv. Removed SF4FM
---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 48 +++++++------------
 .../yaml/resources/HVAC/entity_types/AHU.yaml |  7 ++-
 2 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 99dd87a43..b20c27689 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -4810,10 +4810,22 @@ SFVSC4X:
   - supply_fan_current_sensor_2
   - supply_fan_current_sensor_3
   - supply_fan_current_sensor_4
+  - supply_fan_voltage_sensor_1
+  - supply_fan_voltage_sensor_2
+  - supply_fan_voltage_sensor_3
+  - supply_fan_voltage_sensor_4
   - supply_fan_power_sensor_1
   - supply_fan_power_sensor_2
   - supply_fan_power_sensor_3
   - supply_fan_power_sensor_4
+  - supply_fan_energy_accumulator_1
+  - supply_fan_energy_accumulator_2
+  - supply_fan_energy_accumulator_3
+  - supply_fan_energy_accumulator_4
+  - supply_fan_run_time_accumulator_1
+  - supply_fan_run_time_accumulator_2
+  - supply_fan_run_time_accumulator_3
+  - supply_fan_run_time_accumulator_4
   - supply_fan_speed_frequency_sensor_1
   - supply_fan_speed_frequency_sensor_2
   - supply_fan_speed_frequency_sensor_3
@@ -4822,6 +4834,10 @@ SFVSC4X:
   - supply_fan_speed_percentage_sensor_2
   - supply_fan_speed_percentage_sensor_3
   - supply_fan_speed_percentage_sensor_4
+  - supply_fan_rotationalvelocity_sensor_1
+  - supply_fan_rotationalvelocity_sensor_2
+  - supply_fan_rotationalvelocity_sensor_3
+  - supply_fan_rotationalvelocity_sensor_4
   uses:
   - supply_fan_run_command_1
   - supply_fan_run_command_2
@@ -8457,38 +8473,6 @@ DTPM:
   implements:
   - MONITOR
   
-SF4M:
-  guid: "463a36e9-778f-4df4-b513-1b5a9cd60eb3"
-  description: "Four EC Fan parameter Monitoring."
-  is_abstract: true
-  uses:
-  - supply_fan_energy_accumulator_1
-  - supply_fan_power_sensor_1
-  - supply_fan_voltage_sensor_1
-  - supply_fan_current_sensor_1
-  - supply_fan_rotationalvelocity_sensor_1
-  - supply_fan_run_time_accumulator_1
-  - supply_fan_energy_accumulator_2
-  - supply_fan_power_sensor_2
-  - supply_fan_voltage_sensor_2
-  - supply_fan_current_sensor_2
-  - supply_fan_rotationalvelocity_sensor_2
-  - supply_fan_run_time_accumulator_2
-  - supply_fan_energy_accumulator_3
-  - supply_fan_power_sensor_3
-  - supply_fan_voltage_sensor_3
-  - supply_fan_current_sensor_3
-  - supply_fan_rotationalvelocity_sensor_3
-  - supply_fan_run_time_accumulator_3
-  - supply_fan_energy_accumulator_4
-  - supply_fan_power_sensor_4
-  - supply_fan_voltage_sensor_4
-  - supply_fan_current_sensor_4
-  - supply_fan_rotationalvelocity_sensor_4
-  - supply_fan_run_time_accumulator_4
-  implements:
-  - MONITORING
-=======
 CFVSC:
   guid: "b4aa442f-e7fa-4bc6-811a-fe2925e7255f"
   description: "Variable speed control for condensing fan."
diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index 09a14bb36..822f513f4 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4620,18 +4620,17 @@ AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS_SFVSC_SSPC_SARC:
   - SSPC
   - SARC
 
-AHU_SFSS_SFVSC_CHWRC_SSPC_FDPSM_SF4FM::
+AHU_SFSS4X_SFVSC4X_CHWRC_SSPC_FDPSM::
   guid: "9307679c-0d7b-4d41-a36c-a02e99e7e25e"
   description: "AHU with static pressure-based EC fan speed control, return air temperature-based chilled water valve modulation, filter status monitoring, and four EC fan parameter monitoring."
   is_canonical: true
   implements:
   - AHU
-  - SFSS
-  - SFVSC
+  - SFSS4X
+  - SFVSC4X
   - CHWRC
   - SSPC
   - FDPSM
-  - SF4M
 
 ###################################
 ### Existing Non-standard Types ###