enable ftp and syslog via *_ENABLE

config/board_bt6711.h

@@ -69,6 +69,8 @@ WDG_PIN(X)
 #define WHITELIST_ENABLE            //Белый список
 #define TELNET_ENABLE               //Telnet сервер
 #define UPS_ENABLE                  //UPS
+#define FTP_ENABLE
+#define SYSLOG_ENABLE
 //#define DEBUG_FREERTOS            //Мониторинг FreeRtos
 
 #define SETTINGS_TABLE \

iap/User/main.c

@@ -29,7 +29,7 @@
 #ifdef SLAVEBRD_ENABLE
 #include "stm32sprog.h"
 #endif
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
 #include "spi_flash.h"
 #endif
 
@@ -96,7 +96,7 @@ bool CheckFWIsValid(void)
     return false;
 }
 
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
 void  spi_flash_update(void)
 {
   printf("ftp: trying to update the firmware from the SPI flash\r\n");
@@ -148,7 +148,7 @@ void  spi_flash_update(void)
   RTC_WriteBackupRegister(RTC_BKP_DR1, 0); // loadMode
   NVIC_SystemReset();
 }
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE
 
 void main(void)
 {
@@ -292,9 +292,9 @@ void main(void)
       LCD_ClearRow(7);
 #endif
   }
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
   spi_flash_update();
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE
 
   while (1)
   {

modules/HTTP_Server/http_server.c

@@ -19,8 +19,10 @@
 #include "bt6710_fs/fsdata.c"
 #elif HARDWARE_BT6711
 #include "bt6711_fs/fsdata.c"
-#include "ftp.h"
 #endif
+#ifdef FTP_ENABLE
+#include "ftp.h"
+#endif // FTP_ENABLE
 #include "settings_api.h"
 #include "netconf.h"
 
@@ -191,10 +193,10 @@ web_func_handler_t process_web_funcs[] = {
     { "GET /reboot.cgi",                15,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_Reboot },
     { "GET /confirm.cgi",               16,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_Confirm },
     { "GET /fw_update.cgi",             18,   COMMON_ANSWER,        TIME_ACCESS,  HTTP_ConfirmBootPwd },
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
     { X("POST /ftp_fw_update.cgi"),           COMMON_ANSWER,        TIME_ACCESS,  HTTP_FTPFWUpdate },
     { X("GET /fw_dl_state.cgi"),              COMMON_ANSWER,        TIME_ACCESS,  HTTP_FTPFWState },
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE
     { "GET",                            3,    COMMON_ANSWER,        ALL_ACCESS,   HTTP_GetRequest },
     { "",                               0,    COMMON_ANSWER,        ALL_ACCESS,   HTTP_NoFound },
     { "", 0, 0, 0, NULL }
@@ -1392,7 +1394,7 @@ char *HTTP_ConfirmBootPwd(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t l
     return bufOut;
 }
 
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
 // Download the firmware via FTP, put it on the SPI flash, verify it and reboot the controller
 static char *HTTP_FTPFWUpdate(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *lenBufOut)
 {
@@ -1449,7 +1451,7 @@ static char *HTTP_FTPFWState(uint32_t reqNum, char *bufIn, char *bufOut, uint16_
     *lenBufOut = sprintf(bufOut, "HTTP/1.1 200 OK\r\nContent-Type:text/plain\r\n\r\n%s", progress);
     return bufOut;
 }
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE
 
 #ifdef HTTP_AUTH_ENABLE
 

modules/ftp.c

@@ -1,5 +1,3 @@
-#ifdef HARDWARE_BT6711
-#ifndef BT6702_SERVICE
 /*
  * lwftp.c : a lightweight FTP client using raw API of LWIP
  *
@@ -31,16 +29,18 @@
  * Author: Laurent GONZALEZ <lwip@gezedo.com>
  *
  */
+
 #pragma GCC diagnostic error "-Wall"
 #pragma GCC diagnostic error "-Wextra"
+#include "common_config.h"
 
+#ifdef FTP_ENABLE
 #include <string.h>
 #include <stdbool.h>
 #include "ftp.h"
 #include "lwip/tcp.h"
 #include "sockets.h"
 #include "stm32f4xx.h"
-#include "common_config.h"
 #include "spi_flash.h"
 #include "web_params_api.h"
 #include "FreeRTOS.h"
@@ -740,5 +740,4 @@ char *get_ftp_progress()
   }
 }
 
-#endif // !BT6702_SERVICE
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE

modules/parameters.c

@@ -1610,7 +1610,7 @@ void GetSSHEnableStateStr(char *str, uint8_t *len)
 }
 #endif // SSH_ENABLE
 #endif // TELNET_ENABLE
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
 void GetFTPServer(char *str, uint8_t *len)
 {
   *len = sprintf(str, "%s", ipaddr_ntoa(&sSettings.sFTPUpdate.server_ip));
@@ -1631,7 +1631,9 @@ void GetFTPPassword(char *str, uint8_t *len)
 {
   *len = sprintf(str, "%s", sSettings.sFTPUpdate.pass);
 }
+#endif // FTP_ENABLE
 
+#ifdef SYSLOG_ENABLE
 void GetSyslogEnable(char *str, uint8_t *len)
 {
   str[0] = sSettings.sSyslog.enabled ? '1' : '0';
@@ -1660,7 +1662,7 @@ void SetSyslogPort(char *str)
 {
   sSettings.sSyslog.server_port = atoi(str);
 }
-#endif // HARDWARE_BT6711
+#endif // SYSLOG_ENABLE
 
 
 // ************************************************************************** //

modules/parameters.h

@@ -606,7 +606,7 @@ void GetSSHEnableStateStr(char *str, uint8_t *len);
 #endif
 
 
-#ifdef HARDWARE_BT6711
+#ifdef FTP_ENABLE
 // ************************************************************************** //
 //                             Параметры FTP
 
@@ -622,7 +622,7 @@ void GetFTPPassword(char *str, uint8_t *len);
 void GetSyslogEnable(char *str, uint8_t *len);
 void GetSyslogServer(char *str, uint8_t *len);
 void GetSyslogPort(char *str, uint8_t *len);
-#endif // HARDWARE_BT6711
+#endif // FTP_ENABLE
 
 // ************************************************************************** //
 //                                Флаги
@@ -1109,14 +1109,14 @@ void SetSSHPortStr(char *str);
 void SetSSHEnableStateStr(char *str);
 #endif
 
-#ifdef HARDWARE_BT6711
+#ifdef SYSLOG_ENABLE
 // ************************************************************************** //
 //                             Параметры Syslog
 
 void SetSyslogEnable(char *str);
 void SetSyslogServer(char *str);
 void SetSyslogPort(char *str);
-#endif // HARDWARE_BT6711
+#endif // SYSLOG_ENABLE
 
 // ************************************************************************** //
 //                             Параметры даты и времени

modules/syslog.h

@@ -1,5 +1,7 @@
 #ifndef __SYSLOG_H__
 #define __SYSLOG_H__
+#include "common_config.h"
+
 enum {
 	SYSLOG_EMERGENCY = 0,
 	SYSLOG_ALERT,
@@ -10,7 +12,7 @@ enum {
 	SYSLOG_INFORMATIONAL,
 	SYSLOG_DEBUG,
 };
-#if defined(HARDWARE_BT6711) && !defined(BT6702_SERVICE)
+#ifdef SYSLOG_ENABLE
 #include <stdint.h>
 
 void openlog(void);