better AP IP, reenable AP

PieBru · Jan 12, 2018 · 0f06342 · 0f06342
1 parent 3f5479f
commit 0f06342
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/firmware/0x00000.bin b/firmware/0x00000.bin
diff --git a/firmware/0x10000.bin b/firmware/0x10000.bin
diff --git a/firmware/sha1sums b/firmware/sha1sums
@@ -1,2 +1,2 @@
-e437a3f6ec07520aeb791e0fb70287ff1794bc81  0x00000.bin
-f2a3fb9a65c4b0dc6b6e5e85a11efb8496153e03  0x10000.bin
+533d30838d37938b97e47609f0ec9c96e325ebe8  0x00000.bin
+cb58e58d520ed554de223dd601d5b806d78c45a3  0x10000.bin
diff --git a/user/user_main.c b/user/user_main.c
@@ -2152,6 +2152,7 @@ void wifi_handle_event_cb(System_Event_t *evt)
 	if (config.automesh_mode == AUTOMESH_OPERATIONAL) {
 	  if (evt->event_info.disconnected.reason != 201) {
 	    wifi_set_opmode(STATION_MODE);
+os_printf(">>> Disable AP\r\n");
 	  }
 
 	  config.automesh_tries++;
@@ -2205,6 +2206,11 @@ void wifi_handle_event_cb(System_Event_t *evt)
 	  }
 	}
 
+	if (config.automesh_mode != AUTOMESH_OFF) {
+	  wifi_set_opmode(STATIONAP_MODE);
+os_printf(">>> Enable AP\r\n");
+	}
+
 #ifdef MQTT_CLIENT
 	if (mqtt_enabled) MQTT_Connect(&mqttClient);
 #endif /* MQTT_CLIENT */
@@ -2437,7 +2443,7 @@ void ICACHE_FLASH_ATTR automesh_scan_done(void *arg, STATUS status)
       config.AP_MAC_address[4] = RANDOM_REG & 0xff;
       config.AP_MAC_address[5] = RANDOM_REG & 0xff;
 
-      IP4_ADDR(&config.network_addr, 10, 24, mesh_level, 1);
+      IP4_ADDR(&config.network_addr, 10, 24, mesh_level+1, 1);
 
       config.automesh_mode = AUTOMESH_OPERATIONAL;
       config.automesh_tries = 0;