change defines HARDWARE_BT6702/BT6706/BT6708 - > HARDWARE_BT6703/BT6707/BT6709

Makefile

@@ -36,33 +36,33 @@ erase:
 iapflash:
 	st-flash --reset write output/iap.bin 0x8000000
 
-fwflash_6702:	
-	st-flash --reset write output/stm32bt6702.bin 0x8020000
+fwflash_6703:	
+	st-flash --reset write output/stm32bt6703.bin 0x8020000
 
-fullflash_6702:
+fullflash_6703:
 	st-flash --reset write output/iap.bin 0x8000000
 	sleep 1
-	st-flash --reset write output/stm32bt6702.bin 0x8020000
+	st-flash --reset write output/stm32bt6703.bin 0x8020000
 	
-fwflash_6706:	
-	st-flash --reset write output/stm32bt6706.bin 0x8020000
+fwflash_6707:	
+	st-flash --reset write output/stm32bt6707.bin 0x8020000
 
-fullflash_6706:
+fullflash_6707:
 	st-flash --reset write output/iap.bin 0x8000000
 	sleep 1
-	st-flash --reset write output/stm32bt6706.bin 0x8020000	
+	st-flash --reset write output/stm32bt6707.bin 0x8020000	
 	
-fullflash_6708:
+fullflash_6709:
 	st-flash --reset write output/iap.bin 0x8000000
 	sleep 1
-	st-flash --reset write output/stm32bt6708.bin 0x8020000	
+	st-flash --reset write output/stm32bt6709.bin 0x8020000	
 
-release_6702:
-	$(MAKE) -C modules HARDWARE=bt6702 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+release_6703:
+	$(MAKE) -C modules HARDWARE=bt6703 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 	
-release_6706:
-	$(MAKE) -C modules HARDWARE=bt6706 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+release_6707:
+	$(MAKE) -C modules HARDWARE=bt6707 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 
-release_6708:
-	$(MAKE) -C modules HARDWARE=bt6708 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+release_6709:
+	$(MAKE) -C modules HARDWARE=bt6709 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 

config/board.h

@@ -1,12 +1,12 @@
 #ifndef BOARD_H
 #define BOARD_H
 
-#if defined HARDWARE_BT6702
-#include "board_bt6702.h"
-#elif defined HARDWARE_BT6706
-#include "board_bt6706.h"
-#elif defined HARDWARE_BT6708
-#include "board_bt6708.h"
+#if defined HARDWARE_BT6703
+#include "board_bt6703.h"
+#elif defined HARDWARE_BT6707
+#include "board_bt6707.h"
+#elif defined HARDWARE_BT6709
+#include "board_bt6709.h"
 #endif
 
 #define EXPAND_AS_ENUM(name, ...) name,

config/board_bt6702.h → config/board_bt6703.h

@@ -1,5 +1,5 @@
-#ifndef BOARD_BT6702_H
-#define BOARD_BT6702_H
+#ifndef BOARD_BT6703_H
+#define BOARD_BT6703_H
 
 #define SERVICE_RS232_UART_TABLE(X)     \
 X( SERVICE_TXDINT,   GPIOD,   5, AF_USART1) \

config/board_bt6706.h → config/board_bt6707.h

@@ -5,8 +5,8 @@
  *      Author: balbekova
  */
 
-#ifndef BOARD_BT6706_H_
-#define BOARD_BT6706_H_
+#ifndef BOARD_BT6707_H_
+#define BOARD_BT6707_H_
 
 #define SERVICE_RS232_UART_TABLE(X)     \
 X( SERVICE_TXDINT,   GPIOD,   5, AF_USART1) \

config/board_bt6708.h → config/board_bt6709.h

@@ -1,5 +1,5 @@
-#ifndef BOARD_BT6708_H
-#define BOARD_BT6708_H
+#ifndef BOARD_BT6709_H
+#define BOARD_BT6709_H
 
 #define SERVICE_RS232_UART_TABLE(X)     \
 X( SERVICE_TXDINT,   GPIOD,   5, AF_USART1) \

config/common_config.h

@@ -19,12 +19,12 @@
   * @brief  Маркер ревизии платы для валидации *.bin файла
   *
   */
-#ifdef HARDWARE_BT6706
-#define HW_REV                          "BT-6706"
-#elif HARDWARE_BT6702
-#define HW_REV                          "BT-6702"
-#elif HARDWARE_BT6708
-#define HW_REV                          "BT-6708"
+#ifdef HARDWARE_BT6707
+#define HW_REV                          "BT-6707"
+#elif HARDWARE_BT6703
+#define HW_REV                          "BT-6703"
+#elif HARDWARE_BT6709
+#define HW_REV                          "BT-6709"
 #endif
 
 
@@ -36,12 +36,12 @@
   * @brief  Версия прошивки
   */
 
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
+#define VERSION                         "1.0"
+#elif HARDWARE_BT6703
+#define VERSION                         "1.0"
+#elif HARDWARE_BT6709
 #define VERSION                         "1.0"
-#elif HARDWARE_BT6702
-#define VERSION                         "1.1"
-#elif HARDWARE_BT6708
-#define VERSION                         "1.3"
 #endif
 
 /**
@@ -129,14 +129,14 @@
 /**
   * @brief  SNMP протокол
   */
-//#if defined HARDWARE_BT6702
+//#if defined HARDWARE_BT6703
 #define SNMP_ENABLE
 //#endif
 
 /**
   * @brief  UPS
   */
-//#if defined HARDWARE_BT6702
+//#if defined HARDWARE_BT6703
 #define UPS_ENABLE
 //#endif
     

modules/Ethernet/lwipopts.h

@@ -285,7 +285,7 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
    ----------- HOOK options ----------
    -----------------------------------
 */
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
 #define LWIP_HOOK_FILENAME "lwip_hook_ip4_input.h"
 #endif
 

modules/Ethernet/netconf.c

