Pārlūkot izejas kodu

change net settings in service soft

balbekova 7 gadi atpakaļ
vecāks
revīzija
ff9f642092

+ 4 - 2
service_hw/Hardware/hw_init.c

@@ -15,6 +15,7 @@
 #include "wdg.h"
 #include "usart.h"
 #include "settings_api.h"
+#include "bt_6701_settings.h"
 #include "buttons.h"
 #include "commands_api.h"
 #include "led.h"
@@ -69,8 +70,9 @@ void BT_6702_Init(void)
 	init_settings();
   
     SETTINGS_Load();
-    /*SETTINGS_SetTempWebParamsDef();
-    SETTINGS_Save();*/
+    Service_SETTINGS_SetWebParamsDef();
+    Service_SETTINGS_SetTempWebParamsDef();
+    SETTINGS_Save();
     
     COM_ReadTestState();
     

+ 31 - 0
service_hw/Settings/bt_6701_settings.c

@@ -88,6 +88,37 @@ void SETTINGS_SetMac(char *mac)
 }
 
 
+/**
+  * @brief  Установить параметры сетевого подключения по умолчанию
+  */
+void Service_SETTINGS_SetWebParamsDef(void)
+{
+#ifdef HARDWARE_BT6706
+	  strcpy(sSettings.sWebParams.ip, "192.168.0.6");
+#elif HARDWARE_BT6702
+	  strcpy(sSettings.sWebParams.ip, "192.168.0.2");
+#endif
+	  strcpy(sSettings.sWebParams.gate, "192.168.0.1");
+	  strcpy(sSettings.sWebParams.mask, "255.255.255.0");
+	  sSettings.sWebParams.dhcpEnable = 1;
+}
+
+/**
+  * @brief  Установить временные параметры сетевого подключения по умолчанию
+  */
+void Service_SETTINGS_SetTempWebParamsDef(void)
+{
+#ifdef HARDWARE_BT6706
+	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.6");
+#elif HARDWARE_BT6702
+	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.2");
+#endif
+	  strcpy(sSettings.sWebTempParams.gate, "192.168.0.1");
+	  strcpy(sSettings.sWebTempParams.mask, "255.255.255.0");
+	  sSettings.sWebTempParams.dhcpEnable = 1;
+}
+
+
 
 
 

+ 10 - 0
service_hw/Settings/bt_6701_settings.h

@@ -39,6 +39,16 @@ void SETTINGS_SetSerno(char *serno);
   */
 void SETTINGS_SetMac(char *mac);
 
+/**
+  * @brief  Установить параметры сетевого подключения по умолчанию
+  */
+void Service_SETTINGS_SetWebParamsDef(void);
+
+/**
+  * @brief  Установить временные параметры сетевого подключения по умолчанию
+  */
+void Service_SETTINGS_SetTempWebParamsDef(void);
+
 #endif /* #ifndef __BT_6701_SETTINGS_H */
 
 /********************************* (C) РОТЕК **********************************/