Ver código fonte

[BT-6703-RT]add VAC output alarm

balbekova 4 anos atrás
pai
commit
6611065dd4
2 arquivos alterados com 10 adições e 0 exclusões
  1. 8 0
      config/board_bt6703_rt.h
  2. 2 0
      modules/settings_api_bt6703_rt.c

+ 8 - 0
config/board_bt6703_rt.h

@@ -130,6 +130,9 @@ XSETTING( char, our_srv_crt[1705], SETTINGS_SetSSLcrtDef, PART_DEFAULT_1 ) \
   XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                    SetUPSVoltCellMaxStr) \
   XJSON_SETTINGS_TAG("ups_batcap",         GetCapacityNominalAKBStr,                SetCapacityNominalAKBStr) \
   XJSON_SETTINGS_TAG("ups_max_power",      GetUPSPowerEnumStr,                      SetUPSPowerEnumStr) \
+  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr,                 SetVACAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr,                  SetVACAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr,                     SetVACAlarmHisteStr) \
   XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,         SetTemperatureAlarmHighRangeStr) \
   XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,          SetTemperatureAlarmLowRangeStr) \
   XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,             SetTemperatureAlarmHisteStr) \
@@ -222,6 +225,8 @@ typedef enum {
 	LOG_ALARM_DIO,
 	LOG_DO0_STATE,
 	LOG_DO1_STATE,
+  LOG_ALARM_VAC_LOW_OUTPUT,
+	LOG_ALARM_VAC_HIGH_OUTPUT,
 	LOG_ALARM_HIGH_TEMP,
 	LOG_ALARM_LOW_TEMP,
 	LOG_ALARM_LINE,
@@ -237,6 +242,7 @@ typedef enum {
 
 #define TEST_AKB_FINISH_MONITOR
 #define LINE_FAIL_MONITOR
+#define VAC_OUT_MONITOR
 #define LOW_BAT_MONITOR
 #define LOAD_MONITOR
 #define TEMP_AKB_MONITOR
@@ -248,6 +254,8 @@ typedef enum {
 #define MONITOR_TABLE \
   XMONITOR(UPS_TestFinishMonitor,                 UPS.Present) \
   XMONITOR(UPS_LineFailMonitor,                   UPS.Present) \
+  XMONITOR(UPS_VACoutputLowRangeMonitor,        UPS.Present) \
+  XMONITOR(UPS_VACoutputHighRangeMonitor,       UPS.Present) \
   XMONITOR(UPS_LowBatMonitor,                     UPS.Present) \
   XMONITOR(UPS_PowerMonitor,                      UPS.Present) \
   XMONITOR(UPS_TemperatureHighRangeMonitor,       UPS.Present) \

+ 2 - 0
modules/settings_api_bt6703_rt.c

@@ -50,6 +50,8 @@ const char* logsStrShortRu[] =
     "Авария дискр. входа 1",
     "Состояние выхода 1",
     "Состояние выхода 2",
+    "Низкое вых. напряжение",
+    "Высокое вых. напряжение",
     "Высокая температура",
     "Низкая температура",
     "Авария вх. напряжения",