@@ -331,7 +331,7 @@ void vTaskWebReinit(void * pvParameters)
 	  strcpy(sSettings.sWebParams.ip,   sSettings.sWebTempParams.ip);
 	  strcpy(sSettings.sWebParams.gate, sSettings.sWebTempParams.gate);
 	  strcpy(sSettings.sWebParams.mask, sSettings.sWebTempParams.mask);
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 	  for(uint8_t i = 0; i < MAX_WHITE_LIST; i++){
 		  strcpy(sSettings.sWhiteList[i].ip_range, sSettings.sWhiteListTemp[i].ip_range);
 		  sSettings.sWhiteList[i].ip = sSettings.sWhiteListTemp[i].ip;
@@ -402,7 +402,7 @@ bool GetStateWebReinit(void)
 	SetWebReinitFlag(true);
 	return true;
   }
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
   /* Изменился диапазон доверительных хостов? */
   for(uint8_t i = 0; i < MAX_WHITE_LIST; i++){
 	  if (strstr(sSettings.sWhiteList[i].ip_range, sSettings.sWhiteListTemp[i].ip_range) == 0)

modules/Ethernet/private_mib.c → modules/Ethernet/private_mib_bt6703.c

@@ -1,4 +1,4 @@
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 
 #include "stm32f4xx.h"  
 #include "private_mib.h"
@@ -34,62 +34,62 @@ static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t le
 static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
 
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.18  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.18  */
 static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.17  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.17  */
 static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.16  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.16  */
 static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.15  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.15  */
 static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.14  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.14  */
 static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.13  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.13  */
 static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.12  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.12  */
 static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.11  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.11  */
 static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.10  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.10  */
 static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.9  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.9  */
 static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.8  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.8  */
 static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.7  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.7  */
 static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.6  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.6  */
 static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.5  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.5  */
 static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.4  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.4  */
 static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.3  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.3  */
 static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.2  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.2  */
 static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.3.1.1  */
+/* signal .1.3.6.1.4.1.41752.911.6.1.1  */
 static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
 
-// signals .1.3.6.1.4.1.41752.911.3.1 
+// signals .1.3.6.1.4.1.41752.911.6.1 
 static const struct snmp_node* const signals_nodes[] = {
 /*  &test_signal.node.node,
   &test_signal2.node.node,
@@ -115,15 +115,15 @@ static const struct snmp_node* const signals_nodes[] = {
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.3 
-static const struct snmp_node* const bt6702_nodes[] = {
+// bt_6702 .1.3.6.1.4.1.41752.911.6 
+static const struct snmp_node* const bt6703_nodes[] = {
   &signals_node.node
 };
-static const struct snmp_tree_node bt6702_node = SNMP_CREATE_TREE_NODE(3, bt6702_nodes);
+static const struct snmp_tree_node bt6703_node = SNMP_CREATE_TREE_NODE(6, bt6703_nodes);
 
 // swt .1.3.6.1.4.1.41752.911 
 static const struct snmp_node* const swt_nodes[] = {
-  &bt6702_node.node
+  &bt6703_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 

modules/Ethernet/private_mib_bt6706.c → modules/Ethernet/private_mib_bt6707.c

@@ -1,12 +1,12 @@
 /*
- * private_mib_bt6706.c
+ * private_mib_bt6707.c
  *
  *  Created on: 17.11.2017
  *      Author: balbekova
  */
 
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 
 #include "stm32f4xx.h"
 #include "private_mib.h"
@@ -42,65 +42,65 @@ static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t le
 static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
 
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.19  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.19  */
 static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE_READONLY(19, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.18  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.18  */
 static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.17  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.17  */
 static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.16  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.16  */
 static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.15  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.15  */
 static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.14  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.14  */
 static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.13  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.13  */
 static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.12  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.12  */
 static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.11  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.11  */
 static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.9  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.9  */
 static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.9  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.9  */
 static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE(9, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.8  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.8  */
 static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.7  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.7  */
 static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.6  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.6  */
 static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.5  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.5  */
 static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.4  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.4  */
 static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.3  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.3  */
 static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.2  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.2  */
 static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.4.1.1  */
+/* signal .1.3.6.1.4.1.41752.911.7.1.1  */
 static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
 
-// signals .1.3.6.1.4.1.41752.911.4.1
+// signals .1.3.6.1.4.1.41752.911.7.1
 static const struct snmp_node* const signals_nodes[] = {
 	&signal1.node.node,
 	&signal2.node.node,
@@ -124,15 +124,15 @@ static const struct snmp_node* const signals_nodes[] = {
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.4
-static const struct snmp_node* const bt6706_nodes[] = {
+// bt_6702 .1.3.6.1.4.1.41752.911.7
+static const struct snmp_node* const bt6707_nodes[] = {
   &signals_node.node
 };
-static const struct snmp_tree_node bt6706_node = SNMP_CREATE_TREE_NODE(4, bt6706_nodes);
+static const struct snmp_tree_node bt6707_node = SNMP_CREATE_TREE_NODE(7, bt6707_nodes);
 
 // swt .1.3.6.1.4.1.41752.911
 static const struct snmp_node* const swt_nodes[] = {
-  &bt6706_node.node
+  &bt6707_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 

modules/Ethernet/private_mib_bt6708.c → modules/Ethernet/private_mib_bt6709.c

@@ -1,12 +1,12 @@
 /*
- * private_mib_bt6708.c
+ * private_mib_bt6709.c
  *
  *  Created on: 03.10.2018
  *      Author: balbekova
  */
 
 
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
 
 #include "stm32f4xx.h"
 #include "private_mib.h"
@@ -45,140 +45,140 @@ static s16_t signal_get_value(struct snmp_node_instance* instance, void* value);
 static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
 static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.44  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.44  */
 static const struct snmp_scalar_node signal44 = SNMP_SCALAR_CREATE_NODE_READONLY(44, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.43  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.43  */
 static const struct snmp_scalar_node signal43 = SNMP_SCALAR_CREATE_NODE(43, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.42  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.42  */
 static const struct snmp_scalar_node signal42 = SNMP_SCALAR_CREATE_NODE(42, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.41  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.41  */
 static const struct snmp_scalar_node signal41 = SNMP_SCALAR_CREATE_NODE(41, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.40  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.40  */
 static const struct snmp_scalar_node signal40 = SNMP_SCALAR_CREATE_NODE(40, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.39  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.39  */
 static const struct snmp_scalar_node signal39 = SNMP_SCALAR_CREATE_NODE(39, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.38  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.38  */
 static const struct snmp_scalar_node signal38 = SNMP_SCALAR_CREATE_NODE(38, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.37  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.37  */
 static const struct snmp_scalar_node signal37 = SNMP_SCALAR_CREATE_NODE(37, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.36  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.36  */
 static const struct snmp_scalar_node signal36 = SNMP_SCALAR_CREATE_NODE(36, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.22  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.22  */
 static const struct snmp_scalar_node signal35 = SNMP_SCALAR_CREATE_NODE(35, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.34  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.34  */
 static const struct snmp_scalar_node signal34 = SNMP_SCALAR_CREATE_NODE(34, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.33  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.33  */
 static const struct snmp_scalar_node signal33 = SNMP_SCALAR_CREATE_NODE(33, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.32  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.32  */
 static const struct snmp_scalar_node signal32 = SNMP_SCALAR_CREATE_NODE(32, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.31  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.31  */
 static const struct snmp_scalar_node signal31 = SNMP_SCALAR_CREATE_NODE(31, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.22  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.22  */
 static const struct snmp_scalar_node signal30 = SNMP_SCALAR_CREATE_NODE(30, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.29  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.29  */
 static const struct snmp_scalar_node signal29 = SNMP_SCALAR_CREATE_NODE(29, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.28  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.28  */
 static const struct snmp_scalar_node signal28 = SNMP_SCALAR_CREATE_NODE(28, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.27  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.27  */
 static const struct snmp_scalar_node signal27 = SNMP_SCALAR_CREATE_NODE_READONLY(27, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.26  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.26  */
 static const struct snmp_scalar_node signal26 = SNMP_SCALAR_CREATE_NODE_READONLY(26, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.25  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.25  */
 static const struct snmp_scalar_node signal25 = SNMP_SCALAR_CREATE_NODE_READONLY(25, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.24  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.24  */
 static const struct snmp_scalar_node signal24 = SNMP_SCALAR_CREATE_NODE_READONLY(24, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.23  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.23  */
 static const struct snmp_scalar_node signal23 = SNMP_SCALAR_CREATE_NODE_READONLY(23, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.22  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.22  */
 static const struct snmp_scalar_node signal22 = SNMP_SCALAR_CREATE_NODE(22, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.21  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.21  */
 static const struct snmp_scalar_node signal21 = SNMP_SCALAR_CREATE_NODE(21, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.20  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.20  */
 static const struct snmp_scalar_node signal20 = SNMP_SCALAR_CREATE_NODE(20, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.19  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.19  */
 static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE(19, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.18  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.18  */
 static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE(18, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.17  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.17  */
 static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.16  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.16  */
 static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.15  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.15  */
 static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.14  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.14  */
 static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.13  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.13  */
 static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.12  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.12  */
 static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.11  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.11  */
 static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.10  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.10  */
 static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.9  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.9  */
 static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.8  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.8  */
 static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.7  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.7  */
 static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.6  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.6  */
 static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE_READONLY(6, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.5  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.5  */
 static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE_READONLY(5, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.4  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.4  */
 static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.3  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.3  */
 static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.2  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.2  */
 static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
-/* signal .1.3.6.1.4.1.41752.911.5.1.1  */
+/* signal .1.3.6.1.4.1.41752.911.8.1.1  */
 static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
 
 
-// signals .1.3.6.1.4.1.41752.911.5.1
+// signals .1.3.6.1.4.1.41752.911.8.1
 static const struct snmp_node* const signals_nodes[] = {
 	&signal1.node.node,
 	&signal2.node.node,
@@ -227,15 +227,15 @@ static const struct snmp_node* const signals_nodes[] = {
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.5
-static const struct snmp_node* const bt6708_nodes[] = {
+// bt_6702 .1.3.6.1.4.1.41752.911.8
+static const struct snmp_node* const bt6709_nodes[] = {
   &signals_node.node
 };
-static const struct snmp_tree_node bt6708_node = SNMP_CREATE_TREE_NODE(5, bt6708_nodes);
+static const struct snmp_tree_node bt6709_node = SNMP_CREATE_TREE_NODE(8, bt6709_nodes);
 
 // swt .1.3.6.1.4.1.41752.911
 static const struct snmp_node* const swt_nodes[] = {
-  &bt6708_node.node
+  &bt6709_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 

modules/Ethernet/snmp_api.c

@@ -274,12 +274,12 @@ void SNMP_SetManagerIP(char *ip)
   */
 void SNMP_SetObjID(void)
 {
-#ifdef HARDWARE_BT6702
-  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 3}};
-#elif HARDWARE_BT6706
-  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 4}};
-#elif HARDWARE_BT6708
-  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 5}};
+#ifdef HARDWARE_BT6703
+  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 6}};
+#elif HARDWARE_BT6707
+  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 7}};
+#elif HARDWARE_BT6709
+  static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, 8}};
 #endif
   
   snmp_set_device_enterprise_oid(&my_object_id);

modules/Ethernet/trap_api.c

@@ -76,12 +76,12 @@ void SNMP_InitTrapsBase(void)
   traps[DEVICE_REBOOTED].trapEnable = true;
   traps[DEVICE_REBOOTED].handle = GetVersionStr;//GetReboot; /* RebootSignal */
   
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   /* 5. DI0Norm */ // +
    traps[DI0_NORM].trapId = DI0_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[DI0_NORM].varbindId = 9;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[DI0_NORM].varbindId = 10;
 #endif
    traps[DI0_NORM].trapEnable = true;
@@ -89,9 +89,9 @@ void SNMP_InitTrapsBase(void)
 
    /* 6. DI0Alarm */ // +
    traps[DI0_ALARM].trapId = DI0_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[DI0_ALARM].varbindId = 9;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[DI0_ALARM].varbindId = 10;
 #endif
    traps[DI0_ALARM].trapEnable = true;
@@ -109,7 +109,7 @@ void SNMP_InitTrapsBase(void)
     traps[DO1_TOGGLED].trapEnable = true;
     traps[DO1_TOGGLED].handle = GetDOUT1StatusStr; /* State DO1 */
 
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     /* 8. DO1Toggle */ // +
     traps[DO2_TOGGLED].trapId = DO2_TOGGLED;
     traps[DO2_TOGGLED].varbindId = 7;
@@ -120,11 +120,11 @@ void SNMP_InitTrapsBase(void)
 
   /* 9. BatteryTemperatureNorm */ // +
   traps[BATTERY_HIGH_TEMPERATURE_NORM].trapId = BATTERY_HIGH_TEMPERATURE_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_HIGH_TEMPERATURE_NORM].varbindId = 10;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_HIGH_TEMPERATURE_NORM].varbindId = 11;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[BATTERY_HIGH_TEMPERATURE_NORM].varbindId = 9;
 #endif
   traps[BATTERY_HIGH_TEMPERATURE_NORM].trapEnable = true;
@@ -132,9 +132,9 @@ void SNMP_InitTrapsBase(void)
   
   /* 10. BatteryTemperatureAlarm */ // +
   traps[BATTERY_HIGH_TEMPERATURE_ALARM].trapId = BATTERY_HIGH_TEMPERATURE_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_HIGH_TEMPERATURE_ALARM].varbindId = 10;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_HIGH_TEMPERATURE_ALARM].varbindId = 11;
 #elif defined HARDWARE_BT608
   traps[BATTERY_HIGH_TEMPERATURE_ALARM].varbindId = 9;
@@ -144,11 +144,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 11. LineAlarm */ // +
   traps[LINE_ALARM].trapId = LINE_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[LINE_ALARM].varbindId = 12;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[LINE_ALARM].varbindId = 13;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[LINE_ALARM].varbindId = 11;
 #endif
   traps[LINE_ALARM].trapEnable = true;
@@ -156,11 +156,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 12. LineNorm */ // +
   traps[LINE_NORM].trapId = LINE_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[LINE_NORM].varbindId = 12;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[LINE_NORM].varbindId = 13;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[LINE_NORM].varbindId = 11;
 #endif
   traps[LINE_NORM].trapEnable = true;
@@ -168,11 +168,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 13. LowBatAlarm */ // +
   traps[LOW_BAT_ALARM].trapId = LOW_BAT_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[LOW_BAT_ALARM].varbindId = 15;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[LOW_BAT_ALARM].varbindId = 16;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[LOW_BAT_ALARM].varbindId = 14;
 #endif
   traps[LOW_BAT_ALARM].trapEnable = true;
@@ -180,11 +180,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 14. LowBatNorm */ // +
   traps[LOW_BAT_NORM].trapId = LOW_BAT_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[LOW_BAT_NORM].varbindId = 15;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[LOW_BAT_NORM].varbindId = 16;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[LOW_BAT_NORM].varbindId = 14;
 #endif
   traps[LOW_BAT_NORM].trapEnable = true;
@@ -192,11 +192,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 15. PowerAlarm */ // +
   traps[POWER_ALARM].trapId = POWER_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[POWER_ALARM].varbindId = 14;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[POWER_ALARM].varbindId = 15;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[POWER_ALARM].varbindId = 13;
 #endif
   traps[POWER_ALARM].trapEnable = true;
@@ -204,11 +204,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 16. PowerNorm */ // +
   traps[POWER_NORM].trapId = POWER_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[POWER_NORM].varbindId = 14;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[POWER_NORM].varbindId = 15;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[POWER_NORM].varbindId = 13;
 #endif
   traps[POWER_NORM].trapEnable = true;
@@ -216,11 +216,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 17. ConnectMonitorAlarm */ //
   traps[CONNECT_MONITOR_ALARM].trapId = CONNECT_MONITOR_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[CONNECT_MONITOR_ALARM].varbindId = 17;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[CONNECT_MONITOR_ALARM].varbindId = 18;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[CONNECT_MONITOR_ALARM].varbindId = 16;
 #endif
   traps[CONNECT_MONITOR_ALARM].trapEnable = true;
@@ -228,11 +228,11 @@ void SNMP_InitTrapsBase(void)
   
   /* 18. ConnectMonitorNorm */ //
   traps[CONNECT_MONITOR_NORM].trapId = CONNECT_MONITOR_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[CONNECT_MONITOR_NORM].varbindId = 17;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[CONNECT_MONITOR_NORM].varbindId = 18;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[CONNECT_MONITOR_NORM].varbindId = 16;
 #endif
   traps[CONNECT_MONITOR_NORM].trapEnable = true;
@@ -240,11 +240,11 @@ void SNMP_InitTrapsBase(void)
 
   /* 19. BatteryConnectAlarm */ // +
   traps[BATTERY_CONNECT_ALARM].trapId = BATTERY_CONNECT_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_CONNECT_ALARM].varbindId = 15;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_CONNECT_ALARM].varbindId = 16;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[BATTERY_CONNECT_ALARM].varbindId = 14;
 #endif
   traps[BATTERY_CONNECT_ALARM].trapEnable = true;
@@ -252,11 +252,11 @@ void SNMP_InitTrapsBase(void)
 
   /* 20. BatteryConnectNorm */ // +
   traps[BATTERY_CONNECT_NORM].trapId = BATTERY_CONNECT_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_CONNECT_NORM].varbindId = 15;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_CONNECT_NORM].varbindId = 16;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[BATTERY_CONNECT_NORM].varbindId = 14;
 #endif
   traps[BATTERY_CONNECT_NORM].trapEnable = true;
@@ -264,11 +264,11 @@ void SNMP_InitTrapsBase(void)
 
   /* 21. BatteryTemperatureNorm */ // +
   traps[BATTERY_LOW_TEMPERATURE_NORM].trapId = BATTERY_LOW_TEMPERATURE_NORM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_LOW_TEMPERATURE_NORM].varbindId = 10;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_HIGH_TEMPERATURE_NORM].varbindId = 11;
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
   traps[BATTERY_HIGH_TEMPERATURE_NORM].varbindId = 9;
 #endif
   traps[BATTERY_LOW_TEMPERATURE_NORM].trapEnable = true;
@@ -276,9 +276,9 @@ void SNMP_InitTrapsBase(void)
 
   /* 22. BatteryTemperatureAlarm */ // +
   traps[BATTERY_LOW_TEMPERATURE_ALARM].trapId = BATTERY_HIGH_TEMPERATURE_ALARM;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   traps[BATTERY_LOW_TEMPERATURE_ALARM].varbindId = 10;
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
   traps[BATTERY_LOW_TEMPERATURE_ALARM].varbindId = 11;
 #elif defined HARDWARE_BT608
   traps[BATTERY_LOW_TEMPERATURE_ALARM].varbindId = 9;
@@ -335,13 +335,13 @@ uint32_t snmp_time = 0;
 
 struct snmp_obj_id  mib2_base_oid_systime ={ 9, { 1, 3, 6, 1, 2, 1, 1, 3, 0 }};
 struct snmp_obj_id  trap_oid = {11, {1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0}};
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 3, 2, 1}};
 struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 3, 1, 1}};
-#elif defined HARDWARE_BT6706
+#elif defined HARDWARE_BT6707
 struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 4, 2, 1}};
 struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 4, 1, 1}};
-#elif defined HARDWARE_BT6708
+#elif defined HARDWARE_BT6709
 struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 5, 2, 1}};
 struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 911, 5, 1, 1}};
 #endif

modules/Ethernet/trap_api.h

@@ -29,12 +29,12 @@ typedef enum
   FW_VERSION_UPDATED,
   DEVICE_RESTORED,
   DEVICE_REBOOTED,
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   DI0_NORM,
   DI0_ALARM,
   DO0_TOGGLED,
   DO1_TOGGLED,
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
   DO2_TOGGLED,
 #endif
 #endif

modules/HTTP_Server/http_server.c

@@ -1,4 +1,4 @@
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 
 #include "lwip/arch.h"
 #include "lwip/api.h"
@@ -9,9 +9,9 @@
 #include "parameters.h"
 #include "urlcode.h"
 #include "trap_params.h"
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 #include "bt6706_fs/fsdata.c"
-#elif HARDWARE_BT6708
+#elif HARDWARE_BT6709
 #include "bt6708_fs/fsdata.c"
 #endif
 #include "settings_api.h"
@@ -948,7 +948,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     SetManagerIp5(value);
     memset(value, 0, len);
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
     /* White list */
     const char *white_list_set[] = {
         "wtl_ip1=",
@@ -1000,7 +1000,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
         memset(value, 0, len);
     }
     memset(value, 0, len);
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
     // Параметры реле и сухих контактов
     GetParamValue(buf, "di1=", value, &valueLen);
     SetDINTypeActStr(value, 0);

modules/HTTP_Server/http_server.h

@@ -1,7 +1,7 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 
 #include "lwip/api.h"
 #include "mbedtls/ssl.h"

modules/HTTP_Server/my_ssl_server.c

@@ -4,7 +4,7 @@
  *  Created on: 08.11.2017
  *      Author: balbekova
  */
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 
 #include "lwip/opt.h"
 #include "lwip/arch.h"

modules/HTTP_Server/my_ssl_server.h

@@ -4,7 +4,7 @@
  *  Created on: 08.11.2017
  *      Author: balbekova
  */
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 
 #ifndef MY_SSL_SERVER_H_
 #define MY_SSL_SERVER_H_

modules/HTTP_Server/web_params_api.c

@@ -90,7 +90,7 @@ char *HTTP_GetParamsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t le
     strcat(bufOut, "\",\"bat_time_left\":\"");
     strncat(bufOut, str, len);
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 
     GetDINStatusStr(str, &len, 0);
     strcat(bufOut, "\",\"di1\":\"");
@@ -104,7 +104,7 @@ char *HTTP_GetParamsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t le
     strcat(bufOut, "\",\"ro2\":\"");
     strncat(bufOut, str, len);
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
     GetDOUTStatusStr(str, &len, 2);
     strcat(bufOut, "\",\"ro3\":\"");
     strncat(bufOut, str, len);
@@ -184,7 +184,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     strcat(bufOut, "\",\"managerIP5\":\"");
     strncat(bufOut, str, len);
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
     /*Параметры реле и сухих контактов*/
     GetDINTypeActStr(str, &len, 0);
     strcat(bufOut, "\",\"di1\":\"");
@@ -198,7 +198,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     strcat(bufOut, "\",\"ro2\":\"");
     strncat(bufOut, str, len);
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
     GetROTypeActStr(str, &len, 2);
     strcat(bufOut, "\",\"ro3\":\"");
     strncat(bufOut, str, len);
@@ -222,7 +222,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     strcat(bufOut, "\",\"dhcp\":");
     strncat(bufOut, str, len);
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
     GetTelnetPortStr(str, &len);
     strcat(bufOut, ",\"tn_port\":\"");
     strncat(bufOut, str, len);
@@ -232,7 +232,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     strncat(bufOut, str, len);
 #endif
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
     GetAuthEnableStateStr(str, &len);
     strcat(bufOut, ",\"swauth\":");
     strncat(bufOut, str, len);
@@ -259,7 +259,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     strncat(bufOut, str, len);
 #endif
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
     /* White list */
     const char *white_list_js[] = {
         ",\"wtl_ip1\":\"",
@@ -314,7 +314,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint32_t
     GetUPSVoltCellMaxStr(str, &len);
     strcat(bufOut, "\",\"ups_cell_max\":\"");
     strncat(bufOut, str, len);
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
     GetVACAlarmHighRangeStr(str, &len);
     strcat(bufOut, "\",\"mainvolt_high\":\"");
     strncat(bufOut, str, len);
@@ -618,7 +618,7 @@ void HTTP_SaveSettings(void)
 
     SETTINGS_Save();
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
     if (telnet_act) {
         log_event_data(LOG_SETTING_SAVE, name_login_telnet);
     } else
@@ -677,7 +677,7 @@ void vTaskReboot(void *pvParameters)
 
         if (mode) {
             SNMP_SendUserTrap(FW_VERSION_UPDATE);
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
             if (telnet_act) {
                 log_event_data(LOG_UPDATE_SOFT, name_login_telnet);
             } else

modules/Makefile

@@ -47,10 +47,10 @@ INCLUDES += -Icommon
 INCLUDES += -Imonitor
 INCLUDES += -Ilog
 INCLUDES += -Itesting
-ifeq ($(HARDWARE), bt6708)
+ifeq ($(HARDWARE), bt6709)
 INCLUDES += -Iwhitelist
 endif
-ifeq ($(HARDWARE), bt6702)
+ifeq ($(HARDWARE), bt6703)
 INCLUDES += -Iradius
 endif
 INCLUDES += -Imbedtls_api
@@ -63,10 +63,10 @@ CSRC += $(wildcard common/*.c)
 CSRC += $(wildcard monitor/*.c)
 CSRC += $(wildcard log/*.c)
 CSRC += $(wildcard testing/*.c)
-ifeq ($(HARDWARE), bt6708)     
+ifeq ($(HARDWARE), bt6709)     
 CSRC += $(wildcard whitelist/*.c)
 endif
-ifeq ($(HARDWARE), bt6702)
+ifeq ($(HARDWARE), bt6703)
 CSRC += $(wildcard radius/*.c)
 endif
 CSRC += $(wildcard mbedtls_api/*.c)
@@ -99,11 +99,10 @@ CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
     INCLUDES += -IEthernet
  # INCLUDES += -I../stm32/stm32f4x7_ethernet 
  	INCLUDES += -ISTM32F4x7_ETH_Driver
-ifeq ($(HARDWARE), bt6702) 	
+ifeq ($(HARDWARE), bt6703) 	
    CSRC += $(wildcard HTTP_Server/my_ssl_server.c)
-endif
-#ifeq ($(HARDWARE), bt6706)  
-ifneq (,$(filter $(HARDWARE),bt6706 bt6708))
+endif  
+ifneq (,$(filter $(HARDWARE),bt6707 bt6709))
       INCLUDES += -ITelnet_Server 
       CSRC += $(wildcard HTTP_Server/http_server.c)
       CSRC += $(wildcard Telnet_Server/*.c)
@@ -134,7 +133,7 @@ INCLUDES += -I../thirdparty/mbedTLS/include/
 
 CSRC += $(wildcard ../thirdparty/mbedTLS/library/*.c)
 
-ifeq ($(HARDWARE), bt6702)
+ifeq ($(HARDWARE), bt6703)
 #RADDIUS_SERVER
 
 INCLUDES += -I../thirdparty/FreeRadius/
@@ -146,49 +145,49 @@ endif
     
 CFLAGS += -DUSE_STDPERIPH_DRIVER -DSTM32F40_41xxx -DLOG_ENABLE -DMBEDTLS_CONFIG_FILE='<mbedtls_config.h>'
 
-ifeq ($(HARDWARE), bt6702)
-BUILDDIR = ../build/bt6702/$(TARGET)
+ifeq ($(HARDWARE), bt6703)
+BUILDDIR = ../build/bt6703/$(TARGET)
 endif
 
-ifeq ($(HARDWARE), bt6706)
-BUILDDIR = ../build/bt6706/$(TARGET)
+ifeq ($(HARDWARE), bt6707)
+BUILDDIR = ../build/bt6707/$(TARGET)
 endif
 
-ifeq ($(HARDWARE), bt6708)
-BUILDDIR = ../build/bt6708/$(TARGET)
+ifeq ($(HARDWARE), bt6709)
+BUILDDIR = ../build/bt6709/$(TARGET)
 endif
 
 FW_FLASH_START = $(shell awk '/USER_FLASH_FIRST_PAGE_ADDRESS/{print $$3}' ../config/common_config.h )
 FW_FLASH_CRC = $(shell awk '/USER_FLASH_CRC_ADDRESS/{print $$3}' ../config/common_config.h )
 
-ifeq ($(HARDWARE), bt6702)
-FW_NAME = BT_6702xx
+ifeq ($(HARDWARE), bt6703)
+FW_NAME = BT_6703xx
 endif
 
-ifeq ($(HARDWARE), bt6706)
-FW_NAME = BT_6706xx
+ifeq ($(HARDWARE), bt6707)
+FW_NAME = BT_6707xx
 endif
 
-ifeq ($(HARDWARE), bt6708)
-FW_NAME = BT_6708xx
+ifeq ($(HARDWARE), bt6709)
+FW_NAME = BT_6709xx
 endif
 
 -include ../Makefile.inc.stm32
 
 #Building Web UI FS
-ifeq ($(HARDWARE), bt6706)
+ifeq ($(HARDWARE), bt6707)
 	WUI_DIR = ../web_interface/dist/wui-6
-	FSDATA_DIR = ./HTTP_Server/bt6706_fs
+	FSDATA_DIR = ./HTTP_Server/bt6707_fs
 endif
 
-ifeq ($(HARDWARE), bt6708)
+ifeq ($(HARDWARE), bt6709)
 	WUI_DIR = ../web_interface/dist/wui-8
-	FSDATA_DIR = ./HTTP_Server/bt6708_fs
+	FSDATA_DIR = ./HTTP_Server/bt6709_fs
 endif
 
-ifeq ($(HARDWARE), bt6702)
+ifeq ($(HARDWARE), bt6703)
 	WUI_DIR = ../web_interface/dist/wui
-	FSDATA_DIR = ./HTTP_Server/bt6702_fs
+	FSDATA_DIR = ./HTTP_Server/bt6703_fs
 endif
 
 $(FSDATA_DIR)/fsdata.c: $(WUI_DIR)/*

modules/Telnet_Server/CLI_Commands.c

@@ -196,7 +196,7 @@ static portBASE_TYPE prvTaskAKBCommand( int8_t *pcWriteBuffer, size_t xWriteBuff
  */
 static portBASE_TYPE prvTaskAlarmCommand( int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString );
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 /*
  * Implements the whitelist command.
  */
@@ -345,7 +345,7 @@ static const CLI_Command_Definition_t prvAlarmCommandDefinition =
 	-1 /* The user can enter any number of commands. */
 };
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 /* Structure that defines the "whitelist" command line command.   This
 generates a table that shows how much run time each task has */
 static const CLI_Command_Definition_t prvWhiteListCommandDefinition =
@@ -406,7 +406,7 @@ static const CLI_Command_Definition_t prvSensorCommandDefinition =
 {
 	( const int8_t * const ) "sensor", /* The command string to type. */
 	( const int8_t * const ) "\tsensor info: вывод параметров системы (выход из режима Ctrl+C далее Enter)\r\n"
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 								"\tsensor 	setup DI <num> <state>: установка нормального состояния сухого контакта:\r\n"
 								"\t\t\t\t0 - разомкнутое состояние\r\n"
 								"\t\t\t\t1 - замкнутое состояние\r\n"
@@ -473,7 +473,7 @@ void vRegisterCLICommands( void )
 	FreeRTOS_CLIRegisterCommand( &prvSNMPCommandDefinition );
 	FreeRTOS_CLIRegisterCommand( &prvAKBCommandDefinition );
 	FreeRTOS_CLIRegisterCommand( &prvAlarmCommandDefinition );
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 	FreeRTOS_CLIRegisterCommand( &prvWhiteListCommandDefinition );
 #endif
 	FreeRTOS_CLIRegisterCommand( &prvUserCommandDefinition );
@@ -1688,7 +1688,7 @@ static portBASE_TYPE prvTaskAlarmCommand( int8_t *pcWriteBuffer, size_t xWriteBu
 	return xReturn;
 }
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 /*
  * Implements the whitelist command.
  */
@@ -1964,7 +1964,7 @@ static portBASE_TYPE prvTaskConfigCommand( int8_t *pcWriteBuffer, size_t xWriteB
 				strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInfoTableHeader, strlen( ( char * ) pcInfoTableHeader ) );
 				snmp_config_param(pcWriteBuffer);
 				break;
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 			case PARAM_CONFIG_INOUTS:
 				inouts_config_param(pcWriteBuffer);
 				break;
@@ -1975,7 +1975,7 @@ static portBASE_TYPE prvTaskConfigCommand( int8_t *pcWriteBuffer, size_t xWriteB
 			case PARAM_CONFIG_ALARM:
 				alarm_config_param(pcWriteBuffer);
 				break;
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 			case PARAM_CONFIG_WHITELIST:
 				whitelist_config_param(pcWriteBuffer);
 				break;
@@ -2267,7 +2267,7 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 	static uint8_t config_menu = 0;
 	uint8_t MAX_CONFIG_PARAM = 0;
 
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 	MAX_CONFIG_PARAM = 3;
 #else
 	MAX_CONFIG_PARAM = 2;
@@ -2318,7 +2318,7 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 			case 1:
 				ups_sensor_akb_param(pcWriteBuffer);
 				break;
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 			case 2:
 				inouts_sensor_param(pcWriteBuffer);
 				break;
@@ -2340,7 +2340,7 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 	}
 	else{
 		switch(i){
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 		case ARG_SENSOR_SETUP:
 			if(telnet_code_auth != ADMIN){
 				strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcPermissionDenied, strlen( ( char * ) pcPermissionDenied ) );

modules/Telnet_Server/CLI_Commands.h

@@ -89,12 +89,12 @@ typedef enum{
 
 typedef enum{
 	PARAM_CONFIG_SNMP = 0,
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 	PARAM_CONFIG_INOUTS,
 #endif
 	PARAM_CONFIG_AKB,
 	PARAM_CONFIG_ALARM,
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 	PARAM_CONFIG_WHITELIST,
 #endif
 	PARAM_CONFIG_NET,
@@ -116,7 +116,7 @@ typedef enum{
 
 typedef enum{
 	ARG_SENSOR_INFO = 0,
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 	ARG_SENSOR_SETUP,
 #endif
 	ARG_SENSOR_ALL

modules/Telnet_Server/CLI_Parameters.c

@@ -68,7 +68,7 @@ void snmp_config_param(int8_t *buf)
 	strcat(( char * ) buf, "\r\n");
 }
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 //Настройки сухих контактов
 void inouts_config_param(int8_t *buf)
 {
@@ -303,7 +303,7 @@ void alarm_config_param(int8_t *buf)
 	strcat(( char * ) buf, "\r\n");
 }
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 //Белый список IP адресов контроллера
 void whitelist_config_param(int8_t *buf)
 {
@@ -406,7 +406,7 @@ void ups_sensor_akb_param(int8_t *buf)
 	strcat(( char * ) buf, "\r\n");
 }
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 //Параметры сухих контактов
 void inouts_sensor_param(int8_t *buf)
 {

modules/Telnet_Server/CLI_Parameters.h

@@ -12,7 +12,7 @@
 //Настройки SNMP
 void snmp_config_param(int8_t *buf);
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 //Настройки сухих контактов
 void inouts_config_param(int8_t *buf);
 #endif
@@ -32,7 +32,7 @@ void alarm_config_param(int8_t *buf);
 //Настройки Аварий
 void alarm_config_param(int8_t *buf);
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 //Белый список IP адресов контроллера
 void whitelist_config_param(int8_t *buf);
 #endif
@@ -43,7 +43,7 @@ void ups_sensor_param(int8_t *buf);
 //Параметры аккумуляторных батарей
 void ups_sensor_akb_param(int8_t *buf);
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 //Параметры сухих контактов
 void inouts_sensor_param(int8_t *buf);
 #endif

modules/Telnet_Server/telnet_server.c

@@ -190,10 +190,10 @@ static int max_sd;
 static struct sockaddr_in sa;
 
 const int8_t * const pcWarningMessage = ( const int8_t * ) "Количество соединенений превышено. Данное соединение будет закрыто\r\n";
-#ifdef HARDWARE_BT6708
-const int8_t * const pcWelcomeMessage = ( const int8_t * ) "BT6708 command server - connection accepted.\r\nlogin:";
+#ifdef HARDWARE_BT6709
+const int8_t * const pcWelcomeMessage = ( const int8_t * ) "BT-6709 command server - connection accepted.\r\nlogin:";
 #else
-const int8_t * const pcWelcomeMessage = ( const int8_t * ) "BT6706 command server - connection accepted.\r\nlogin:";
+const int8_t * const pcWelcomeMessage = ( const int8_t * ) "BT-6707 command server - connection accepted.\r\nlogin:";
 #endif
 static const int8_t * const pcEndOfCommandOutputString = ( int8_t * ) "\r\n[Нажмите клавишу ENTER для повторного выполнения предыдущей команды]\r\n>";
 
@@ -603,7 +603,7 @@ void vBasicSocketsCommandInterpreterTask( void *pvParameters )
     uint16_t port;
     bool enabled;
     bool firstrun = true;
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
     struct sockaddr_in sa_temp;
     socklen_t len;
 #endif
@@ -724,7 +724,7 @@ void vBasicSocketsCommandInterpreterTask( void *pvParameters )
 						if (new_sd > max_sd) {
 							max_sd = new_sd;
 						}
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 						lwip_getpeername(new_sd, &sa_temp, &len);
 #endif
 					//	recv( new_sd, &auth_tlnt_srvr_param[cur_cnt].buf, 27, 0 );

modules/common/hal.c

@@ -19,7 +19,7 @@
 void Reboot(void) {
 #ifndef BT6702_SERVICE
 	SNMP_SendUserTrap(DEVICE_REBOOTED);
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	  if(telnet_act)
 		  log_event_data(LOG_SYSTEM_BOOT, name_login_telnet);
 	  else

modules/d_inouts/d_inouts.c

@@ -11,7 +11,7 @@
 #ifdef PRINTF_CUSTOM
 #include "tinystdio.h"
 #endif
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 #define INOUTS_EXPAND_AS_GPIO_GET(id, ...) 		\
 		inputs[id - DIN1] = gpio_get(id);
 

modules/d_inouts/d_inouts.h

@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 #define INOUTS_EXPAND_AS_ENUM(name, ...) name ## _,
 
 

modules/log/log.c

@@ -24,21 +24,21 @@ const char* logsStrShortRu[] =
     "Включение",
     "Смена пароля",
     "Сохранение настроек",
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
     "Авторизация (Telnet)",
 #endif
     "Авторизация",
     "Тест ИБП",
     "Откл. нагрузки ИБП",
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
     "Авария дискр. входа 1",
     "Состояние выхода 1",
     "Состояние выхода 2",
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     "Состояние выхода 3",
 #endif
 #endif
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
     "Низкое вых. напряжение",
     "Высокое вых. напряжение",
 #endif

modules/log/log.h

@@ -22,21 +22,21 @@ typedef __packed enum {
 	LOG_TURN_ON,		//
 	LOG_PSW_CHANGE,		//
 	LOG_SETTING_SAVE,		//
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
 	LOG_LOGIN_TELNET,		//
 #endif
 	LOG_LOGIN,		//
 	LOG_TEST_UPS,		//
 	LOG_SHUTDOWN_UPS,
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 	LOG_ALARM_DIO,
 	LOG_DO0_STATE,
 	LOG_DO1_STATE,
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 	LOG_DO2_STATE,
 #endif
 #endif
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
 	LOG_ALARM_VAC_LOW_OUTPUT,
 	LOG_ALARM_VAC_HIGH_OUTPUT,
 #endif

modules/monitor/ups_monitor.c

@@ -52,7 +52,7 @@ void UPS_Monitor(void *params)
     {
 	  UPS_TestFinishMonitor();
       UPS_LineFailMonitor();
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
       UPS_VACoutputLowRangeMonitor();
       UPS_VACoutputHighRangeMonitor();
 #endif
@@ -63,14 +63,14 @@ void UPS_Monitor(void *params)
       UPS_BatteryConnectMonitor();
     }
     UPS_ConnectMonitor();
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
     UPS_DI0Monitor();
 #endif
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
     UPS_CriticalAlarmMonitor();
     UPS_NonCriticalAlarmMonitor();
 #endif
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6707 || HARDWARE_BT6709
       if(flCriticalAlarm){
     	  if (UPS.Present)
     		  LED_On(LED_MAJOR_R);
@@ -85,7 +85,7 @@ void UPS_Monitor(void *params)
     vTaskDelay(1000);
   }
 }
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 /**
   * @brief  Мониторинг бита DI0 state
   */
@@ -148,18 +148,18 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 			  SNMP_SendUserTrap((DO0_TOGGLED+i));
 			  if(state_relay){
 				  flUpdateLog = true;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 #endif
 
 			  }
 			  else{
 				  flUpdateLog = true;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 #endif
 			  }
@@ -174,7 +174,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 
 	for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
 		if(curr_source[i] != prev_source[i] && (prev_source[i] == src_act_ro || curr_source[i] == src_act_ro)){
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 			if(curr_source[i] != src_act_ro){
 				flUpdateLog = true;
 				 SetROInt(0, i);
@@ -187,7 +187,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 				  SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 			  }
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 			  if(curr_source[i] != src_act_ro){
 				  flUpdateLog = true;
 				  SetROInt(0, i);
@@ -208,7 +208,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 #endif
 
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 /**
   * @brief  Мониторинг бита CriticalAlarm
   */
@@ -357,7 +357,7 @@ void UPS_LineFailMonitor(void)
   static uint8_t lineFailOldState = 0;
   uint8_t lineFailCurrent;
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -376,12 +376,12 @@ void UPS_LineFailMonitor(void)
     	log_event_data(LOG_ALARM_LINE, "Авария");
           SNMP_SendUserTrap(LINE_ALARM);
           flUpdateLog = true;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
     }
     else{
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -400,7 +400,7 @@ void UPS_LineFailMonitor(void)
   if (lineFailCurrent != lineFailOldState)
   {
     if (lineFailCurrent){
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
 
@@ -409,7 +409,7 @@ void UPS_LineFailMonitor(void)
     	flUpdateLog = true;
     }
     else{
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -418,7 +418,7 @@ void UPS_LineFailMonitor(void)
     }
   }
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   else{
 	  if (lineFailCurrent)
 		  relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, AC_PRESENT);
@@ -432,7 +432,7 @@ void UPS_LineFailMonitor(void)
   lineFailOldState = lineFailCurrent;
 }
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Мониторинг аварии выходного напряжения по нижней границе
   */
@@ -441,7 +441,7 @@ void UPS_VACoutputLowRangeMonitor(void)
 
   static uint8_t stateCurrentVACoutput = HYST_IDLE;
   uint8_t VACoutputCurrent;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
   uint8_t i = 0;
   static bool isValueRecv = false;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -463,7 +463,7 @@ void UPS_VACoutputLowRangeMonitor(void)
     if (stateCurrentVACoutput == HYST_IDLE)
 	{
       stateCurrentVACoutput = HYST_DOWN;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 1);
 #endif
 	  log_event_data(LOG_ALARM_VAC_LOW_OUTPUT, "Авария");
@@ -472,7 +472,7 @@ void UPS_VACoutputLowRangeMonitor(void)
 	  flUpdateLog = true;
 	}
     else{
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     	relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, DC_PRESENT);
 #endif
     }
@@ -483,7 +483,7 @@ void UPS_VACoutputLowRangeMonitor(void)
     if (stateCurrentVACoutput == HYST_DOWN)
 	{
     	stateCurrentVACoutput = HYST_IDLE;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 	  relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 0);
 #endif
 	  log_event_data(LOG_ALARM_VAC_LOW_OUTPUT, "Норма");
@@ -492,7 +492,7 @@ void UPS_VACoutputLowRangeMonitor(void)
 	  flUpdateLog = true;
 	}
   }
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
   for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
   	  OldROtype_Sourse[i] = CurrROtype_Sourse[i];
     }
@@ -507,7 +507,7 @@ void UPS_VACoutputHighRangeMonitor(void)
 
   static uint8_t stateCurrentVACoutput = HYST_IDLE;
   uint8_t VACoutputCurrent;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
   uint8_t i = 0;
   static bool isValueRecv = false;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -529,7 +529,7 @@ void UPS_VACoutputHighRangeMonitor(void)
     if (stateCurrentVACoutput == HYST_IDLE)
 	{
       stateCurrentVACoutput = HYST_UP;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 1);
 #endif
 	  log_event_data(LOG_ALARM_VAC_HIGH_OUTPUT, "Авария");
@@ -538,7 +538,7 @@ void UPS_VACoutputHighRangeMonitor(void)
 	  flUpdateLog = true;
 	}
     else{
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
     	relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, DC_PRESENT);
 #endif
     }
@@ -549,7 +549,7 @@ void UPS_VACoutputHighRangeMonitor(void)
     if (stateCurrentVACoutput == HYST_UP)
 	{
     	stateCurrentVACoutput = HYST_IDLE;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 	  relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 0);
 #endif
 	  log_event_data(LOG_ALARM_VAC_HIGH_OUTPUT, "Норма");
@@ -558,7 +558,7 @@ void UPS_VACoutputHighRangeMonitor(void)
 	  flUpdateLog = true;
 	}
   }
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
   for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
   	  OldROtype_Sourse[i] = CurrROtype_Sourse[i];
     }
@@ -577,7 +577,7 @@ void UPS_LowBatMonitor(void)
   static bool flag_alarm_time = false;
   uint8_t lowBatCurrent;
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -598,7 +598,7 @@ void UPS_LowBatMonitor(void)
     	log_event_data(LOG_ALARM_LOW_BAT, "Авария");
           SNMP_SendUserTrap(LOW_BAT_ALARM);
           flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 1);
 #endif
     }
@@ -606,7 +606,7 @@ void UPS_LowBatMonitor(void)
 	  SNMP_SendUserTrap(LOW_BAT_NORM);
 	  log_event_data(LOG_ALARM_LOW_BAT, "Норма");
 	  flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 	  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
 	}
@@ -621,7 +621,7 @@ void UPS_LowBatMonitor(void)
 		  SNMP_SendUserTrap(LOW_BAT_ALARM);
 		  log_event_data(LOG_ALARM_LOW_BAT, "Авария");
 		  flUpdateLog = true;
-#ifdef HARDWARE_BT6706
+#ifdef HARDWARE_BT6707
 		  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 1);
 #endif
 		}
@@ -629,7 +629,7 @@ void UPS_LowBatMonitor(void)
 		  SNMP_SendUserTrap(LOW_BAT_NORM);
 		  log_event_data(LOG_ALARM_LOW_BAT, "Норма");
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 		  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
 		}
@@ -638,7 +638,7 @@ void UPS_LowBatMonitor(void)
 		flag_alarm_time = true;
 	}
   }
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   else{
 	  flag_alarm_time = false;
 	  if (lowBatCurrent)
@@ -850,7 +850,7 @@ void UPS_BatteryConnectMonitor(void)
   static uint8_t AKBconnectOldState = 0;
   uint8_t AKBconnectCurrent;
 
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -874,7 +874,7 @@ void UPS_BatteryConnectMonitor(void)
       log_event_data(LOG_ALARM_AKB, "Авария");
 	  SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
 	  flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
       relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
     }
@@ -882,7 +882,7 @@ void UPS_BatteryConnectMonitor(void)
     	log_event_data(LOG_ALARM_AKB, "Норма");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
 		  flUpdateLog = true;
-#if	defined HARDWARE_BT6706
+#if	defined HARDWARE_BT6707
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
     }
