|
@@ -52,7 +52,7 @@ WDG_PIN(X)
|
|
|
/**
|
|
|
* @brief Версия прошивки
|
|
|
*/
|
|
|
-#define VERSION "1.0f"
|
|
|
+#define VERSION "1.0j"
|
|
|
|
|
|
/**
|
|
|
* brief Текст сообщения при запуске CLI
|
|
@@ -174,7 +174,7 @@ XSETTING( RADIUS_t, sRADIUS, SETTINGS_SetRADIUSDef, PART_DEFAULT_1 ) \
|
|
|
XTRAP(FW_VERSION_UPDATED, 1, true, GetVersionStr) \
|
|
|
XTRAP(DEVICE_RESTORED, 1, true, GetVersionStr) \
|
|
|
XTRAP(DEVICE_REBOOTED, 1, true, GetVersionStr) \
|
|
|
- XTRAP(UPS_MODE, 17, true, GetModeStr) \
|
|
|
+ XTRAP(UPS_MODE, 20, true, GetModeStr) \
|
|
|
XTRAP(BATTERY_HIGH_TEMPERATURE_NORM, 9, true, GetInternalTempStr) \
|
|
|
XTRAP(BATTERY_HIGH_TEMPERATURE_ALARM, 9, true, GetInternalTempStr) \
|
|
|
XTRAP(BATTERY_LOW_TEMPERATURE_NORM, 9, true, GetInternalTempStr) \
|
|
@@ -185,18 +185,18 @@ XSETTING( RADIUS_t, sRADIUS, SETTINGS_SetRADIUSDef, PART_DEFAULT_1 ) \
|
|
|
XTRAP(VAC_LOW_OUTPUT_NORM, 12, true, GetOutputVoltageStr) \
|
|
|
XTRAP(VAC_HIGH_OUTPUT_ALARM, 12, true, GetOutputVoltageStr) \
|
|
|
XTRAP(VAC_HIGH_OUTPUT_NORM, 12, true, GetOutputVoltageStr) \
|
|
|
- XTRAP(TEST_BAT_RUN, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(TEST_BAT_STOP, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(BATTERY_FAIL, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(BATTERY_NORM, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(LOW_BAT_ALARM, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(LOW_BAT_NORM, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(BATTERY_CONNECT_ALARM, 16, true, GetBatCapacityStr) \
|
|
|
- XTRAP(BATTERY_CONNECT_NORM, 16, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(TEST_BAT_RUN, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(TEST_BAT_STOP, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(BATTERY_FAIL, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(BATTERY_NORM, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(LOW_BAT_ALARM, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(LOW_BAT_NORM, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(BATTERY_CONNECT_ALARM, 14, true, GetBatCapacityStr) \
|
|
|
+ XTRAP(BATTERY_CONNECT_NORM, 14, true, GetBatCapacityStr) \
|
|
|
XTRAP(POWER_ALARM, 13, true, GetPowerStr) \
|
|
|
XTRAP(POWER_NORM, 13, true, GetPowerStr) \
|
|
|
- XTRAP(CONNECT_MONITOR_ALARM, 20, true, GetConnectMonitorStr) \
|
|
|
- XTRAP(CONNECT_MONITOR_NORM, 20, true, GetConnectMonitorStr) \
|
|
|
+ XTRAP(CONNECT_MONITOR_ALARM, 16, true, GetConnectMonitorStr) \
|
|
|
+ XTRAP(CONNECT_MONITOR_NORM, 16, true, GetConnectMonitorStr) \
|
|
|
XTRAP(PHASE_FAIL, 11, true, GetInputVoltageStr) \
|
|
|
XTRAP(PHASE_NORM, 11, true, GetInputVoltageStr) \
|
|
|
|