merge...

service_hw/Console/port_microrl.c

@@ -258,7 +258,7 @@ int execute (int argc, const char * const * argv)
         {
           len = strlen(argv[i]);
           strncpy(param, argv[i], len);
-		//  SNTP_SetServerAddr(param);
+		  SNTP_SetServerAddr(param);
 		  TEST_SetTest(TEST_RTC);
 		 // testRtc = true;
           print ("\n\r");

service_hw/Makefile

@@ -76,25 +76,23 @@ CSRC += $(wildcard ../thirdparty/FreeRTOS/portable/MemMang/heap_4.c)
     INCLUDES += -I../thirdparty/lwip/src/include
     INCLUDES += -I../thirdparty/lwip/src/include/netif
     INCLUDES += -I../thirdparty/lwip/src/include/lwip
-    INCLUDES += -I../thirdparty/lwip/src/include/lwip/apps
-    INCLUDES += -I../thirdparty/lwip/src/include/netif
-#    INCLUDES += -I../thirdparty/lwip/src/netif/ppp
+    INCLUDES += -I../thirdparty/lwip/src/include/ipv4
+    INCLUDES += -I../thirdparty/lwip/src/netif/ppp
     INCLUDES += -I../thirdparty/lwip/port
     INCLUDES += -I../thirdparty/lwip/port/FreeRTOS
-    INCLUDES += -I../thirdparty/lwip/system
-    INCLUDES += -I../thirdparty/lwip/system/arch
     INCLUDES += -IEthernet
  # INCLUDES += -I../stm32/stm32f4x7_ethernet 
  	INCLUDES += -I../modules/STM32F4x7_ETH_Driver
-     CSRC += $(wildcard HTTP_Server/http_server.c)
+    CSRC += $(wildcard HTTP_Server/http_server.c)
     CSRC += $(wildcard HTTP_Server/trap_params.c)
     CSRC += $(wildcard HTTP_Server/web_params_api.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/api/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/core/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/core/ipv4/*.c)
+    CSRC += $(wildcard ../thirdparty/lwip/src/core/snmp/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/src/netif/*.c)
-#    CSRC += $(wildcard ../thirdparty/lwip/src/netif/ppp/*.c)
+    CSRC += $(wildcard ../thirdparty/lwip/src/netif/ppp/*.c)
     CSRC += $(wildcard ../thirdparty/lwip/port/FreeRTOS/*.c)
     CSRC += $(wildcard Ethernet/*.c)
   #  CSRC += $(wildcard ../stm32/stm32f4x7_ethernet/*.c)

service_hw/Settings/bt_6701_settings.c

@@ -43,6 +43,7 @@ void SETTINGS_SetTest(char *state)
 
 	sSys = pvPortMalloc(sizeof(*sSys));
 	if (sSys) {
+	  SYS_Load(sSys);
 	  strcpy(sSys->testState, state);
 	  SYS_Save(sSys);
 	  vPortFree(sSys);
@@ -59,6 +60,7 @@ void SETTINGS_SetSerno(char *serno)
 
 	sSys = pvPortMalloc(sizeof(*sSys));
 	if (sSys) {
+	  SYS_Load(sSys);
 	  strcpy(sSys->serial, serno);
 	  strcpy(sSettings.sInfo.serialNumber, sSys->serial);
 	  SYS_Save(sSys);
@@ -76,6 +78,7 @@ void SETTINGS_SetMac(char *mac)
 
 	sSys = pvPortMalloc(sizeof(*sSys));
 	if (sSys) {
+	  SYS_Load(sSys);
 	  strcpy(sSys->mac, mac);
 	  strcpy(sSettings.sInfo.mac, sSys->mac);
 	  SYS_Save(sSys);

service_hw/buttons/buttons.c

@@ -180,9 +180,9 @@ void BUTTON_DEF_UpHandler(void)
   */
 void BUTTON_DEF_DownHandler(void)
 {
-/*	LED_On(LED_INIT_R);
+	LED_On(LED_INIT_R);
 	LED_On(LED_MAJOR_R);
-	LED_On(LED_MINOR_R);*/
+	LED_On(LED_MINOR_R);
 
     fDefPressed = true;
 }