Upload progress fix

DmytroKorniienko · Nov 5, 2020 · be4bcb6 · vortigont · Nov 8, 2020 · be4bcb6
1 parent 7e83cfc
commit be4bcb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/EmbUI/EmbUI.cpp b/EmbUI/EmbUI.cpp
@@ -341,7 +341,7 @@ void EmbUI::begin(){
                 Update.printError(Serial);
             }
         }
-        embui.uploadProgress(index + len, request->contentLength());
+        uploadProgress(index + len, request->contentLength());
     });
 
     //First request will return 0 results unless you start scan from somewhere else (loop/setup)
@@ -445,7 +445,7 @@ void EmbUI::set_callback(CallBack set, CallBack action, callback_function_t call
 /*
  * OTA update progress
  */
-uint8_t EmbUI::uploadProgress(size_t len, size_t total){
+uint8_t uploadProgress(size_t len, size_t total){
     static int prev = 0;
     float part = total / 25.0;  // logger chunks
     int curr = len / part;

diff --git a/EmbUI/EmbUI.h b/EmbUI/EmbUI.h
@@ -114,7 +114,7 @@ class Interface;
 void __attribute__((weak)) section_main_frame(Interface *interf, JsonObject *data);
 void __attribute__((weak)) pubCallback(Interface *interf);
 String __attribute__((weak)) httpCallback(const String &param, const String &value, bool isset);
-void __attribute__((weak)) uploadProgress(size_t len, size_t total);
+uint8_t __attribute__((weak)) uploadProgress(size_t len, size_t total);
 void __attribute__((weak)) create_parameters();
 
 //----------------------
@@ -309,11 +309,6 @@ class EmbUI
     callback_function_t _cb_STADisconnected = nullptr;
     callback_function_t _cb_STAGotIP = nullptr;
 
-    /*
-     * OTA update progress, return upload %
-     */
-    uint8_t uploadProgress(size_t len, size_t total);
-
 #ifdef USE_SSDP
     void ssdp_begin() {
           String hn = param(FPSTR(P_hostname));

diff --git a/examples/ex_generic/src/interface.h b/examples/ex_generic/src/interface.h
@@ -26,4 +26,4 @@ void set_language(Interface *interf, JsonObject *data);
 
 //void remote_action(RA action, ...);
 
-//void uploadProgress(size_t len, size_t total);
+//uint8_t uploadProgress(size_t len, size_t total);