add define NOTIFICATION_CONTROL_ENABLE

config/board_bt6709.h

@@ -60,6 +60,7 @@ WDG_PIN(X)
 #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 SSH_ENABLE                 //SSH сервер

modules/Ethernet/snmp_api.c

@@ -108,7 +108,7 @@ void snmp_trap_tread(void *arg)
     while (1) {
         if (isIpReceived) {
             if (xQueueReceive(SNMP_TrapQueue, &trapName, 0) == pdTRUE) {
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
                 if (sSettings.sFlagNotification[trapName])
 #endif
                 {

modules/HTTP_Server/http_server.c

@@ -165,7 +165,7 @@ web_func_handler_t process_web_funcs[] = {
     { "GET /getJson.cgi",           16,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_GetParamsPage },
     { "GET /settings.cgi",          17,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_GetSettingsPage },
     { "POST /settings.cgi",         18,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_SetSettingsPage },
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
     { "GET /snmp.cgi",              13,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_SnmpParam },
 #endif
     { "GET /info.cgi",              13,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_GetInfo },
@@ -1157,7 +1157,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     HTTP_SaveSettings();
 }
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /**
   * @brief
   * @retval None

modules/HTTP_Server/http_server.h

@@ -77,7 +77,7 @@ void HTTP_SetInfo(char *buf, uint16_t lenBuf);
   */
 char* HTTP_SetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *lenBufOut);
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /**
   * @brief
   * @retval None

modules/HTTP_Server/web_params_api.c

@@ -145,7 +145,7 @@ uint8_t ConvertStringForJSON(char *inStr, char *paramValue, uint8_t inLen)
     return 1;
 }
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /**
   * @brief  Возвращяет строку с настройками уведомлений (есть/нет отправка)
   * @retval None

modules/HTTP_Server/web_params_api.h

@@ -33,7 +33,7 @@ char *HTTP_GetParamsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t le
   */
 char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *lenBufOut);
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /**
   * @brief  Возвращяет строку с настройками уведомлений (есть/нет отправка)
   * @retval None

modules/cli/CLI_Commands.c

@@ -194,7 +194,7 @@ static portBASE_TYPE prvTaskAKBCommand(cli_state_t *cli_state, int8_t *pcWriteBu
 static portBASE_TYPE prvTaskAlarmCommand(cli_state_t *cli_state, int8_t *pcWriteBuffer, size_t xWriteBufferLen,
     const int8_t *pcCommandString );
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /*
  * Implements the notification command.
  */
@@ -357,7 +357,7 @@ static const CLI_Command_Definition_t prvAlarmCommandDefinition = {
     -1 /* The user can enter any number of commands. */
 };
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /* Structure that defines the "notification" command line command.   This
 generates a table that shows how much run time each task has */
 static const CLI_Command_Definition_t prvNotificationCommandDefinition = {
@@ -489,8 +489,10 @@ void vRegisterCLICommands( void )
     FreeRTOS_CLIRegisterCommand( &prvSNMPCommandDefinition );
     FreeRTOS_CLIRegisterCommand( &prvAKBCommandDefinition );
     FreeRTOS_CLIRegisterCommand( &prvAlarmCommandDefinition );
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
     FreeRTOS_CLIRegisterCommand( &prvNotificationCommandDefinition );
+#endif
+#ifdef WHITELIST_ENABLE
     FreeRTOS_CLIRegisterCommand( &prvWhiteListCommandDefinition );
 #endif
     FreeRTOS_CLIRegisterCommand( &prvUserCommandDefinition );
@@ -1764,7 +1766,7 @@ static portBASE_TYPE prvTaskAlarmCommand(cli_state_t *cli_state, int8_t *pcWrite
     return xReturn;
 }
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 /*
  * Implements the notification command.
  */
@@ -1876,7 +1878,9 @@ static portBASE_TYPE prvTaskNotificationCommand(cli_state_t *cli_state, int8_t *
     xReturn = pdFALSE;
     return xReturn;
 }
+#endif
 
+#ifdef WHITELIST_ENABLE
 /*
  * Implements the whitelist command.
  */

modules/cli/CLI_Parameters.c

@@ -335,7 +335,7 @@ void alarm_config_param(int8_t *buf)
     strcat(( char * ) buf, "\r\n");
 }
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 //Список уведомлений и их состояние
 void notification_param(int8_t *buf)
 {

modules/cli/CLI_Parameters.h

@@ -32,7 +32,7 @@ void alarm_config_param(int8_t *buf);
 //Настройки Аварий
 void alarm_config_param(int8_t *buf);
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 //Список уведомлений и их состояние
 void notification_param(int8_t *buf);
 #endif

modules/parameters.c

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 extern const char* name_traps[];
 #endif
 /**
@@ -795,7 +795,7 @@ void GetUPSVersionStr(char *str, uint8_t *len) // +
 }
 #endif
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 // ************************************************************************** //
 //                              Параметры уведомления
 
@@ -1593,7 +1593,7 @@ void SetConfirmWebParamsFlag(void)
     fConfirmWebParams = true;
 }
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 // ************************************************************************** //
 //                              Параметры уведомления
 

modules/parameters.h

@@ -238,7 +238,7 @@ void GetUPSModelStr(char *str, uint8_t *len);
   */
 void GetUPSVersionStr(char *str, uint8_t *len);
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 // ************************************************************************** //
 //                              Параметры уведомления
 
@@ -678,7 +678,7 @@ void SetWebReinitFlag(bool value);
   */
 void SetConfirmWebParamsFlag(void);
 
-#ifdef HARDWARE_BT6709
+#ifdef NOTIFICATION_CONTROL_ENABLE
 // ************************************************************************** //
 //   							Параметры уведомления
 

service_hw/Commands/bt_6701_commands.c

@@ -15,11 +15,6 @@
 #include "commands_api.h"
 #include "common_config.h"
 #include "gpio.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"
 #include "netconf.h"
@@ -98,7 +93,7 @@ void Test_U232(void)
     printf("U232 OK\r\n");
     TEST_SetTest(TEST_WAIT);
 }
-#ifndef HARDWARE_BT6709
+#ifdef INOUTS_ENABLE
 /**
   * @brief  
   */

service_hw/Commands/commands_api.c

@@ -132,7 +132,7 @@ void vTestCommands(void *params)
             case TEST_U232 :
                 Test_U232();
             break;
-#ifndef HARDWARE_BT6709
+#ifdef INOUTS_ENABLE
             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_BT6709
+#ifdef INOUTS_ENABLE
 void Test_DRY(void);
 #endif
 void Test_U232F(void);