change define HAEDWARE_BT67xx

.vscode/settings.json

@@ -22,6 +22,14 @@
         "chrono": "c",
         "sstream": "c",
         "string": "c",
-        "cstdlib": "c"
+        "cstdlib": "c",
+        "random": "c",
+        "limits": "c",
+        "snmp_api.h": "c",
+        "board.h": "c",
+        "my_ssl_server.h": "c",
+        "http_server.h": "c",
+        "arch.h": "c",
+        "urlcode.h": "c"
     }
 }

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_BT6709
+#if defined WHITELIST_ENABLE
 #define LWIP_HOOK_FILENAME "lwip_hook_ip4_input.h"
 #endif
 

modules/Ethernet/netconf.c

@@ -299,7 +299,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_BT6709
+#ifdef WHITELIST_ENABLE
             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;
@@ -367,7 +367,7 @@ bool GetStateWebReinit(void)
         SetWebReinitFlag(true);
         return true;
     }
-#ifdef HARDWARE_BT6709
+#ifdef WHITELIST_ENABLE
     /* Изменился диапазон доверительных хостов? */
     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/snmp_api.c

@@ -279,13 +279,7 @@ void SNMP_SetManagerIP(char *ip)
   */
 void SNMP_SetObjID(void)
 {
-#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
+    static struct snmp_obj_id my_object_id = {9, {1, 3, 6, 1, 4, 1, 41752, 911, SNMP_DEV_ROOT_OID}};
 
     snmp_set_device_enterprise_oid(&my_object_id);
 }

modules/HTTP_Server/http_server.c

@@ -1,9 +1,10 @@
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
 
 #include "lwip/arch.h"
 #include "lwip/api.h"
 #include "lwip/tcp.h"
 
+#include "common_config.h"
+#ifdef HTTP_SERVER_ENABLE
 #include "http_server.h"
 #include "web_params_api.h"
 #include "parameters.h"
@@ -15,7 +16,7 @@
 #endif
 #include "settings_api.h"
 #include "netconf.h"
-#include "common_config.h"
+
 #include "testing.h"
 #include "rtc.h"
 #include "rng.h"

modules/HTTP_Server/http_server.h

@@ -1,11 +1,12 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
-
+#include "common_config.h"
 #include "lwip/api.h"
 #include "mbedtls/ssl.h"
 
+#ifdef HTTP_SERVER_ENABLE
+
 #define HTTP_AUTH_ENABLE
      
 #define SSL_TASK_PRIO   ( configMAX_PRIORITIES - 3 )

modules/HTTP_Server/my_ssl_server.c

@@ -4,7 +4,7 @@
  *  Created on: 08.11.2017
  *      Author: balbekova
  */
-#ifdef HARDWARE_BT6703
+#ifdef SSL_SERVER_ENABLE
 
 #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_BT6703
+#ifdef SSL_SERVER_ENABLE
 
 #ifndef MY_SSL_SERVER_H_
 #define MY_SSL_SERVER_H_

modules/Makefile

@@ -83,7 +83,10 @@ ASMSRC = startup/startup_stm32f4xx.s
 # MemMang
 CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
 	
