move hmucode to templates and normalize identifiers, add missing units in preparation of #481 merge

Author: john30

src/vaillant/08.hmu.tsp

@@ -224,13 +224,15 @@ namespace Hmu {
   @inherit(r_2)
   @ext(0x3d)
   model FlowPressure {
+    @unit("bar")
     @divisor(4)
     value: D2C;
   }
 
   @inherit(r_2)
   @ext(0x3e)
   model SourcePressure {
+    @unit("bar")
     @divisor(4)
     value: D2C;
   }
@@ -1457,8 +1459,7 @@ namespace Hmu {
   @inherit(r_7)
   @ext(0x53, 0xd)
   model RunDataStatuscode {
-    @values(Values_RunDataStatuscode)
-    value: UIN;
+    value: hmucode;
   }
 
   @inherit(r_7)
@@ -1692,62 +1693,6 @@ namespace Hmu {
     Cooling: 0x02,
   }
 
-  enum Values_RunDataStatuscode {
-    Frost_protection: 34,
-    Standby: 100,
-    Heating_Compressor_shutdown: 101,
-    Heating_Compressor_blocked: 102,
-    Heating_Prerun: 103,
-    Heating_Compressor_active: 104,
-    Heating_Overrun: 107,
-    Cooling_Compressor_shutdown: 111,
-    Cooling_Compressor_blocked: 112,
-    Cooling_Prerun: 113,
-    Cooling_Compressor_active: 114,
-    Cooling_Overrun: 117,
-    Heating_Immersion_heater_active: 125,
-    Warm_Water_Compressor_blocked: 132,
-    Warm_Water_Prerun: 133,
-    Warm_Water_Compressor_active: 134,
-    Warm_Water_Immersion_Heater_active: 135,
-    Warm_Water_Overrun: 137,
-    Heating_Immersion_Heater_shutdown: 141,
-    Heating_Immersion_Heater_blocked: 142,
-    Warm_Water_Immersion_Heater_shutdown: 151,
-    Warm_Water_Immersion_Heater_blocked: 152,
-    Air_purging_program_active: 202,
-    Compressor_oil_heating_activated: 240,
-    Fan_1_blocked: 252,
-    Fan_1_air_inlet_too_high: 255,
-    Fan_1_air_inlet_too_low: 256,
-    Fan_2_blocked: 260,
-    Building_circuit_flow_too_low: 275,
-    Building_circuit_pump_fault: 277,
-    Frequency_converter_fault_Compressor: 280,
-    Frequency_converter_fault_Mains_voltage: 281,
-    Frequency_converter_fault_Overheating: 282,
-    Deicing_time_too_long: 283,
-    Deicing_flow_temperature_too_low: 284,
-    Compressor_outlet_temperature_too_high: 285,
-    Hot_gas_temperature_switch_open: 286,
-    Fan_1_Wind: 287,
-    Fan_2_Wind: 288,
-    Current_limt_active: 289,
-    High_pressure_switch_open: 302,
-    Compressor_outlet_temperature_too_high_1: 303,
-    Evaporation_temperature_too_low: 304,
-    Condensation_temperature_too_low: 305,
-    Evaporation_temperature_too_high: 306,
-    Condensation_temperature_too_high: 308,
-    Building_circuit_return_temperature_too_low: 312,
-    Building_circuit_return_temperature_too_high: 314,
-    Immersion_heater_Flow_temperature_too_high: 351,
-    Deicing_active: 516,
-    Frequency_converter_fault: 575,
-    Connection_fault_frequency_converter: 581,
-    _4_port_valve_position_fault: 590,
-  }
-
   /** included parts */
   union _includes {
     Hcmode_inc,

src/vaillant/_templates.tsp

@@ -480,6 +480,10 @@ model rTimeSlotWithoutTemp {
 @values(Values_appliancecode)
 scalar appliancecode extends UCH;
 
+/** HMU Status code */
+@values(Values_hmucode)
+scalar hmucode extends UIN;
+
 enum Values_daysel {
   selected: 0,
   Mo_Fr: 1,
@@ -742,6 +746,62 @@ enum Values_appliancecode {
   frost_protect: 34,
 }
 
+enum Values_hmucode {
+  frost_protect: 34,
+  standby: 100,
+  heat_compressor_shutdown: 101,
+  heat_compressor_blocked: 102,
+  heat_prerun: 103,
+  heat_compressor_active: 104,
+  heat_overrun: 107,
+  cool_compressor_shutdown: 111,
+  cool_compressor_blocked: 112,
+  cool_prerun: 113,
+  cool_compressor_active: 114,
+  cool_overrun: 117,
+  heat_immersion_heater_active: 125,
+  hwc_compressor_blocked: 132,
+  hwc_prerun: 133,
+  hwc_compressor_active: 134,
+  hwc_immersion_heater_active: 135,
+  hwc_overrun: 137,
+  heat_immersion_heater_shutdown: 141,
+  heat_immersion_heater_blocked: 142,
+  hwc_immersion_heater_shutdown: 151,
+  hwc_immersion_heater_blocked: 152,
+  air_purging_program_active: 202,
+  compressor_oil_heating_active: 240,
+  fan1_blocked: 252,
+  fan1_airinlet_too_high: 255,
+  fan1_airinlet_too_low: 256,
+  fan2_blocked: 260,
+  building_circuit_flow_too_low: 275,
+  building_circuit_pump_fault: 277,
+  frequency_converter_fault_compressor: 280,
+  frequency_converter_fault_mains_voltage: 281,
+  frequency_converter_fault_overheating: 282,
+  deicing_time_too_long: 283,
+  deicing_flow_temp_too_low: 284,
+  compressor_outlet_temp_too_high: 285,
+  hot_gas_temp_switch_open: 286,
+  fan1_wind: 287,
+  fan2_wind: 288,
+  current_limt_active: 289,
+  high_pressure_switch_open: 302,
+  compressor_outlet_temp_too_high_1: 303,
+  evaporation_temp_too_low: 304,
+  condensation_temp_too_low: 305,
+  evaporation_temp_too_high: 306,
+  condensation_temp_too_high: 308,
+  building_circuit_return_temp_too_low: 312,
+  building_circuit_return_temp_too_high: 314,
+  immersion_heater_flow_temp_too_high: 351,
+  deicing_active: 516,
+  frequency_converter_fault: 575,
+  connection_fault_frequency_converter: 581,
+  four_port_valve_position_fault: 590,
+}
+
 /** default *r for register */
 @base(MF, 0x9, 0xd)
 model r {}