|  | @@ -165,6 +165,7 @@ XSETTING( TEMP_COTROL_t, sTempControl[MAX_T_SENSORS], SETTINGS_SetTempControlDef
 | 
											
												
													
														|  |    XTRAP(FW_VERSION_UPDATE,                 1,      true,      GetVersionStr) \
 |  |    XTRAP(FW_VERSION_UPDATE,                 1,      true,      GetVersionStr) \
 | 
											
												
													
														|  |    XTRAP(FW_VERSION_UPDATED,                1,      true,      GetVersionStr) \
 |  |    XTRAP(FW_VERSION_UPDATED,                1,      true,      GetVersionStr) \
 | 
											
												
													
														|  |    XTRAP(DEVICE_RESTORED,                   1,      true,      GetVersionStr) \
 |  |    XTRAP(DEVICE_RESTORED,                   1,      true,      GetVersionStr) \
 | 
											
												
													
														|  | 
 |  | +  XTRAP(DEVICE_REBOOTED,                   1,      true,      GetVersionStr) \
 | 
											
												
													
														|  |    XTRAP(DI0_NORM,                          5,      true,      GetDIN0StatusStr) \
 |  |    XTRAP(DI0_NORM,                          5,      true,      GetDIN0StatusStr) \
 | 
											
												
													
														|  |    XTRAP(DI0_ALARM,                         5,      true,      GetDIN0StatusStr) \
 |  |    XTRAP(DI0_ALARM,                         5,      true,      GetDIN0StatusStr) \
 | 
											
												
													
														|  |    XTRAP(DI1_NORM,                          6,      true,      GetDIN1StatusStr) \
 |  |    XTRAP(DI1_NORM,                          6,      true,      GetDIN1StatusStr) \
 | 
											
										
											
												
													
														|  | @@ -177,10 +178,10 @@ XSETTING( TEMP_COTROL_t, sTempControl[MAX_T_SENSORS], SETTINGS_SetTempControlDef
 | 
											
												
													
														|  |    XTRAP(LINE_NORM,                         12,     true,      GetInputVoltageStr) \
 |  |    XTRAP(LINE_NORM,                         12,     true,      GetInputVoltageStr) \
 | 
											
												
													
														|  |    XTRAP(LOW_BAT_ALARM,                     15,     true,      GetBatCapacityStr) \
 |  |    XTRAP(LOW_BAT_ALARM,                     15,     true,      GetBatCapacityStr) \
 | 
											
												
													
														|  |    XTRAP(LOW_BAT_NORM,                      15,     true,      GetBatCapacityStr) \
 |  |    XTRAP(LOW_BAT_NORM,                      15,     true,      GetBatCapacityStr) \
 | 
											
												
													
														|  | -  XTRAP(CABINET_HIGH_TEMPERATURE_NORM,     9,      true,      GetTempCaseStr) \
 |  | 
 | 
											
												
													
														|  |    XTRAP(CABINET_HIGH_TEMPERATURE_ALARM,    9,      true,      GetTempCaseStr) \
 |  |    XTRAP(CABINET_HIGH_TEMPERATURE_ALARM,    9,      true,      GetTempCaseStr) \
 | 
											
												
													
														|  | -  XTRAP(CABINET_LOW_TEMPERATURE_NORM,      9,      true,      GetTempCaseStr) \
 |  | 
 | 
											
												
													
														|  | 
 |  | +  XTRAP(CABINET_HIGH_TEMPERATURE_NORM,     9,      true,      GetTempCaseStr) \
 | 
											
												
													
														|  |    XTRAP(CABINET_LOW_TEMPERATURE_ALARM,     9,      true,      GetTempCaseStr) \
 |  |    XTRAP(CABINET_LOW_TEMPERATURE_ALARM,     9,      true,      GetTempCaseStr) \
 | 
											
												
													
														|  | 
 |  | +  XTRAP(CABINET_LOW_TEMPERATURE_NORM,      9,      true,      GetTempCaseStr) \
 | 
											
												
													
														|  |    XTRAP(CONNECT_MONITOR_ALARM,             17,     true,      GetConnectMonitorStr) \
 |  |    XTRAP(CONNECT_MONITOR_ALARM,             17,     true,      GetConnectMonitorStr) \
 | 
											
												
													
														|  |    XTRAP(CONNECT_MONITOR_NORM,              17,     true,      GetConnectMonitorStr) \
 |  |    XTRAP(CONNECT_MONITOR_NORM,              17,     true,      GetConnectMonitorStr) \
 | 
											
												
													
														|  |    XTRAP(BATTERY_CONNECT_ALARM,             15,     true,      GetBatCapacityStr) \
 |  |    XTRAP(BATTERY_CONNECT_ALARM,             15,     true,      GetBatCapacityStr) \
 | 
											
										
											
												
													
														|  | @@ -204,10 +205,10 @@ typedef enum
 | 
											
												
													
														|  |    LINE_NORM,
 |  |    LINE_NORM,
 | 
											
												
													
														|  |    LOW_BAT_ALARM,
 |  |    LOW_BAT_ALARM,
 | 
											
												
													
														|  |    LOW_BAT_NORM,
 |  |    LOW_BAT_NORM,
 | 
											
												
													
														|  | -  CABINET_HIGH_TEMPERATURE_NORM,
 |  | 
 | 
											
												
													
														|  |    CABINET_HIGH_TEMPERATURE_ALARM,
 |  |    CABINET_HIGH_TEMPERATURE_ALARM,
 | 
											
												
													
														|  | -  CABINET_LOW_TEMPERATURE_NORM,
 |  | 
 | 
											
												
													
														|  | 
 |  | +  CABINET_HIGH_TEMPERATURE_NORM,
 | 
											
												
													
														|  |    CABINET_LOW_TEMPERATURE_ALARM,
 |  |    CABINET_LOW_TEMPERATURE_ALARM,
 | 
											
												
													
														|  | 
 |  | +  CABINET_LOW_TEMPERATURE_NORM,
 | 
											
												
													
														|  |    CONNECT_MONITOR_ALARM,
 |  |    CONNECT_MONITOR_ALARM,
 | 
											
												
													
														|  |    CONNECT_MONITOR_NORM,
 |  |    CONNECT_MONITOR_NORM,
 | 
											
												
													
														|  |    BATTERY_CONNECT_ALARM,
 |  |    BATTERY_CONNECT_ALARM,
 | 
											
										
											
												
													
														|  | @@ -260,8 +261,8 @@ typedef enum {
 | 
											
												
													
														|  |    XMONITOR(UPS_LowBatMonitor,                   UPS.Present) \
 |  |    XMONITOR(UPS_LowBatMonitor,                   UPS.Present) \
 | 
											
												
													
														|  |    XMONITOR(UPS_TemperatureHighRangeMonitor,     UPS.Present) \
 |  |    XMONITOR(UPS_TemperatureHighRangeMonitor,     UPS.Present) \
 | 
											
												
													
														|  |    XMONITOR(UPS_TemperatureLowRangeMonitor,      UPS.Present) \
 |  |    XMONITOR(UPS_TemperatureLowRangeMonitor,      UPS.Present) \
 | 
											
												
													
														|  | -  XMONITOR(Cabinet_TemperatureHighRangeMonitor, UPS.Present) \
 |  | 
 | 
											
												
													
														|  | -  XMONITOR(Cabinet_TemperatureLowRangeMonitor,  UPS.Present) \
 |  | 
 | 
											
												
													
														|  | 
 |  | +  XMONITOR(Cabinet_TemperatureHighRangeMonitor, 1) \
 | 
											
												
													
														|  | 
 |  | +  XMONITOR(Cabinet_TemperatureLowRangeMonitor,  1) \
 | 
											
												
													
														|  |    XMONITOR(UPS_BatteryConnectMonitor,           UPS.Present) \
 |  |    XMONITOR(UPS_BatteryConnectMonitor,           UPS.Present) \
 | 
											
												
													
														|  |    XMONITOR(UPS_ConnectMonitor,                  1) \
 |  |    XMONITOR(UPS_ConnectMonitor,                  1) \
 | 
											
												
													
														|  |    XMONITOR(UPS_DI0Monitor,                      1) \
 |  |    XMONITOR(UPS_DI0Monitor,                      1) \
 |