Browse Source

[BT-6711-v1]add new model of controller

balbekova 3 years ago
parent
commit
1addaf542f

+ 8 - 0
Makefile

@@ -80,6 +80,11 @@ fullflash_6711:
 	sleep 1
 	st-flash --reset write output/stm32bt6711.bin 0x8020000	
 
+fullflash_6711_v1:
+	st-flash --reset write output/iap.bin 0x8000000
+	sleep 1
+	st-flash --reset write output/stm32bt6711_v1.bin 0x8020000	
+
 release_6703:
 	$(MAKE) -C modules HARDWARE=bt6703 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 
@@ -101,3 +106,6 @@ release_6710:
 release_6711:
 	$(MAKE) -C modules HARDWARE=bt6711 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 
+release_6711_v1:
+	$(MAKE) -C modules HARDWARE=bt6711_v1 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+

+ 2 - 0
config/board.h

@@ -15,6 +15,8 @@
 #include "board_bt6710.h"
 #elif defined HARDWARE_BT6711
 #include "board_bt6711.h"
+#elif defined HARDWARE_BT6711_V1
+#include "board_bt6711_v1.h"
 #endif
 
 #define EXPAND_AS_ENUM(name, ...) name,

+ 300 - 0
config/board_bt6711_v1.h

@@ -0,0 +1,300 @@
+#ifndef BOARD_BT6711_V1_H
+#define BOARD_BT6711_V1_H
+
+#define SERVICE_RS232_UART_TABLE(X)     \
+X( SERVICE_TXDINT,   GPIOD,   5, AF_USART2) \
+X( SERVICE_RXDINT,   GPIOD,   6, AF_USART2)
+
+#define RS232_UART_TABLE(X)     \
+X( TXDINT,   GPIOA,   9, AF_USART1) \
+X( RXDINT,   GPIOA,   10, AF_USART1)
+
+#define SPI2_TABLE(X) \
+X( SPI2_MISO,   GPIOB,  14, AF_SPI2) \
+X( SPI2_MOSI,   GPIOB,  15, AF_SPI2) \
+X( SPI2_SCK,    GPIOB,  10, AF_SPI2) \
+X( SPI2_NSS,    GPIOB,  9,  GPIO_OUT | GPIO_SET)
+
+#define MCU_PERIPHERALS(X)  \
+SERVICE_RS232_UART_TABLE(X)\
+RS232_UART_TABLE(X) \
+SPI2_TABLE(X)
+
+#define LEDS(X) \
+X( LED_INIT_R,  GPIOA,  4,  GPIO_OUT | GPIO_INV) \
+X( LED_INIT_G,  GPIOA,  3,  GPIO_OUT | GPIO_INV) \
+X( LED_MAJOR_R, GPIOA,  5,  GPIO_OUT | GPIO_INV) \
+X( LED_MINOR_G, GPIOE,  11, GPIO_OUT | GPIO_INV) \
+X( LED_MINOR_R, GPIOE,  12, GPIO_OUT | GPIO_INV)
+
+#define JUMPERS(X) \
+X( MODE_JUMPER, GPIOE,  6,  GPIO_IN_PU | GPIO_INV)
+
+#define BUTTONS(X) \
+X( KEY_DEF,     GPIOE,  7,  GPIO_IN )//| GPIO_INV
+
+#define WDG_PIN(X) \
+X( _WDG,     GPIOE,   15, GPIO_OUT)
+
+#define GPIO_TABLE(X)   \
+MCU_PERIPHERALS(X)  \
+LEDS(X)             \
+JUMPERS(X) \
+BUTTONS(X)      \
+WDG_PIN(X)
+
+/**
+  * @brief  Маркер ревизии платы для валидации *.bin файла
+  *
+  */
+#define HW_REV                          "BT-6711_v1"
+
+/**
+  * @brief  Версия прошивки
+  */
+#define VERSION                         "1.0d"
+
+/**
+  * brief  Текст сообщения при запуске CLI
+  */
+#define TELNET_CLI_WELCOME_MESSAGE      "BT-6711_v1 command server - connection accepted.\r\nlogin:"
+
+#define RTC_ENABLE                  //RTC clock
+#define LED_ENABLE                  //LED индикация
+#define BUTTON_ENABLE               //Кнопки
+#define NET_ENABLE                  //Ethernet сеть
+#define HTTP_SERVER_ENABLE          //HTTP сервер
+#define SNMP_ENABLE                 //SNMP протокол
+#define NOTIFICATION_CONTROL_ENABLE //Управление уведомлениями
+#define WHITELIST_ENABLE            //Белый список
+#define TELNET_ENABLE               //Telnet сервер
+#define UPS_ENABLE                  //UPS
+#ifndef BT6702_SERVICE // no web server in the service fw
+#define FTP_ENABLE                  //FTP boot loader
+#define RADIUS_SERVER_ENABLE        //RADIUS сервер
+#endif // BT6702_SERVICE
+#define SYSLOG_ENABLE
+//#define DEBUG_FREERTOS            //Мониторинг FreeRtos
+
+#define SETTINGS_TABLE \
+XSETTING( SNMP_t,	sSnmp, SETTINGS_SetSnmpDef, ALL_DEFAULT ) \
+XSETTING( AUTH_t,	sAuth[MAX_WEB_USERS], SETTINGS_SetServiceDef, PART_DEFAULT_2 ) \
+XSETTING( SNTP_t,	sSNTP, SETTINGS_SetSntpDef, ALL_DEFAULT ) \
+XSETTING( UPS_Setting_t, UPS_Setting, SETTINGS_SetUPSSettingsDef, ALL_DEFAULT ) \
+XSETTING( ALARM_MNGR_t, sAlarmManager, SETTINGS_SetAlarmManagerDef, ALL_DEFAULT ) \
+XSETTING( TELNET_t, sTelnet, SETTINGS_SetTelnetDef, PART_DEFAULT_1 ) \
+XSETTING( WHITE_LIST_t, sWhiteList[MAX_WHITE_LIST], SETTINGS_SetWhiteListDef, ALL_DEFAULT ) \
+XSETTING( WHITE_LIST_t, sWhiteListTemp[MAX_WHITE_LIST], SETTINGS_SetWhiteListDef, ALL_DEFAULT ) \
+XSETTING( uint8_t, sFlagNotification[ALL_TRAPS], SETTINGS_SetFlagNotificationDef, ALL_DEFAULT ) \
+XSETTING( FTP_Update_t,	sFTPUpdate, SETTINGS_SetFTPUpdateDef, ALL_DEFAULT ) \
+XSETTING( Syslog_Settings_t,	sSyslog, SETTINGS_SetSyslogDef, ALL_DEFAULT ) \
+XSETTING( RADIUS_t, sRADIUS, SETTINGS_SetRADIUSDef, PART_DEFAULT_1 ) \
+
+
+#define SNMP_DEV_ROOT_OID       13
+
+#define MAX_IRQ_HANDLERS 4
+
+#define WEB_SETTINGS_TAGS_TABLE \
+  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity,                    SetReadCommunity) \
+  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity,                   SetWriteCommunity) \
+  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp,                        SetManagerIp) \
+  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2,                       SetManagerIp2) \
+  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3,                       SetManagerIp3) \
+  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4,                       SetManagerIp4) \
+  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5,                       SetManagerIp5) \
+  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr,                            SetIPStr) \
+  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr,                       SetGatewayStr) \
+  XJSON_SETTINGS_TAG("mask",               GetMaskStr,                          SetMaskStr) \
+  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr,                     SetDhcpStateStr) \
+  XJSON_SETTINGS_TAG("tn_port",            GetTelnetPortStr,                    SetTelnetPortStr) \
+  XJSON_SETTINGS_TAG("tn_enabled",         GetTelnetEnableStateStr,             SetTelnetEnableStateStr) \
+  XJSON_SETTINGS_TAG("wtl_ip1",            GetWhiteList1STR,                    SetWhiteList1STR) \
+  XJSON_SETTINGS_TAG("wtl_ip2",            GetWhiteList2STR,                    SetWhiteList2STR) \
+  XJSON_SETTINGS_TAG("wtl_ip3",            GetWhiteList3STR,                    SetWhiteList3STR) \
+  XJSON_SETTINGS_TAG("wtl_ip4",            GetWhiteList4STR,                    SetWhiteList4STR) \
+  XJSON_SETTINGS_TAG("wtl_ip5",            GetWhiteList5STR,                    SetWhiteList5STR) \
+  XJSON_SETTINGS_TAG("date",               GetDateStr,                          SetDateStr) \
+  XJSON_SETTINGS_TAG("time",               GetTimeStr,                          SetTimeWebStr) \
+  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr,                     SetSntpStateStr) \
+  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr,                  SetSntpServerIpStr) \
+  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr,                  SetSntpTimeZoneStr) \
+  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr,                      SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr,                  SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr,                SetUPSVoltCellMinStr) \
+  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                SetUPSVoltCellMaxStr) \
+  XJSON_SETTINGS_TAG("bat_cap",            GetCapacityNominalAKBStr,            SetCapacityNominalAKBStr) \
+  XJSON_SETTINGS_TAG("ups_max_power",      GetUPSPowerStr,                      SetUPSPowerStr) \
+  XJSON_SETTINGS_TAG("bat_charge",         GetVoltageAKBNominalStr,             SetVoltageAKBNominalStr) \
+  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr,             SetVACAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr,              SetVACAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr,                 SetVACAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("mainvolt_in_high",   GetVACInputAlarmHighRangeStr,        SetVACInputAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_in_low",    GetVACInputAlarmLowRangeStr,         SetVACInputAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_in_hist",   GetVACinputAlarmHisteStr,            SetVACinputAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,     SetTemperatureAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,      SetTemperatureAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,         SetTemperatureAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr,            SetLoadAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr,                SetLoadAlarmHistStr) \
+  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag,                    SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ftp_server",         GetFTPServer,                        SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ftp_port",           GetFTPPort,                          SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ftp_path",           GetFTPPath,                          SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ftp_login",          GetFTPLogin,                         SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ftp_password",       GetFTPPassword,                      SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("syslog_enable",      GetSyslogEnable,                     SetSyslogEnable) \
+  XJSON_SETTINGS_TAG("syslog_server",      GetSyslogServer,                     SetSyslogServer) \
+  XJSON_SETTINGS_TAG("syslog_port",        GetSyslogPort,                       SetSyslogPort) \
+  XJSON_SETTINGS_TAG("rs_server",          GetRDSIpStr,                         SetRDSIpStr) \
+  XJSON_SETTINGS_TAG("rs_port",            GetRDSPortStr,                       SetRDSPortStr) \
+  XJSON_SETTINGS_TAG("rs_pwd",             GetRDSPasswordkStr,                  SetRDSPasswordkStr) \
+  XJSON_SETTINGS_TAG("rs_enabled",         GetRDSEnableStateStr,                SetRDSEnableStateStr) \
+
+#define WEB_PARAMS_TAGS_TABLE \
+  XJSON_PARAMS_TAG("AC",                 GetInputVoltageStr) \
+  XJSON_PARAMS_TAG("DC",                 GetOutputVoltageStr) \
+  XJSON_PARAMS_TAG("in_freq",            GetInputFreqStr) \
+  XJSON_PARAMS_TAG("out_freq",           GetOutputFreqStr) \
+  XJSON_PARAMS_TAG("pwr",                GetPowerStr) \
+  XJSON_PARAMS_TAG("bat_rem_cap",        GetBatCapacityStr) \
+  XJSON_PARAMS_TAG("inner_temp",         GetInternalTempStr) \
+  XJSON_PARAMS_TAG("bat_time_left",      GetRuntimeStr) \
+  XJSON_PARAMS_TAG("in_cur",             GetInputCurrentStr) \
+  XJSON_PARAMS_TAG("out_cur",            GetOutputCurrentStr) \
+  XJSON_PARAMS_TAG("bat_volt",           GetVoltageAKBtStr) \
+  XJSON_PARAMS_TAG("bat_cap",            GetCapacityNominalAKBStr) \
+  XJSON_PARAMS_TAG("pmode",              GetModeStr) \
+  XJSON_PARAMS_TAG("m_alarm",            GetAlarmMonitorStr) \
+  XJSON_PARAMS_TAG("u_alarm",            GetAlarmStr) \
+  XJSON_PARAMS_TAG("netsettings_changed",GetWebReinitFlag) \
+
+#define TRAPS_TABLE \
+  XTRAP(FW_VERSION_UPDATE,                 1,      true,      GetVersionStr) \
+  XTRAP(FW_VERSION_UPDATED,                1,      true,      GetVersionStr) \
+  XTRAP(DEVICE_RESTORED,                   1,      true,      GetVersionStr) \
+  XTRAP(DEVICE_REBOOTED,                   1,      true,      GetVersionStr) \
+  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) \
+  XTRAP(BATTERY_LOW_TEMPERATURE_ALARM,     9,      true,      GetInternalTempStr) \
+  XTRAP(LINE_ALARM,                        11,     true,      GetInputVoltageStr) \
+  XTRAP(LINE_NORM,                         11,     true,      GetInputVoltageStr) \
+  XTRAP(VAC_LOW_OUTPUT_ALARM,              12,     true,      GetOutputVoltageStr) \
+  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,                      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,             16,     true,      GetConnectMonitorStr) \
+  XTRAP(CONNECT_MONITOR_NORM,              16,     true,      GetConnectMonitorStr) \
+  XTRAP(PHASE_FAIL,                        11,     true,      GetInputVoltageStr) \
+  XTRAP(PHASE_NORM,                        11,     true,      GetInputVoltageStr) \
+
+typedef enum
+{
+  FW_VERSION_UPDATE = 1,
+  FW_VERSION_UPDATED,
+  DEVICE_RESTORED,
+  DEVICE_REBOOTED,
+  UPS_MODE,
+  BATTERY_HIGH_TEMPERATURE_NORM,
+  BATTERY_HIGH_TEMPERATURE_ALARM,
+  BATTERY_LOW_TEMPERATURE_NORM,
+  BATTERY_LOW_TEMPERATURE_ALARM,
+  LINE_ALARM,
+  LINE_NORM,
+  VAC_LOW_OUTPUT_ALARM,
+  VAC_LOW_OUTPUT_NORM,
+  VAC_HIGH_OUTPUT_ALARM,
+  VAC_HIGH_OUTPUT_NORM,
+  TEST_BAT_RUN,
+  TEST_BAT_STOP,
+  BATTERY_FAIL,
+  BATTERY_NORM,
+  LOW_BAT_ALARM,
+  LOW_BAT_NORM,
+  BATTERY_CONNECT_ALARM,
+  BATTERY_CONNECT_NORM,
+  POWER_ALARM,
+  POWER_NORM,
+  CONNECT_MONITOR_ALARM,
+  CONNECT_MONITOR_NORM,
+  PHASE_FAIL,
+  PHASE_NORM,
+  ALL_TRAPS
+} TRAP_LIST_t;
+
+typedef enum {
+	LOG_SYSTEM_BOOT = 0,			// device booted
+	LOG_SYSTEM_DEFCONFIG,	// default config applied
+	LOG_UPDATE_SOFT,
+	LOG_TURN_ON,		//
+	LOG_PSW_CHANGE,		//
+	LOG_SETTING_SAVE,		//
+	LOG_LOGIN_TELNET,		//
+	LOG_LOGIN,		//
+  LOG_UPS_MODE,
+	LOG_TEST_UPS,		//
+	LOG_SHUTDOWN_UPS,
+	LOG_ALARM_VAC_LOW_OUTPUT,
+	LOG_ALARM_VAC_HIGH_OUTPUT,
+	LOG_ALARM_HIGH_TEMP,
+	LOG_ALARM_LOW_TEMP,
+	LOG_ALARM_LINE,
+	LOG_ALARM_LOW_BAT,
+	LOG_ALARM_POWER,
+	LOG_ALARM_UPS,
+	LOG_ALARM_AKB,
+  LOG_TEST_ALARM_AKB,
+  LOG_PHASE_FAIL,
+	LOG_VALUE,
+	LOG_NONE,
+} log_type_t;
+
+#define UPS_MODE_MONITOR
+#define TEST_AKB_FINISH_MONITOR
+#define VAC_IN_MONITOR
+#define LINE_FAIL_MONITOR
+#define VAC_OUT_MONITOR
+#define LOW_BAT_MONITOR
+#define LOAD_MONITOR
+#define TEMP_AKB_MONITOR
+#define BAT_CONNECT_MONITOR
+#define UPS_CONNECT_MONITOR
+#define TEST_ALARM_AKB_MONITOR
+#define PHASE_FAIL_MONITOR
+
+#define MONITOR_TABLE \
+  XMONITOR(UPS_TestFinishMonitor,               (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_LineFailMonitor,                 (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_VACoutputLowRangeMonitor,        (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_VACoutputHighRangeMonitor,       (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_LowBatMonitor,                   (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_PowerMonitor,                    (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_TemperatureHighRangeMonitor,     (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_TemperatureLowRangeMonitor,      (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_BatteryConnectMonitor,           (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_PhaseFailMonitor,                (UPS.Present == UPS_CONNECTED)) \
+  XMONITOR(UPS_ConnectMonitor,                  1)
+
+#define LED_INIT_OK               LED_INIT_G
+#define LED_INIT_ERR              LED_INIT_R
+#define LED_ALARM                 LED_MAJOR_R
+#define LED_GREEN_MINOR           LED_MINOR_G
+#define LED_RED_MINOR             LED_MINOR_R
+
+#define SERVICE_CONTROLLER_IP  "192.168.0.12"
+
+#define UPS_BUZZER_OFF //выключение звукового сигнала ИБП
+
+#endif /* BOARD_PRS_H */

+ 710 - 0
docs/bt_6711_v1/BT6711_v1.MIB

@@ -0,0 +1,710 @@
+RoTeK-swt-BT-BT-6711-signals-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+	enterprises, NOTIFICATION-TYPE
+		FROM SNMPV2-SMI;
+
+    rotek           OBJECT IDENTIFIER ::= { enterprises 41752 }
+    swt             OBJECT IDENTIFIER ::= { rotek 911 }
+    BT-6711_v1         OBJECT IDENTIFIER ::= { swt 13}
+    signals         OBJECT IDENTIFIER ::= { BT-6711_v1 1 }
+    traps           OBJECT IDENTIFIER ::= { BT-6711_v1 2 }
+
+	
+    fwVersion OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "FWVersion" 
+    ::= { signals 1 }
+
+    restoreSignal OBJECT-TYPE
+    SYNTAX  INTEGER
+    MAX-ACCESS  write-only
+    STATUS  current
+    DESCRIPTION
+    "Restore settings
+    1 - restore settings"
+    ::= { signals 2 }
+	
+    rebootSignal OBJECT-TYPE
+    SYNTAX  INTEGER
+    MAX-ACCESS  write-only
+    STATUS  current
+    DESCRIPTION
+    "Reboot device: 
+    1 - reboot"
+    ::= { signals 3 }
+    
+    upsModel OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS model" 
+    ::= { signals 4 }
+    
+   	upsSerial OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS serial" 
+    ::= { signals 5 }
+    
+    upsVersion OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS version" 
+    ::= { signals 6 }
+    
+    batTest OBJECT-TYPE
+    SYNTAX  INTEGER
+    MAX-ACCESS  write-only
+    STATUS  current
+    DESCRIPTION
+    "0 - cancel test
+    1-99 - run test to x minutes
+    100 - run test to 10 seconds
+    999 - test till charging"
+    ::= { signals 7 }
+    
+    shutdown OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  write-only
+    STATUS  current
+    DESCRIPTION
+    "Control of shut down UPS load:
+	0 - stop shut down load
+	n - shut down load in n minutes
+	n: 0.2, 0.3, .., 1, 2, .., 10"
+    ::= { signals 8 }
+	
+    intTemp OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Internal temperature" 
+    ::= { signals 9 }
+	
+    inFreq OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Input frequency, Hz" 
+    ::= { signals 10 }
+	
+    inVoltVAC OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Input voltage" 
+    ::= { signals 11 }
+	
+    outVoltVAC OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Output voltage" 
+    ::= { signals 12 }
+	
+    power OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Power, %" 
+    ::= { signals 13 }
+	
+    batCap OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Battery capacity, %" 
+    ::= { signals 14 }
+    
+    batTime OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Rest working time of battery, min" 
+    ::= { signals 15 }
+		
+    connectMonitor OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Connect status:
+	0 - normal;
+	1 - connect fail" 
+    ::= { signals 16 }
+    
+    alarms OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "bit 7 - utility fail
+	bit 6 - battery low
+	bit 5 - bypass/boost or buck active
+	bit 4 - UPS fail
+	bit 3 - UPS Type is Standby (0 is On_line)
+	bit 2 - Test in Progress
+	bit 1 - Shutdown Active
+	bit 0 - Beeper On" 
+    ::= { signals 17 }
+
+    currInput OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS input current, A" 
+    ::= { signals 18 }
+
+    currOutput OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS output current, A" 
+    ::= { signals 19 }
+
+    upsMode OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "UPS mode" 
+    ::= { signals 20 }
+
+    voltAKB OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "AKB current voltage, V" 
+    ::= { signals 21 }
+    
+    server1 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Get/set server1 for traps" 
+    ::= { signals 22 }
+    
+    server2 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Get/set server2 for traps" 
+    ::= { signals 23 }
+    
+    server3 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Get/set server3 for traps" 
+    ::= { signals 24 }
+    
+    server4 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Get/set server4 for traps" 
+    ::= { signals 25 }
+    
+    server5 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Get/set server5 for traps" 
+    ::= { signals 26 }
+    
+    whiteListRange1 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "white List Range1" 
+    ::= { signals 27 }
+    
+    whiteListRange2 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "white List Range2" 
+    ::= { signals 28 }
+    
+    whiteListRange3 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "white List Range3" 
+    ::= { signals 29 }
+    
+    whiteListRange4 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "white List Range4" 
+    ::= { signals 30 }
+    
+    whiteListRange5 OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "white List Range5" 
+    ::= { signals 31 }
+    
+    upsVoltCellMin OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "UPS voltage cell min" 
+    ::= { signals 32 }
+    
+    upsVoltCellMax OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "UPS voltage cell max" 
+    ::= { signals 33 }
+
+    voltAKBNominal OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "AKB nominal capacity, V" 
+    ::= { signals 34 } 
+
+    capAKBNominal OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "AKB norminal capacity, Ah" 
+    ::= { signals 35 } 
+
+    upsFullPower OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "UPS full power, VA" 
+    ::= { signals 36 } 
+    
+    vacAlarmHighRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VAC alarm high range" 
+    ::= { signals 37 }
+    
+    vacAlarmLowRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VAC alarm low range" 
+    ::= { signals 38 }
+    
+    vacAlarmHistRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VAC alarm hist range" 
+    ::= { signals 39 }
+
+    vacInAlarmHighRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VACin alarm high range" 
+    ::= { signals 40 }
+    
+    vacInAlarmLowRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VACin alarm low range" 
+    ::= { signals 41 }
+    
+    vacInAlarmHistRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "VACin alarm hist range" 
+    ::= { signals 42 }
+    
+    tempAlarmHighRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Temperature alarm high range" 
+    ::= { signals 43 }
+    
+    tempAlarmLowRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Temprature alarm low range" 
+    ::= { signals 44 }
+    
+    tempAlarmHistRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Temprature alarm hist range" 
+    ::= { signals 45 }
+    
+    loadAlarmHighRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Load alarm high range" 
+    ::= { signals 46 }
+    
+    loadAlarmHistRange OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Load alarm hist range" 
+    ::= { signals 47 }
+
+    sntpTimeZone OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Sntp time zone" 
+    ::= { signals 48 }
+
+    sntpState OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "SNTP synchronization state
+    0 - disable
+    1 - enable" 
+    ::= { signals 49 }
+    
+    sntpServerIp OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Sntp server IP  address" 
+    ::= { signals 50 }
+    
+    sntpLastData OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "SNTP last synchronization timestamp" 
+    ::= { signals 51 }
+    
+    dateController OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Current date, YYYY-MM-DD" 
+    ::= { signals 52 }
+    
+    timeController OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Current time, hh:mm" 
+    ::= { signals 53 }
+    
+    akbWorkTime OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Work time from AKB, minutes" 
+    ::= { signals 54 }
+
+    syslogENA OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Syslog enable,
+    0 - disable;
+    1 - enable" 
+    ::= { signals 55 }
+
+    syslogServerIP OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Syslog server IP" 
+    ::= { signals 56 }
+
+    syslogServerPort OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "Syslog server port" 
+    ::= { signals 57 }
+
+    radiusENA OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "RADIUS enable,
+    0 - disable;
+    1 - enable" 
+    ::= { signals 58 }
+
+    radiusServerIP OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "RADIUS server IP" 
+    ::= { signals 59 }
+
+    radiusServerPort OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "RADIUS server port" 
+    ::= { signals 60 }
+
+    radiusPWD OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS  current
+    DESCRIPTION
+    "RADIUS secret word" 
+    ::= { signals 61 }
+
+   	controllerSerial OBJECT-TYPE
+    SYNTAX  OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+    "Controller serial" 
+    ::= { signals 62 }
+
+-- DEVICE TRAPS
+
+     fwVersionUpdate  NOTIFICATION-TYPE
+     OBJECTS              { fwVersion }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 1 }
+
+    fwVersionUpdated  NOTIFICATION-TYPE
+     OBJECTS              { fwVersion }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 2 }
+
+     deviceRestored  NOTIFICATION-TYPE
+     OBJECTS              { restoreSignal }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 3 }
+
+    deviceRebooted  NOTIFICATION-TYPE
+     OBJECTS              { rebootSignal }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 4 }
+
+     upsModeChanged  NOTIFICATION-TYPE
+     OBJECTS              { upsMode }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 5 }
+
+     batteryTemperatureHighNorm  NOTIFICATION-TYPE
+     OBJECTS              { intTemp }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 6 }
+
+    batteryTemperatureHighAlarm  NOTIFICATION-TYPE
+     OBJECTS              { intTemp }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 7 }
+
+     batteryTemperatureLowNorm  NOTIFICATION-TYPE
+     OBJECTS              { intTemp }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 8 }
+
+     batteryTemperatureLowAlarm  NOTIFICATION-TYPE
+     OBJECTS              { intTemp }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 9 }
+	 
+     lineAlarm  NOTIFICATION-TYPE
+     OBJECTS              { inVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 10 }
+
+    lineNorm  NOTIFICATION-TYPE
+     OBJECTS              { inVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 11 } 
+
+     vacOutputLowAlarm  NOTIFICATION-TYPE
+     OBJECTS              { outVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 12 }
+
+     vacOutputLowNorm  NOTIFICATION-TYPE
+     OBJECTS              { outVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 13 } 
+
+     vacOutputHighAlarm  NOTIFICATION-TYPE
+     OBJECTS              { outVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 14 }
+
+     vacOutputHighNorm  NOTIFICATION-TYPE
+     OBJECTS              { outVoltVAC }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 15 } 
+
+     testBatRun  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 16 }
+
+     testBatStop  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 17 }
+
+     batteryFailed  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 18 }
+
+     batteryNorm  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 19 }	
+
+     lowBatAlarm  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 20 }
+
+     lowBatNorm  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 21 }
+
+     batteryConnectAlarm  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 22 }
+
+     batteryConnectNorm  NOTIFICATION-TYPE
+     OBJECTS              { batCap }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 23 }	
+	 
+     powerAlarm  NOTIFICATION-TYPE
+     OBJECTS              { power }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 24 }
+
+    powerNorm  NOTIFICATION-TYPE
+     OBJECTS              { power }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 25 }
+
+	ConnectMonitorAlarm  NOTIFICATION-TYPE
+     OBJECTS              { connectMonitor }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 26 }
+	 
+     connectMonitorNorm  NOTIFICATION-TYPE
+     OBJECTS              { connectMonitor }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 27 }
+
+	phaseAlarm  NOTIFICATION-TYPE
+     OBJECTS              { connectMonitor }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 28 }
+	 
+     phaseNorm  NOTIFICATION-TYPE
+     OBJECTS              { connectMonitor }
+     STATUS               current
+     DESCRIPTION ""
+     ::= { traps 29 }
+
+END
+

