ssh: only enable for BT6709

modules/HTTP_Server/http_server.c

@@ -991,6 +991,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     memset(value, 0, len);
 
 
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
     /* Сетевые параметры */
     GetParamValue(buf, "tn_enabled=", value, &valueLen);
     SetTelnetEnableStateStr(value);
@@ -1002,6 +1003,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
         memset(value, 0, len);
     }
     memset(value, 0, len);
+#if defined HARDWARE_BT6709
     GetParamValue(buf, "ssh_enabled=", value, &valueLen);
     SetSSHEnableStateStr(value);
     if (strncmp(value, "on", 2) == 0) {
@@ -1012,6 +1014,8 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
         memset(value, 0, len);
     }
     memset(value, 0, len);
+#endif // HARDWARE_BT6709
+#endif // HARDWARE_BT6707 || HARDWARE_BT6709
 #ifndef HARDWARE_BT6709
     // Параметры реле и сухих контактов
     GetParamValue(buf, "di1=", value, &valueLen);

modules/Makefile

@@ -104,11 +104,26 @@ ifeq ($(HARDWARE), bt6703)
    CSRC += $(wildcard HTTP_Server/my_ssl_server.c)
 endif  
 ifneq (,$(filter $(HARDWARE),bt6707 bt6709))
-      INCLUDES += -Icli
-      CSRC += $(wildcard cli/*.c)
-      INCLUDES += -ITelnet_Server
-      CSRC += $(wildcard HTTP_Server/http_server.c)
-      CSRC += $(wildcard Telnet_Server/*.c)
+	INCLUDES += -Icli
+	CSRC += $(wildcard cli/*.c)
+	INCLUDES += -ITelnet_Server
+	CSRC += $(wildcard HTTP_Server/http_server.c)
+	CSRC += $(wildcard Telnet_Server/*.c)
+	ifneq (,$(filter $(HARDWARE),bt6709))
+		# SSH
+		CSRC += $(wildcard ../thirdparty/wolfssl/wolfcrypt/src/*.c) ../thirdparty/wolfssl/wolfcrypt/src/port/st/stm32.c
+		INCLUDES += -I../thirdparty/wolfssl
+		CFLAGS += -DWOLFSSL_LWIP -DWOLFSSL_STM32F4 -DFREERTOS -DFREERTOS_TCP -DNO_WOLFSSL_DIR -DWOLFSSL_USER_SETTINGS -DNO_FILESYSTEM -DWOLFSSL_IAR_ARM -DWOLFSSL_LEANPSK -DINLINE=inline -DNO_WOLFSSL_MEMORY -DHAVE_ECC -DHAVE_STRINGS_H -DWOLF_C99 -DWOLFSSL_NO_PEM -DHAVE_HASHDRBG -DSTM32F4 -DNO_WOLFSSL_CLIENT -DNO_DES3
+		#CFLAGS += -DDEBUG_WOLFSSL
+		# incompatible with SPL
+		CFLAGS += -DNO_STM32_CRYPTO
+		CSRC += $(wildcard ../thirdparty/wolfssh/wolfcrypt/src/*.c ../thirdparty/wolfssh/src/*.c)
+		INCLUDES += -I../thirdparty/wolfssh
+		CFLAGS += -DWOLFSSH_LWIP -DNO_WOLFSSH_DIR -DSINGLE_THREADED -DXMEMSET=memset -DWSTRNCPY=strncpy -DWMEMSET=memset -DWSTRLEN=strlen -DWMEMMOVE=memmove -DHAVE_DH -Dmin=min -DTINYPRINTF_OVERRIDE_LIBC
+		#CFLAGS += -DDEBUG_WOLFSSH
+		INCLUDES += -ISSH_Server
+		CSRC += $(wildcard SSH_Server/*.c)
+	endif
 endif
     CSRC += $(wildcard HTTP_Server/trap_params.c)
     CSRC += $(wildcard HTTP_Server/web_params_api.c)
@@ -125,19 +140,6 @@ endif
   #  CSRC += $(wildcard ../stm32/stm32f4x7_ethernet/*.c)
   	CSRC += $(wildcard STM32F4x7_ETH_Driver/*.c)
 
-# SSH
-CSRC += $(wildcard ../thirdparty/wolfssl/wolfcrypt/src/*.c) ../thirdparty/wolfssl/wolfcrypt/src/port/st/stm32.c
-INCLUDES += -I../thirdparty/wolfssl
-CFLAGS += -DWOLFSSL_LWIP -DWOLFSSL_STM32F4 -DFREERTOS -DFREERTOS_TCP -DNO_WOLFSSL_DIR -DWOLFSSL_USER_SETTINGS -DNO_FILESYSTEM -DWOLFSSL_IAR_ARM -DWOLFSSL_LEANPSK -DINLINE=inline -DNO_WOLFSSL_MEMORY -DHAVE_ECC -DHAVE_STRINGS_H -DWOLF_C99 -DWOLFSSL_NO_PEM -DHAVE_HASHDRBG -DSTM32F4 -DNO_WOLFSSL_CLIENT -DNO_DES3
-#CFLAGS += -DDEBUG_WOLFSSL
-# incompatible with SPL
-CFLAGS += -DNO_STM32_CRYPTO
-CSRC += $(wildcard ../thirdparty/wolfssh/wolfcrypt/src/*.c ../thirdparty/wolfssh/src/*.c)
-INCLUDES += -I../thirdparty/wolfssh
-CFLAGS += -DWOLFSSH_LWIP -DNO_WOLFSSH_DIR -DSINGLE_THREADED -DXMEMSET=memset -DWSTRNCPY=strncpy -DWMEMSET=memset -DWSTRLEN=strlen -DWMEMMOVE=memmove -DHAVE_DH -Dmin=min -DTINYPRINTF_OVERRIDE_LIBC
-#CFLAGS += -DDEBUG_WOLFSSH
-INCLUDES += -ISSH_Server
-CSRC += $(wildcard SSH_Server/*.c)
 
 CSRC += $(wildcard ../stm32/system/syscalls/syscalls.c)
 #SSL

modules/parameters.c

@@ -1051,6 +1051,7 @@ void GetTelnetEnableStateStr(char *str, uint8_t *len)
     *len = 1;
 }
 
+#if defined HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры SSH
 
@@ -1077,6 +1078,7 @@ void GetSSHEnableStateStr(char *str, uint8_t *len)
 
     *len = 1;
 }
+#endif // HARDWARE_BT6709
 #endif
 
 // ************************************************************************** //
@@ -1625,6 +1627,7 @@ void SetTelnetEnableStateStr(char *str)
 
 }
 
+#if defined HARDWARE_BT6709
 // ************************************************************************** //
 //                             Параметры SSH
 /**
@@ -1647,6 +1650,7 @@ void SetSSHEnableStateStr(char *str)
     }
 
 }
+#endif // HARDWARE_BT6709
 #endif
 #endif
 // ************************************************************************** //