Переглянути джерело

[service_sw] add define SERVICE_CONTROLLER_IP for each model

balbekova 5 роки тому
батько
коміт
4b9c3b34bb

+ 2 - 0
config/board_bt6703.h

@@ -249,4 +249,6 @@ typedef enum {
 
 #define RELAY_NO
 
+#define SERVICE_CONTROLLER_IP  "192.168.0.3"
+
 #endif /* BOARD_PRS_H */

+ 2 - 0
config/board_bt6707.h

@@ -273,4 +273,6 @@ typedef enum {
 
 #define RELAY_NC
 
+#define SERVICE_CONTROLLER_IP  "192.168.0.7"
+
 #endif /* BOARD_BT6707_H_ */

+ 1 - 0
config/board_bt6709.h

@@ -253,5 +253,6 @@ typedef enum {
 #define LED_GREEN_MINOR           LED_MINOR_G
 #define LED_RED_MINOR             LED_MINOR_R
 
+#define SERVICE_CONTROLLER_IP  "192.168.0.9"
 
 #endif /* BOARD_PRS_H */

+ 2 - 0
config/board_bt6710.h

@@ -285,5 +285,7 @@ typedef enum
 #define LED_INIT_ERR              LED_INIT_R
 #define LED_ALARM                 LED_STAT_R
 
+#define SERVICE_CONTROLLER_IP  "192.168.0.10"
+
 
 #endif /* BOARD_PRS_H */

+ 2 - 14
service_hw/Settings/bt_6701_settings.c

@@ -93,13 +93,7 @@ void SETTINGS_SetMac(char *mac)
   */
 void Service_SETTINGS_SetWebParamsDef(void)
 {
-#if defined HARDWARE_BT6707
-	  strcpy(sSettings.sWebParams.ip, "192.168.0.7");
-#elif HARDWARE_BT6709
-	  strcpy(sSettings.sWebParams.ip, "192.168.0.9");
-#elif HARDWARE_BT6703
-	  strcpy(sSettings.sWebParams.ip, "192.168.0.3");
-#endif
+	  strcpy(sSettings.sWebParams.ip, SERVICE_CONTROLLER_IP);
 	  strcpy(sSettings.sWebParams.gate, "192.168.0.1");
 	  strcpy(sSettings.sWebParams.mask, "255.255.255.0");
 	  sSettings.sWebParams.dhcpEnable = 1;
@@ -110,13 +104,7 @@ void Service_SETTINGS_SetWebParamsDef(void)
   */
 void Service_SETTINGS_SetTempWebParamsDef(void)
 {
-#if defined HARDWARE_BT6707
-	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.7");
-#elif HARDWARE_BT6709
-	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.9");
-#elif HARDWARE_BT6703
-	  strcpy(sSettings.sWebTempParams.ip, "192.168.0.3");
-#endif
+	  strcpy(sSettings.sWebTempParams.ip, SERVICE_CONTROLLER_IP);
 	  strcpy(sSettings.sWebTempParams.gate, "192.168.0.1");
 	  strcpy(sSettings.sWebTempParams.mask, "255.255.255.0");
 	  sSettings.sWebTempParams.dhcpEnable = 1;