浏览代码

Fix: don't delete AP details when connect fails.

Sebastien 5 年之前
父节点
当前提交
9f3f9bfbd2
共有 2 个文件被更改,包括 13 次插入13 次删除
  1. 1 1
      components/wifi-manager/index.html
  2. 12 12
      components/wifi-manager/wifi_manager.c

+ 1 - 1
components/wifi-manager/index.html

@@ -298,7 +298,7 @@
                         </tbody>
                     </table>
                     <h2>Firmware URL:</h2>
-                    <textarea id="fwurl" maxlength="120"></textarea>
+                    <textarea id="fwurl" maxlength="350"></textarea>
                     <div class="buttons">
                         <input type="button" id="flash" class="btn btn-danger" value="Flash!" /><span id="flash-status"></span>
                     </div>

+ 12 - 12
components/wifi-manager/wifi_manager.c

@@ -1279,12 +1279,12 @@ void wifi_manager( void * pvParameters ){
 					}
 
 					/* erase configuration */
-//					if(wifi_manager_config_sta){
-//						ESP_LOGI(TAG, "Erasing WiFi Configuration.");
-//						memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t));
-//						/* save NVS memory */
-//						wifi_manager_save_sta_config();
-//					}
+					if(wifi_manager_config_sta){
+						ESP_LOGI(TAG, "Erasing WiFi Configuration.");
+						memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t));
+						/* save NVS memory */
+						wifi_manager_save_sta_config();
+					}
 					/* start SoftAP */
 					ESP_LOGD(TAG, "Disconnect processing complete. Ordering an AP start.");
 					wifi_manager_send_message(ORDER_START_AP, NULL);
@@ -1311,12 +1311,12 @@ void wifi_manager( void * pvParameters ){
 						xEventGroupClearBits(wifi_manager_event_group, WIFI_MANAGER_REQUEST_RESTORE_STA_BIT);
 
 						/* erase configuration that could not be used to connect */
-						if(wifi_manager_config_sta){
-							ESP_LOGW(TAG, "Erasing wifi manager config.");
-							memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t));
-							/* save empty connection info in NVS memory */
-							wifi_manager_save_sta_config();
-						}
+//						if(wifi_manager_config_sta){
+//							ESP_LOGW(TAG, "Erasing wifi manager config.");
+//							memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t));
+//							/* save empty connection info in NVS memory */
+//							wifi_manager_save_sta_config();
+//						}
 						ESP_LOGD(TAG, "Issuing ORDER_START_AP to trigger AP start.");
 						/* start SoftAP */
 						wifi_manager_send_message(ORDER_START_AP, NULL);