@@ -897,7 +897,7 @@ void UPS_BatteryConnectMonitor(void)
 		  log_event_data(LOG_ALARM_AKB, "Норма");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
 		}
@@ -905,7 +905,7 @@ void UPS_BatteryConnectMonitor(void)
 		  log_event_data(LOG_ALARM_AKB, "Авария");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
 		}
@@ -914,7 +914,7 @@ void UPS_BatteryConnectMonitor(void)
 		flag_alarm_time = true;
 	}
   }
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
   else{
 	  flag_alarm_time = false;
 	  if (AKBconnectCurrent)

modules/monitor/ups_monitor.h

@@ -47,7 +47,7 @@ void UPS_NonCriticalAlarmMonitor(void);
   */
 void UPS_LineFailMonitor(void);
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Мониторинг аварии выходного напряжения по нижней границе
   */

modules/parameters.c

@@ -19,7 +19,7 @@
 #include "snmp_api.h"
 #include "snmp.h"
 #include "megatec.h"
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 #include "telnet_server.h"
 #endif
 #endif
@@ -30,7 +30,7 @@
 //#include "d_inouts.h"
 #include "gpio.h"
 #include "round.h"
-//#if defined HARDWARE_BT6702
+//#if defined HARDWARE_BT6703
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
 #endif
@@ -348,7 +348,7 @@ void GetSntpLastDataStr(char *str, uint8_t *len)
   *len = strlen(str);
 }
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -405,9 +405,9 @@ void GetROTypeActStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	sprintf(str, "%d", (get_state_din_outs(DOUT1+num)^1));
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	sprintf(str, "%d", get_state_din_outs(DOUT1+num));
 #endif
 