-	
+#cjson
+CSRC += $(wildcard ../thirdparty/cjson/*.c)
+INCLUDES += -I../thirdparty/cjson
+
 	# LwIP + Web #	
     INCLUDES += -IHTTP_Server
     INCLUDES += -I../thirdparty/lwip_patched/src/include

modules/cli/CLI_Commands.c

@@ -200,7 +200,9 @@ static portBASE_TYPE prvTaskAlarmCommand(cli_state_t *cli_state, int8_t *pcWrite
  */
 static portBASE_TYPE prvTaskNotificationCommand(cli_state_t *cli_state, int8_t *pcWriteBuffer, size_t xWriteBufferLen,
     const int8_t *pcCommandString );
+#endif
 
+#ifdef WHITELIST_ENABLE
 /*
  * Implements the whitelist command.
  */
@@ -365,7 +367,9 @@ static const CLI_Command_Definition_t prvNotificationCommandDefinition = {
     prvTaskNotificationCommand, /* The function to run. */
     -1 /* The user can enter any number of commands. */
 };
+#endif
 
+#ifdef  WHITELIST_ENABLE
 /* 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 = {
@@ -421,7 +425,7 @@ generates a table that shows how much run time each task has */
 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_BT6707
+#ifdef INOUTS_ENABLE
 							"\tsensor 	setup DI <num> <state>: установка нормального состояния сухого контакта:\r\n"
 							"\t\t\t\t0 - разомкнутое состояние\r\n"
 							"\t\t\t\t1 - замкнутое состояние\r\n"
@@ -2168,7 +2172,7 @@ static portBASE_TYPE prvTaskConfigCommand(cli_state_t *cli_state, int8_t *pcWrit
                         strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInfoTableHeader, strlen( ( char * ) pcInfoTableHeader ) );
                         snmp_config_param(pcWriteBuffer);
                         break;
-#ifdef HARDWARE_BT6707
+#ifdef INOUTS_ENABLE
                     case PARAM_CONFIG_INOUTS:
                         inouts_config_param(pcWriteBuffer);
                         break;
@@ -2179,7 +2183,7 @@ static portBASE_TYPE prvTaskConfigCommand(cli_state_t *cli_state, int8_t *pcWrit
                     case PARAM_CONFIG_ALARM:
                         alarm_config_param(pcWriteBuffer);
                         break;
-#ifdef HARDWARE_BT6709
+#ifdef WHITELIST_ENABLE
                     case PARAM_CONFIG_WHITELIST:
                         whitelist_config_param(pcWriteBuffer);
                         break;
@@ -2529,7 +2533,7 @@ static portBASE_TYPE prvTaskSensorCommand(cli_state_t *cli_state, int8_t *pcWrit
                 case 1:
                     ups_sensor_akb_param(pcWriteBuffer);
                     break;
-#ifdef HARDWARE_BT6707
+#ifdef INOUTS_ENABLE
                 case 2:
                     inouts_sensor_param(pcWriteBuffer);
                     break;

modules/cli/CLI_Commands.h

@@ -103,12 +103,12 @@ typedef enum{
 
 typedef enum{
 	PARAM_CONFIG_SNMP = 0,
-#ifdef HARDWARE_BT6707
+#ifdef INOUTS_ENABLE
 	PARAM_CONFIG_INOUTS,
 #endif
 	PARAM_CONFIG_AKB,
 	PARAM_CONFIG_ALARM,
-#ifdef HARDWARE_BT6709
+#ifdef WHITELIST_ENABLE
 	PARAM_CONFIG_WHITELIST,
 #endif
 	PARAM_CONFIG_NET,

modules/cli/CLI_Parameters.c

@@ -69,7 +69,7 @@ void snmp_config_param(int8_t *buf)
     strcat(( char * ) buf, "\r\n");
 }
 
-#ifndef HARDWARE_BT6709
+#ifdef INOUTS_ENABLE
 //Настройки сухих контактов
 void inouts_config_param(int8_t *buf)
 {
@@ -502,7 +502,7 @@ void ups_sensor_akb_param(int8_t *buf)
     strcat(( char * ) buf, "\r\n");
 }
 
-#ifndef HARDWARE_BT6709
+#ifdef INOUTS_ENABLE
 //Параметры сухих контактов
 void inouts_sensor_param(int8_t *buf)
 {

modules/cli/CLI_Parameters.h

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

modules/d_inouts/d_inouts.c

@@ -11,7 +11,7 @@
 #ifdef PRINTF_CUSTOM
 #include "tinystdio.h"
 #endif
-#ifndef HARDWARE_BT6709
+#ifdef INOUTS_ENABLE
 #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_BT6709
+#ifdef INOUTS_ENABLE
 #define INOUTS_EXPAND_AS_ENUM(name, ...) name ## _,
 
 

user/init_task.c

@@ -24,14 +24,16 @@
 #include "netconf.h"
 #include "udp_netsetting.h"
 #include "snmp_api.h"
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
-#include "http_server.h"
+#ifdef TELNET_ENABLE
 #include "cli.h"
 #include "telnet_server.h"
-#ifdef HARDWARE_BT6709
+#endif
+#ifdef SSH_ENABLE
 #include "server.h"
 #endif
-#elif defined HARDWARE_BT6703
+#ifdef HTTP_SERVER_ENABLE
+#include "http_server.h"
+#elif defined SSL_SERVER_ENABLE
 #include "my_ssl_server.h"
 #endif
 #include "sntp_api.h"
@@ -44,7 +46,7 @@
 //#include "ups_params.h"
 //#include "ups_monitor.h"
 #include "lwip/stats.h"
-#ifdef HARDWARE_BT6703
+#ifdef RADIUS_SERVER_ENABLE
 #include "radius_user.h"
 #include "cert_req.h"
 #include "parse_rsa.h"
@@ -87,15 +89,14 @@ void InitTask(void *params)
   log_init(false);
   ups_megatec_init();
 // -----------------------------------------------------------------------------    
-  //SETTINGS_SetDefaultDebug();
   //SETTINGS_SetAllDefault();
   //SETTINGS_Save();
   SETTINGS_Load();
 
   if(set_mode_jumper()){
-	SETTINGS_SetServiceDef();
-	SETTINGS_Save();
-	log_event_data(LOG_PSW_CHANGE, "Сброс к заводскому");
+    SETTINGS_SetServiceDef();
+    SETTINGS_Save();
+    log_event_data(LOG_PSW_CHANGE, "Сброс к заводскому");
   }
 // -----------------------------------------------------------------------------    
   
@@ -143,10 +144,10 @@ void InitTask(void *params)
   ETH_BSP_Config();
   LwIP_Init();
 
-#ifdef WEB_SERVER_ENABLE
+#ifdef HTTP_SERVER_ENABLE
 
 	  HTTP_Init();
-#ifdef HARDWARE_BT6703
+#ifdef SSL_SERVER_ENABLE
 	   HTTPS_Init();
 //#define SSL_TASK_PRIO   ( configMAX_PRIORITIES - 3 )
 	   xTaskCreate(ssl_server, "SSL", 24*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
@@ -160,16 +161,13 @@ void InitTask(void *params)
 	   else{
 		   UDP_netsetting_init();
 	   }
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+#if defined TELNET_ENABLE
 	   cli_init();
 	   telnet_server_init();
-#ifdef HARDWARE_BT6709
+#ifdef SSH_ENABLE
 	   ssh_server_init();
 #endif
 #endif
- /* HTTPS_Init();
-  xTaskCreate(ssl_server, "SSL", 10*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);  
-  UDP_netsetting_init();*/
   
 #ifdef SNMP_ENABLE
   SNMP_Init();