Merge pull request #1384 from terryterpt/tpke_v1

create new types for taiwan project

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -8690,6 +8690,70 @@ DTPM:
   implements:
   - MONITORING
 
+PDSCV5X:
+  guid: "58a33a88-c7a9-426a-a820-8db1a99cbd0e"
+  description: "5 Pressure-dependent supply damper control for ventilation purposes (CO2 or VOC)."
+  is_abstract: true
+  uses:
+  - supply_air_damper_percentage_command_1
+  - supply_air_damper_percentage_command_2
+  - supply_air_damper_percentage_command_3
+  - supply_air_damper_percentage_command_4
+  - supply_air_damper_percentage_command_5
+  - supply_air_damper_percentage_sensor_1
+  - supply_air_damper_percentage_sensor_2
+  - supply_air_damper_percentage_sensor_3
+  - supply_air_damper_percentage_sensor_4
+  - supply_air_damper_percentage_sensor_5
+  implements:
+    - CONTROL
+
+COM4X:
+  guid: "f3c57976-61d5-41b6-8972-a35d1130a7d9"
+  description: "Carbon monoxide monitoring with 4 sensors."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - zone_air_co_concentration_sensor_1
+  - zone_air_co_concentration_sensor_2
+  - zone_air_co_concentration_sensor_3
+  - zone_air_co_concentration_sensor_4
+
+CHWBZTC:
+  guid: "b52fcafe-d276-4b08-b147-77b065f5a890"
+  description: "Chilled water valve binary (open/closed) control."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  uses:
+  - chilled_water_valve_command
+  - zone_air_temperature_sensor
+  - zone_air_temperature_setpoint
+  opt_uses:
+  - failed_chilled_water_valve_alarm
+  - failed_zone_air_temperature_alarm
+  - high_zone_air_temperature_alarm
+  - low_zone_air_temperature_alarm
+
+REFSTC2X:
+  guid: "82a2f713-a6b8-4b0b-814d-e75c5b1d0df1"
+  description: "Refrigerant temperature temp control for 2 circuits."
+  is_abstract: true
+  opt_uses:
+  - refrigerant_discharge_temperature_sensor_1
+  - refrigerant_discharge_temperature_sensor_2
+  - refrigerant_suction_temperature_sensor_1
+  - refrigerant_suction_temperature_sensor_2
+  uses:
+  - refrigerant_condenser_saturation_temperature_sensor_1
+  - refrigerant_condenser_saturation_temperature_sensor_2
+  - refrigerant_evaporator_saturation_temperature_sensor_1
+  - refrigerant_evaporator_saturation_temperature_sensor_2
+  - refrigerant_condenser_saturation_temperature_setpoint
+  implements:
+  - MONITORING
+
 ETM3X:
   guid: "4e9f481d-25d2-419f-974b-88aa7d6fd20e"
   description: "Basic exhaust temperature monitoring with three sensor."

ontology/yaml/resources/HVAC/entity_types/AHU.yaml

@@ -4662,6 +4662,81 @@ AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS_SFVSC_SSPC_SARC:
   - SSPC
   - SARC
 
+AHU_DFSS_DFVSC_ECOND_CHWDC_DTM_DSPM_OA_RDC_RHM_RCO2M:
+  guid: "8ef1a26a-fe8f-468a-ba96-ffd0f987c043"
+  description: "AHU with discharge air/fan, chilled water valve operation, humidity monitoring with dual dampers monitoring and control ."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFSS
+  - DFVSC
+  - ECOND
+  - CHWDC
+  - DTM
+  - DSPM
+  - OA
+  - RDC
+  - RHM
+  - RCO2M
+
+AHU_DFVSC_ECOND_HWDC_CHWDC_RDC_RCO2M_RTM_UV:
+  guid: "005172cf-d29a-4c10-94d2-2a5fb6fad51f"
+  description: "AHU with discharge air/fan, UV, heating water, chilled water valve and return air temperature monitoring with dual dampers monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFVSC
+  - ECOND
+  - HWDC
+  - CHWDC
+  - RDC
+  - RCO2M
+  - RTM
+  - UV
+
+AHU_DFVSC_ECOND_HWDC_CHWDC_RTM_UV:
+  guid: "f7579d91-707a-4e48-af46-9a86d8d31b94"
+  description: "AHU with discharge air/fan, heating water, chilled water valve and return air temperature monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFVSC
+  - ECOND
+  - HWDC
+  - CHWDC
+  - RTM
+  - UV
+
+AHU_DFSS_DFVSC_ECOND_CHWDC_ZA_CO2M_UV:
+  guid: "2389a986-5591-422c-8a13-f31c262ecee7"
+  description: "AHU with discharge air/fan, chilled water valve and zone air temperature monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFSS
+  - DFVSC
+  - ECOND
+  - CHWDC
+  - ZA
+  - CO2M
+  - UV
+
+AHU_DFSS_DFVSC_ECOND_HWDC_CHWDC_ZA_UV_CO2M6X_PDSCV5X:
+  guid: "627f4d5b-932c-4e4e-8ee3-61bff7aa0b8f"
+  description: "AHU with discharge air/fan, UV, heating water, chilled water valve and 6x co2 concentration monitoring with 5x dampers monitoring."
+  is_canonical: true
+  implements:
+  - AHU
+  - DFSS
+  - DFVSC
+  - ECOND
+  - HWDC
+  - CHWDC
+  - ZA
+  - UV
+  - CO2M6X
+  - PDSCV5X
+
 AHU_SFSS4X_ECON_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."