@@ -419,12 +419,12 @@ void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	if (get_state_din_outs(DOUT1+num)^1)
 		sprintf(str, "Замкнут");
 	else
 		sprintf(str, "Разомкнут");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	if(get_state_din_outs(DOUT1+num))
 		sprintf(str, "Замкнут");
 	else
@@ -439,9 +439,9 @@ void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUT0StatusStr(char *str, uint8_t *len)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	sprintf(str, "%d", (get_state_din_outs(DOUT1)^1));
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	sprintf(str, "%d", get_state_din_outs(DOUT1));
 #endif
 	*len = strlen(str);
@@ -452,15 +452,15 @@ void GetDOUT0StatusStr(char *str, uint8_t *len)
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	sprintf(str, "%d", (get_state_din_outs(DOUT2)^1));
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	sprintf(str, "%d", get_state_din_outs(DOUT2));
 #endif
 	*len = strlen(str);
 }
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Состояние релейного выхода
   */
@@ -754,7 +754,7 @@ void GetDhcpStateStrRu(char *str, uint8_t *len)
 	  *len = strlen(str);
 }
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры довверительных хостов
 
@@ -848,7 +848,7 @@ void GetManagerIp5(char *str, uint8_t *len)
   *len = strlen(str);
 }
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 // ************************************************************************** //
 //                             Параметры RADIUS
 