+ 19 - 6
modules/Makefile

@@ -51,10 +51,10 @@ ifeq ($(HARDWARE), bt6710)
 INCLUDES += -Iportgw
 INCLUDES += -Ids18b20
 endif
-ifneq (,$(filter $(HARDWARE),bt6709 bt6709_mts bt6711))
+ifneq (,$(filter $(HARDWARE),bt6709 bt6709_mts bt6711 bt6711_v1))
 INCLUDES += -Iwhitelist
 endif
-ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711))
+ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711 bt6711_v1))
 INCLUDES += -Iradius
 endif
 INCLUDES += -Imbedtls_api
@@ -71,10 +71,10 @@ ifeq ($(HARDWARE), bt6710)
 CSRC += $(wildcard portgw/*.c)
 CSRC += $(wildcard ds18b20/*.c)
 endif
-ifneq (,$(filter $(HARDWARE),bt6709 bt6709_mts bt6711))     
+ifneq (,$(filter $(HARDWARE),bt6709 bt6709_mts bt6711 bt6711_v1))     
 CSRC += $(wildcard whitelist/*.c)
 endif
-ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711))
+ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711 bt6711_v1))
 CSRC += $(wildcard radius/*.c)
 endif
 CSRC += $(wildcard mbedtls_api/*.c)
@@ -116,7 +116,7 @@ endif
 ifeq ($(HARDWARE), bt6710) 	
    CSRC += $(wildcard HTTP_Server/http_server.c)
 endif  
-ifneq (,$(filter $(HARDWARE),bt6707 bt6709 bt6709_mts bt6711))
+ifneq (,$(filter $(HARDWARE),bt6707 bt6709 bt6709_mts bt6711 bt6711_v1))
 	INCLUDES += -Icli
 	CSRC += $(wildcard cli/*.c)
 	INCLUDES += -ITelnet_Server
@@ -174,7 +174,7 @@ INCLUDES += -I../thirdparty/mbedTLS/include/
 
 CSRC += $(wildcard ../thirdparty/mbedTLS/library/*.c)
 
-ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711))
+ifneq (,$(filter $(HARDWARE),bt6703 bt6703_rt bt6711 bt6711_v1))
 #RADDIUS_SERVER
 
 INCLUDES += -I../thirdparty/FreeRadius/
@@ -214,6 +214,10 @@ ifeq ($(HARDWARE), bt6711)
 BUILDDIR = ../build/bt6711/$(TARGET)
 endif
 
+ifeq ($(HARDWARE), bt6711_v1)
+BUILDDIR = ../build/bt6711_v1/$(TARGET)
+endif
+
 FW_FLASH_START = $(shell awk '/USER_FLASH_FIRST_PAGE_ADDRESS/{print $$3;exit}' ../config/common_config.h )
 FW_FLASH_CRC = $(shell awk '/USER_FLASH_CRC_ADDRESS/{print $$3}' ../config/common_config.h )
 
@@ -245,6 +249,10 @@ ifeq ($(HARDWARE), bt6711)
 FW_NAME = BT_6711xx
 endif
 
+ifeq ($(HARDWARE), bt6711_v1)
+FW_NAME = BT_6711_v1
+endif
+
 -include ../Makefile.inc.stm32
 
 #Building Web UI FS
@@ -258,6 +266,11 @@ ifeq ($(HARDWARE), bt6711)
 	FSDATA_DIR = ./HTTP_Server/bt6711_fs
 endif
 
+ifeq ($(HARDWARE), bt6711_v1)
+	WUI_DIR = ../web_interface/dist/wui-11
+	FSDATA_DIR = ./HTTP_Server/bt6711_fs
+endif
+
 ifeq ($(HARDWARE), bt6707)
 	WUI_DIR = ../web_interface/dist/wui-7
 	FSDATA_DIR = ./HTTP_Server/bt6707_fs

+ 1 - 1
modules/settings_api_bt6711.c

@@ -9,7 +9,7 @@
  * XX.XX.XXXX   1.0.0    Telenkov D.A.  First release.
  *******************************************************************************
  */
-#ifdef HARDWARE_BT6711
+#if HARDWARE_BT6711 || HARDWARE_BT6711_V1
 #include "stm32f4xx.h"  
 #include "settings_api.h"
 #include "common_config.h"

+ 1 - 1
peripheral_modules/inc/spi_flash.h

@@ -20,7 +20,7 @@
 
 // SPI flash partitioning layout
 #define LOG_FLASH_SECTOR_OFFSET	4
-#ifdef HARDWARE_BT6711
+#if HARDWARE_BT6711 || HARDWARE_BT6711_V1
 // assuming 512 sectors
 #define ALARM_LOG_FLASH_SECTOR_OFFSET	174
 #define SECTOR_COUNT 170

+ 3 - 0
projects/gcc/tools/version.sh

@@ -25,6 +25,9 @@ SRC=$'#define HARDWARE_BT6710 1\r\n#include <stdio.h>\r\n#include "common_config
 elif [ "$1" = "bt6711" ];
 then
 SRC=$'#define HARDWARE_BT6711 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
+elif [ "$1" = "bt6711_v1" ];
+then
+SRC=$'#define HARDWARE_BT6711_V1 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
 fi
 SRC+=$'int main(int argc, char *argv[]) {printf("%s", VERSION);}'
 echo "$SRC" > $BIN.c