@@ -5527,4 +5602,4 @@ AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1:
   uses:
   - heating_water_valve_percentage_command
   - min_zone_air_relative_humidity_sensor
-  - min_zone_air_relative_humidity_setpoint
+  - min_zone_air_relative_humidity_setpoint

ontology/yaml/resources/HVAC/entity_types/CH.yaml

@@ -736,6 +736,23 @@ CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTPM
   - CDCPC
   - OTPM
 
+CH_SS_SCHWTC_CWDT_REFSM_CHWFRSM_CDWFRSM_CHDXSC_IGM:
+  guid: "38027ed7-d703-4971-a958-5c125fd41fce"
+  description: "Simple water-cooled chiller with supply temperature control with refrigerant monitoring, chilled and condenser water flowrate status monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SCHWTC
+  - CWDT
+  - REFSM
+  - CHWFRSM
+  - CDWFRSM
+  - CHDXSC
+  - IGM
+  opt_uses:
+  - compressor_run_time_accumulator
+
 CH_SS_CHWDPC_CHWDT_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X:
   guid: "aa1f0cf1-759d-4645-8cda-18e2b2639e4f"
   description: "Temperature differential across heating water for heat recovery chiller, differential pressure control with chilled and heating water, isolation valve monitoring for chilled water, and refrigerant pressure and temperature monitoring."
@@ -752,6 +769,19 @@ CH_SS_CHWDPC_CHWDT_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X:
   - REFSM2X
   - CPC2X
 
+CH_SS_CHWFRSM_CDWFRSM_CC2XM_REFSTC2X_REFPM2X:
+  guid: "da643f7f-dbc6-41a7-9030-60115b8c406f"
+  description: "Simple water-cooled chiller with 2 circuit refrigerant monitoring and compressor current monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - CHWFRSM
+  - CDWFRSM
+  - CC2XM
+  - REFSTC2X
+  - REFPM2X
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -836,4 +866,4 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
   - condensing_supply_water_temperature_sensor
   opt_uses:
   - lost_power_alarm
-  - run_mode
+  - run_mode

ontology/yaml/resources/HVAC/entity_types/CHWS.yaml

@@ -391,7 +391,6 @@ CHWS_SWTC_WDPC_PSWTC_PWDPC_PWFRM_PWECVC_SWDVPM_PWDVPM:
   - SWDVPM
   - PWDVPM
 
-
 CHWS_SWTC_WDPC_WFRC_CMSWFRM_BYPVPM_WSEBYPVPM_WSERWTM_CLPM:
   guid: "a50e908f-be3f-4e29-a284-21cc0a7fa332"
   description: "Chilled water system with supply water temperature and differential pressure control, flowrate control, common chiller supply water flowrate monitoring, cooling thermal monitoring, bypass valve and water side economizer bypass valve."
@@ -407,7 +406,6 @@ CHWS_SWTC_WDPC_WFRC_CMSWFRM_BYPVPM_WSEBYPVPM_WSERWTM_CLPM:
   - WSERWTM
   - CLPM
 
-
 CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM:
   guid: "cb8bd909-4be3-46a4-8802-30d177901bff"
   description: "Chilled water system with bypass valve, water side economizer bypass valve and differential pressure control."
@@ -419,6 +417,14 @@ CHWS_SWTC_WDPC_BYPVPM_WSEBYPVPM:
   - BYPVPM
   - WSEBYPVPM
 
+CHWS_RWTM:
+  guid: "74ef88cc-ffc7-40ec-b4ac-5978a8746a09"
+  description: "Simple chilled water system with return temperature monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - RWTM
+
 CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT:
   guid: "3461657c-4b79-4207-9c9b-fcc15a17049d"
   description: "Chilled water system with secondary loop supply water temperature and differential pressure control, primary and secondary flowrate monitoring."