@@ -920,7 +920,7 @@ void GetAuthEnableStateStr(char *str, uint8_t *len)
 
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры Telnet
 
@@ -1159,7 +1159,7 @@ void SetUDPDhcpStateStr(char *str)
     sSettings.sWebTempParams.dhcpEnable = 0;
 }
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры довверительных хостов
 
@@ -1290,7 +1290,7 @@ void SetComment(char *str)
   strcpy(sSettings.sInfo.comments, str);
 }
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 // ************************************************************************** //
 //                             Сетевые параметры RADIUS сервера
 /**
@@ -1348,7 +1348,7 @@ void SetAuthEnableStateStr(char *str)
 }
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры Telnet
 #ifndef BT6702_SERVICE
@@ -1497,7 +1497,7 @@ void SetSntpTimeZoneStr(char *str)
   sSettings.sSNTP.timeZone = newUtc; // atof(str);
   //TM_RTC_Correction(sSettings.sSNTP.timeZone);
 }
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 

modules/parameters.h

@@ -233,7 +233,7 @@ void GetDhcpStateUDP(char *str, uint8_t *len);
   */
 void GetDhcpStateStrRu(char *str, uint8_t *len);
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры довверительных хостов
 
@@ -280,7 +280,7 @@ void GetManagerIp3(char *str, uint8_t *len);
 void GetManagerIp4(char *str, uint8_t *len);
 void GetManagerIp5(char *str, uint8_t *len);
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 // ************************************************************************** //
 //                             Параметры RADIUS
 
