Prechádzať zdrojové kódy

[BT-6709_BEELINE]1. change default settings
2. remove akb_change alarm

balbekova 4 rokov pred
rodič
commit
4f8a92907d

+ 23 - 2
config/board_bt6709.h

@@ -52,7 +52,11 @@ WDG_PIN(X)
 /**
   * @brief  Версия прошивки
   */
-#define VERSION                         "1.4"
+#ifdef ORDER_MTS
+#define VERSION                         "1.3"
+#else
+#define VERSION                         "1.5"
+#endif
 
 /**
   * brief  Текст сообщения при запуске CLI
@@ -232,8 +236,11 @@ typedef enum {
 #define TEMP_AKB_MONITOR
 #define BAT_CONNECT_MONITOR
 #define UPS_CONNECT_MONITOR
+#ifdef ORDER_MTS
 #define AKB_CHANGE_MONITOR
+#endif
 
+#ifdef ORDER_MTS
 #define MONITOR_TABLE \
   XMONITOR(UPS_TestFinishMonitor,               UPS.Present) \
   XMONITOR(UPS_LineFailMonitor,                 UPS.Present) \
@@ -245,7 +252,21 @@ typedef enum {
   XMONITOR(UPS_TemperatureLowRangeMonitor,      UPS.Present) \
   XMONITOR(UPS_BatteryConnectMonitor,           UPS.Present) \
   XMONITOR(UPS_ConnectMonitor,                  1) \
-  XMONITOR(AKB_Change_Monitor,                  1) \
+  XMONITOR(AKB_Change_Monitor,                  1)
+#else
+#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) \
+  XMONITOR(UPS_TemperatureLowRangeMonitor,      UPS.Present) \
+  XMONITOR(UPS_BatteryConnectMonitor,           UPS.Present) \
+  XMONITOR(UPS_ConnectMonitor,                  1)
+#endif
+
 
 #define LED_INIT_OK               LED_INIT_G
 #define LED_INIT_ERR              LED_INIT_R

+ 1 - 1
modules/MegaTec/megatec.h

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 
 
-//#define UPS_BUZZER_OFF
+#define UPS_BUZZER_OFF
 
 
 #define K_EFFICIENCY		0.9

+ 6 - 1
modules/settings_api_bt6709.c

@@ -88,11 +88,16 @@ void SETTINGS_SetUPSSettingsDef(void)
 {
   sSettings.UPS_Setting.Ucellmin = 1.67;
   sSettings.UPS_Setting.Ucellmax = 2.27;
+#ifdef ORDER_BEELINE
+  sSettings.UPS_Setting.Uakb = 36;
+  sSettings.UPS_Setting.common_capacity = 40;
+#else
   sSettings.UPS_Setting.Uakb = 24;
+  sSettings.UPS_Setting.common_capacity = 9;
+#endif
   sSettings.UPS_Setting.ups_power = 1000;
   sSettings.UPS_Setting.set_data = 0;
   sSettings.UPS_Setting.life_time = 5;
-  sSettings.UPS_Setting.common_capacity = 9;
   sSettings.UPS_Setting.type_ups = ups_kestar;
 }