Release 1.9 R3

karawin · Apr 28, 2019 · b2bd20c · b2bd20c
1 parent 62c1312
commit b2bd20c
Show file tree

Hide file tree

Showing 25 changed files with 694,848 additions and 694,279 deletions.
diff --git a/ESP8266-Firmware/app/.output/eagle/release/image/eagle.app.v6.out b/ESP8266-Firmware/app/.output/eagle/release/image/eagle.app.v6.out
diff --git a/ESP8266-Firmware/app/include/interface.h b/ESP8266-Firmware/app/include/interface.h
@@ -11,7 +11,7 @@
 
 
 #define RELEASE "1.9"
-#define REVISION "2"
+#define REVISION "3"
 
 
 extern unsigned short adcdiv;	

diff --git a/ESP8266-Firmware/app/user/.output/eagle/release/lib/libuser.a b/ESP8266-Firmware/app/user/.output/eagle/release/lib/libuser.a
diff --git a/ESP8266-Firmware/app/user/interface.c b/ESP8266-Firmware/app/user/interface.c
@@ -441,6 +441,10 @@ ICACHE_FLASH_ATTR void clientParseUrl(char* s)
         for(tmp=0; tmp<(t_end-t+1); tmp++) url[tmp] = 0;
         strncpy(url, t+2, (t_end-t));
         clientSetURL(url);
+		char* title = malloc(88);
+		sprintf(title,"{\"iurl\":\"%s\"}",url); 
+		websocketbroadcast(title, strlen(title));
+		free(title);	
         free(url);
     }
 }
@@ -466,8 +470,12 @@ ICACHE_FLASH_ATTR void clientParsePath(char* s)
         uint8_t tmp;
         for(tmp=0; tmp<(t_end-t+1); tmp++) path[tmp] = 0;
         strncpy(path, t+2, (t_end-t));
-	kprintf(PSTR("cli.path: %s\n"),path);
+//	kprintf(PSTR("cli.path: %s\n"),path);
         clientSetPath(path);
+		char* title = malloc(130);
+		sprintf(title,"{\"ipath\":\"%s\"}",path); 
+		websocketbroadcast(title, strlen(title));
+		free(title);		
         free(path);
     }
 }
@@ -494,6 +502,10 @@ ICACHE_FLASH_ATTR void clientParsePort(char *s)
         strncpy(port, t+2, (t_end-t));
         uint16_t porti = atoi(port);
         clientSetPort(porti);
+		char* title = malloc(130);
+		sprintf(title,"{\"iport\":\"%d\"}",porti); 
+		websocketbroadcast(title, strlen(title));
+		free(title);		
         free(port);
     }
 }

diff --git a/ESP8266-Firmware/app/user/user_main.c b/ESP8266-Firmware/app/user/user_main.c
@@ -323,7 +323,7 @@ void uartInterfaceTask(void *pvParameters) {
 //printf("passwd: %s\nhidden: %d\nmaxc: %d\nauth: %d\n",apconfig->password,apconfig->ssid_hidden,apconfig->max_connection,apconfig->authmode);					
 					if(wifi_softap_set_config(apconfig) != true)printf(PSTR("softap failed%c%c"),0x0d,0x0d);
 					vTaskDelay(1);
-					wifi_get_ip_info(1, info);
+//					wifi_get_ip_info(1, info);
 //					printf(striSTA1,(info->ip.addr&0xff), ((info->ip.addr>>8)&0xff), ((info->ip.addr>>16)&0xff), ((info->ip.addr>>24)&0xff));
 					vTaskDelay(10);
 //					conn = true; 
@@ -335,6 +335,7 @@ void uartInterfaceTask(void *pvParameters) {
 //	wifi_station_set_reconnect_policy(true);
 	// update device info
 	if (wifi_get_opmode () == SOFTAP_MODE) wifi_get_ip_info(STATION_IF, info);
+	else wifi_get_ip_info(STATION_IF, info); // ip netmask gw
 	wifi_station_get_config(config);
 
 
@@ -345,7 +346,7 @@ void uartInterfaceTask(void *pvParameters) {
 	strcpy(device->pass,config->password);
 	saveDeviceSettings(device);	
 
-printf(striSTA1,(info->ip.addr&0xff), ((info->ip.addr>>8)&0xff), ((info->ip.addr>>16)&0xff), ((info->ip.addr>>24)&0xff));
+	printf(striSTA1,(info->ip.addr&0xff), ((info->ip.addr>>8)&0xff), ((info->ip.addr>>16)&0xff), ((info->ip.addr>>24)&0xff));
 
 	kasprintf(localIp,PSTR("%d.%d.%d.%d"),(info->ip.addr&0xff), ((info->ip.addr>>8)&0xff), ((info->ip.addr>>16)&0xff), ((info->ip.addr>>24)&0xff));