@@ -316,7 +316,7 @@ void GetAuthEnableStateStr(char *str, uint8_t *len);
 
 #endif
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -364,7 +364,7 @@ void GetDOUT0StatusStr(char *str, uint8_t *len);
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len);
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Состояние релейного выхода
   */
@@ -372,7 +372,7 @@ void GetDOUT2StatusStr(char *str, uint8_t *len);
 #endif
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры Telnet
 
@@ -500,7 +500,7 @@ void SetDhcpStateStr(char *str);
   */
 void SetUDPDhcpStateStr(char *str);
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры довверительных хостов
 
@@ -558,7 +558,7 @@ void SetLocation(char *str);
   */
 void SetComment(char *str);
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 
 // ************************************************************************** //
 //                             Сетевые параметры RADIUS сервера
@@ -594,7 +594,7 @@ void SetAuthEnableStateStr(char *str);
 
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры Telnet
 
@@ -640,7 +640,7 @@ void SetSntpServerIpStr(char *str);
   */
 void SetSntpTimeZoneStr(char *str);
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 

modules/settings_api.c

@@ -185,9 +185,9 @@ void SETTINGS_SetServiceDef(void)
         case 0:
             sSettings.sAuth[user_id].level = ADMIN;
             strcpy(sSettings.sAuth[user_id].login, "admin");
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
             strcpy(sSettings.sAuth[user_id].password, "12345");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
             strcpy(sSettings.sAuth[user_id].password, "R04ekR4MP2");
 #endif
             break;