@@ -431,6 +437,18 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT:
   - PRWFRM
   - PWDT
 
+CHWS_THCWDPC_RWCHVVM_SWCHVVM_PWDT_SESWTC_PWRFM:
+  guid: "e3f6366d-4383-48f4-9ce4-a3b7107603ac"
+  description: "Chilled water system with thermally conditioned water valve, primary supply temeprature and flowrate monitoring, and differential pressure monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - THCWDPC
+  - RWCHVVM
+  - SWCHVVM
+  - PWDT
+  - SESWTC
+  - PWRFM
 
 ###################################
 ### Existing Non-standard Types ###
@@ -495,16 +513,3 @@ CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1:
   uses:
   - production_differential_pressure_sensor
   - supply_water_flowrate_sensor # Need to rename to flowrate_sensor
-
-CHWS_THCWDPC_RWCHVVM_SWCHVVM_PWDT_SESWTC_PWRFM:
-  guid: "e3f6366d-4383-48f4-9ce4-a3b7107603ac"
-  description: "Chilled water system with thermally conditioned water valve, primary supply temeprature and flowrate monitoring, and differential pressure monitoring."
-  is_canonical: true
-  implements:
-  - CHWS
-  - THCWDPC
-  - RWCHVVM
-  - SWCHVVM
-  - PWDT
-  - SESWTC
-  - PWRFM

ontology/yaml/resources/HVAC/entity_types/FAN.yaml

@@ -704,6 +704,38 @@ FAN_SS_VSC_ZSPM_DWI:
   uses:
   - dishwasher_run_status
 
+FAN_SS_VSC_INVOPWM:
+  guid: "1c48e087-c973-4907-8d6e-93417da15d5b"
+  description: "Basic fan with start/stop and status with inverter monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - INVOPWM
+  opt_uses:
+  - load_percentage_sensor
+
+FAN_SS_VSC_COM4X:
+  guid: "47942605-0c52-4308-9f55-33b5930d27ac"
+  description: "Basic fan with start/stop and status with carbon monoxide monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - COM4X
+
+FAN_SS_VSC_DSPM:
+  guid: "28e19a83-a3ce-429e-951f-34cdecd036f3"
+  description: "Basic fan with variable speed control and discharge static pressure monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - DSPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
@@ -949,3 +981,25 @@ FAN_SS_MSM:
   - FAN
   - MSM
 
+FAN_SS_NONCANONICAL_7:
+  guid: "32703a5c-7cad-4eb6-9605-08e92f1d2cdd"
+  description: "Non-standard type."
+  implements:
+    - FAN_SS
+  uses:
+  - discharge_air_isolation_damper_closed_status_1
+  - discharge_air_isolation_damper_open_status_1
+  - discharge_air_isolation_damper_closed_status_2
+  - discharge_air_isolation_damper_open_status_2
+  - discharge_air_isolation_damper_command_1
+  - discharge_air_isolation_damper_command_2
+
+FAN_SS_NONCANONICAL_8:
+  guid: "812965c4-c9cf-4a1a-af34-225ff7de5159"
+  description: "Non-standard type."
+  implements:
+    - FAN_SS
+  uses:
+  - discharge_air_isolation_damper_closed_status
+  - discharge_air_isolation_damper_command
+  - discharge_air_isolation_damper_open_status

ontology/yaml/resources/HVAC/entity_types/FCU.yaml

@@ -2233,3 +2233,21 @@ FCU_DFSS_DFRMM_CHWBZC_DAIDC_RAIDC:
   - CHWBZC
   - DAIDC
   - RAIDC
+
+FCU_DFSS_CHWBZTC:
+  guid: "50fbaebd-ed83-4109-84d8-713dd4b54099"
+  description: "Chilled water FCU with chilled water valve open/close monitoring, discharge fan and zone temperature control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - CHWBZTC
+
+FCU_DFVSC_CHWBZTC:
+  guid: "d2b3f37b-d69f-4631-b8d2-d71243821e1c"
+  description: "FCU with discharge fan variable speed control and chilled water valve control"
+  is_canonical: true
+  implements:
+  - FCU
+  - DFVSC
+  - CHWBZTC

ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml

@@ -70,6 +70,7 @@ AHU:
   - failed_communication_alarm
   - smoke_alarm
   - emergency_alarm
+  - filter_alarm
 
 HX:
   guid: "9aa0dd1a-851c-4d4e-90da-6804c4f8b9f9"
@@ -401,6 +402,8 @@ DOAS:
   is_abstract: true
   opt_uses:
   - failed_communication_alarm
+  - smoke_alarm
+  - filter_alarm
   implements:
   - EQUIPMENT