Эх сурвалжийг харах

Merge pull request #59 from sui77/master

Restart fix and simplify
Ayush Sharma 4 жил өмнө
parent
commit
8c42ac50d7

+ 0 - 2
README.md

@@ -129,7 +129,6 @@ void setup(void) {
 }
 
 void loop(void) {
-  AsyncElegantOTA.loop();
 }
 
 ```
@@ -176,7 +175,6 @@ void setup(void) {
 }
 
 void loop(void) {
-  AsyncElegantOTA.loop();
 }
 
 ```

+ 0 - 1
examples/ESP32_Async_Demo/ESP32_Async_Demo.ino

@@ -36,5 +36,4 @@ void setup(void) {
 }
 
 void loop(void) {
-  AsyncElegantOTA.loop();
 }

+ 0 - 1
examples/ESP8266_Async_Demo/ESP8266_Async_Demo.ino

@@ -36,5 +36,4 @@ void setup(void) {
 }
 
 void loop(void) {
-  AsyncElegantOTA.loop();
 }

+ 1 - 2
keywords.txt

@@ -1,3 +1,2 @@
 AsyncElegantOTA	KEYWORD1
-begin	KEYWORD2
-loop	KEYWORD2
+begin	KEYWORD2

+ 12 - 16
src/AsyncElegantOTA.h

@@ -1,6 +1,8 @@
 #ifndef AsyncElegantOTA_h
 #define AsyncElegantOTA_h
 
+#warning AsyncElegantOTA.loop(); is deprecated, please remove it from loop() if defined. This function will be removed in a future release.
+
 #include "Arduino.h"
 #include "stdlib_noniso.h"
 
@@ -81,7 +83,7 @@ class AsyncElegantOtaClass{
                 response->addHeader("Connection", "close");
                 response->addHeader("Access-Control-Allow-Origin", "*");
                 request->send(response);
-                restartRequired = true;
+                restart();
             }, [&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
                 //Upload handler chunks in data
                 if(_authRequired){
@@ -132,20 +134,15 @@ class AsyncElegantOtaClass{
             });
         }
 
-        void loop(){
-            if(restartRequired){
-                yield();
-                delay(1000);
-                yield();
-                #if defined(ESP8266)
-                    ESP.restart();
-                #elif defined(ESP32)
-                    // ESP32 will commit sucide
-                    esp_task_wdt_init(1,true);
-                    esp_task_wdt_add(NULL);
-                    while(true);
-                #endif
-            }
+        // deprecated, keeping for backward compatibility
+        void loop() {
+        }
+        
+        void restart() {
+            yield();
+            delay(1000);
+            yield();
+            ESP.restart();
         }
 
     private:
@@ -166,7 +163,6 @@ class AsyncElegantOtaClass{
         String _username = "";
         String _password = "";
         bool _authRequired = false;
-        bool restartRequired = false;
 
 };