@@ -195,9 +195,9 @@ void SETTINGS_SetServiceDef(void)
         default:
         	sSettings.sAuth[user_id].level = USER;
             strcpy(sSettings.sAuth[user_id].login, "user");
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
             strcpy(sSettings.sAuth[user_id].password, "1234");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
             strcpy(sSettings.sAuth[user_id].password, "R03ekR4MP2");
 #endif
             break;
@@ -216,17 +216,17 @@ void SETTINGS_SetSntpDef(void)
   strcpy(sSettings.sSNTP.data, "none");
 }
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 /**
   * @brief  Установить параметры настроек сухих контактов / реле по умолчанию
   */
 void SETTINGS_SetINOUTSDef(void)
 {
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 	sSettings.sInOuts.ro_type_source[0] = AC_PRESENT;
 	sSettings.sInOuts.ro_type_source[1] = DC_PRESENT;
 	sSettings.sInOuts.ro_type_source[2] = CHARGE_AKB;
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	sSettings.sInOuts.ro_type_source[0] = CRITICAL;
 	sSettings.sInOuts.ro_type_source[1] = SNMP_SET;
 #endif
@@ -235,7 +235,7 @@ void SETTINGS_SetINOUTSDef(void)
 }
 #endif
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 /**
   * @brief  Установить параметры RADIUS по умолчанию
   */
@@ -264,7 +264,7 @@ void SETTINGS_SetSSLcrtDef(void){
 }
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Установить параметры Telnet
   */
@@ -275,7 +275,7 @@ void SETTINGS_SetTelnetDef(void){
 
 #endif
 
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
 /**
   * @brief  Установить параметры списка доверительных хостов
   */
@@ -301,18 +301,18 @@ void SETTINGS_SetDefault(void)
   SETTINGS_SetSnmpDef();
   SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   SETTINGS_SetINOUTSDef();
 #endif
   SETTINGS_SetUPSSettingsDef();
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
   SETTINGS_SetTelnetDef();
 #endif
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
   SETTINGS_SetWhiteListDef();
 #endif
 
@@ -331,11 +331,11 @@ void SETTINGS_SetPartDefault(void)
   SETTINGS_SetUPSSettingsDef();
  // SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   SETTINGS_SetINOUTSDef();
 #endif
  // SETTINGS_SetRADIUSDef();
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
   SETTINGS_SetWhiteListDef();
 #endif
   
@@ -359,18 +359,18 @@ void SETTINGS_SetAllDefault(void)
   SETTINGS_SetSntpDef();
   SETTINGS_SetAlarmManagerDef();
   SETTINGS_SetUPSSettingsDef();
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   SETTINGS_SetINOUTSDef();
 #endif
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
   SETTINGS_SetTelnetDef();
 #endif
 
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
   SETTINGS_SetWhiteListDef();
 #endif
   
@@ -391,20 +391,20 @@ void SETTINGS_SetDefaultDebug(void)
   SETTINGS_SetFlagsDef();
   //SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   SETTINGS_SetINOUTSDef();
 #endif
   SETTINGS_SetUPSSettingsDef();
   SETTINGS_SetAlarmManagerDef();
   //SETTINGS_SetInfoDef();
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
 #endif
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
   SETTINGS_SetTelnetDef();
 #endif
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
   SETTINGS_SetWhiteListDef();
 #endif
   

modules/settings_api.h

@@ -199,12 +199,12 @@ typedef struct
   */
 typedef enum
 {
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
 	AC_PRESENT = 1,
 	DC_PRESENT,
 	CHARGE_AKB,
 	OFF_AKB,
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	CRITICAL = 1,
 	NON_CRITICAL,
 #endif
@@ -259,7 +259,7 @@ typedef struct
 	uint8_t type_ups;
 } UPS_Setting_t;
 
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 /**
   * @brief  Настройки входов/выходов.
   */
@@ -313,20 +313,20 @@ typedef struct
   SNMP_t        sSnmp;
   AUTH_t		sAuth[MAX_WEB_USERS];
   SNTP_t        sSNTP;
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
   INOUTS_t		sInOuts;
 #endif
   UPS_Setting_t UPS_Setting;
   ALARM_MNGR_t  sAlarmManager;
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
   RADIUS_t		sRADIUS;
   //char			our_srv_crt[1205];
   char			our_srv_crt[1705];
 #endif
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
   TELNET_t		sTelnet;
 #endif
-#ifdef HARDWARE_BT6708
+#ifdef HARDWARE_BT6709
   WHITE_LIST_t sWhiteList[MAX_WHITE_LIST];
   WHITE_LIST_t sWhiteListTemp[MAX_WHITE_LIST];
 #endif
@@ -383,10 +383,10 @@ void SETTINGS_SetSntpDef(void);
 /**
   * @brief  Установить параметры настроек сухих контактов / реле по умолчанию
   */
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 void SETTINGS_SetINOUTSDef(void);
 #endif
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 /**
   * @brief  Установить параметры RADIUS по умолчанию
   */
@@ -398,14 +398,14 @@ void SETTINGS_SetRADIUSDef(void);
 void SETTINGS_SetSSLcrtDef(void);
 #endif
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 /**
   * @brief  Установить параметры Telnet
   */
 void SETTINGS_SetTelnetDef(void);
 #endif
 
-#if defined HARDWARE_BT6708
+#if defined HARDWARE_BT6709
 /**
   * @brief  Установить параметры списка доверительных хостов
   */

projects/gcc/tools/version.sh

@@ -6,13 +6,13 @@ BIN=tmp
 
 if [ "$1" = "bt6702" ];
 then
-SRC=$'#define HARDWARE_BT6702 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
+SRC=$'#define HARDWARE_BT6703 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
 elif [ "$1" = "bt6706" ];
 then
-SRC=$'#define HARDWARE_BT6706 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
+SRC=$'#define HARDWARE_BT6707 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
 elif [ "$1" = "bt6708" ];
 then
-SRC=$'#define HARDWARE_BT6708 1\r\n#include <stdio.h>\r\n#include "common_config.h"\r\n'
+SRC=$'#define HARDWARE_BT6709 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

projects/iar/bt-670x.ewp

@@ -187,7 +187,7 @@
           <name>CCDefines</name>
           <state>USE_STDPERIPH_DRIVER</state>
           <state>STM32F407xx</state>
-          <state>HARDWARE_BT6702</state>
+          <state>HARDWARE_BT6703</state>
           <state>OS_FREERTOS</state>
           <state>PRINTF_STDLIB</state>
           <state>USE_LCD</state>

service_hw/Commands/bt_6701_commands.c

@@ -15,10 +15,10 @@
 #include "commands_api.h"
 #include "common_config.h"
 #include "gpio.h"
-#if defined HARDWARE_BT6702
-#include "board_bt6702.h"
-#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
-#include "board_bt6706.h"
+#if defined HARDWARE_BT6703
+#include "board_bt6703.h"
+#elif defined HARDWARE_BT6707 || HARDWARE_BT6709
+#include "board_bt6707.h"
 #endif
 #include "buttons.h"
 #include "led.h"
@@ -98,14 +98,14 @@ void Test_U232(void)
     printf("U232 OK\r\n");
     TEST_SetTest(TEST_WAIT);
 }
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 /**
   * @brief  
   */
 void Test_DRY(void)
 {
     uint8_t inputState;
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
     uint8_t start_state = 0;
     uint8_t end_state = 1;
     set_state_douts(DOUT1, 1);
@@ -113,7 +113,7 @@ void Test_DRY(void)
     set_state_douts(DOUT3, 1);
 #endif
 
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
     uint8_t start_state = 1;
     uint8_t end_state = 0;
 #endif
@@ -163,7 +163,7 @@ void Test_DRY(void)
 	}
 
 	vTaskDelay(10);
-#if defined HARDWARE_BT6706
+#if defined HARDWARE_BT6707
     inputState = get_state_din_outs(DIN1);
 
 	set_state_douts(DOUT3, start_state);

service_hw/Commands/commands_api.c

@@ -132,7 +132,7 @@ void vTestCommands(void *params)
             case TEST_U232 :
                 Test_U232();
             break;
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
             case TEST_DRY :
                 Test_DRY();
             break;

service_hw/Commands/commands_api.h

@@ -50,7 +50,7 @@ typedef enum
 void TestProcessing(void);
 
 void Test_U232U485(void);
-#ifndef HARDWARE_BT6708
+#ifndef HARDWARE_BT6709
 void Test_DRY(void);
 #endif
 void Test_U232F(void);

service_hw/Makefile

@@ -122,7 +122,7 @@ BUILDDIR = ../build/bt6702_service/$(TARGET)
 FW_FLASH_START = $(shell awk '/USER_FLASH_FIRST_PAGE_ADDRESS/{print $$3}' ../config/common_config.h )
 FW_FLASH_CRC = $(shell awk '/USER_FLASH_CRC_ADDRESS/{print $$3}' ../config/common_config.h )
 
-FW_NAME = BT_6702xx_service
+FW_NAME = BT_6703xx_service
 
 -include ../Makefile.inc.stm32
 

service_hw/Settings/bt_6701_settings.c

@@ -93,9 +93,9 @@ void SETTINGS_SetMac(char *mac)
   */
 void Service_SETTINGS_SetWebParamsDef(void)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	  strcpy(sSettings.sWebParams.ip, "192.168.0.6");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	  strcpy(sSettings.sWebParams.ip, "192.168.0.2");
 #endif
 	  strcpy(sSettings.sWebParams.gate, "192.168.0.1");
@@ -108,9 +108,9 @@ void Service_SETTINGS_SetWebParamsDef(void)
   */
 void Service_SETTINGS_SetTempWebParamsDef(void)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.6");
-#elif HARDWARE_BT6702
+#elif HARDWARE_BT6703
 	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.2");
 #endif
 	  strcpy(sSettings.sWebTempParams.gate, "192.168.0.1");

user/init_task.c

@@ -24,10 +24,10 @@
 #include "netconf.h"
 #include "udp_netsetting.h"
 #include "snmp_api.h"
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 #include "http_server.h"
 #include "telnet_server.h"
-#elif defined HARDWARE_BT6702
+#elif defined HARDWARE_BT6703
 #include "my_ssl_server.h"
 #endif
 #include "sntp_api.h"
@@ -40,7 +40,7 @@
 //#include "ups_params.h"
 //#include "ups_monitor.h"
 #include "lwip/stats.h"
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 #include "radius_user.h"
 #include "cert_req.h"
 #include "parse_rsa.h"
@@ -142,7 +142,7 @@ void InitTask(void *params)
 #ifdef WEB_SERVER_ENABLE
 
 	  HTTP_Init();
-#ifdef HARDWARE_BT6702
+#ifdef HARDWARE_BT6703
 	   HTTPS_Init();
 //#define SSL_TASK_PRIO   ( configMAX_PRIORITIES - 3 )
 	   xTaskCreate(ssl_server, "SSL", 24*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
@@ -156,7 +156,7 @@ void InitTask(void *params)
 	   else{
 		   UDP_netsetting_init();
 	   }
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 	   telnet_server_init();
 #endif
  /* HTTPS_Init();