fix Update button protection (prevent double click #527)

optimized scheduler #515 (thx @beegee3)

src/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.63
+* fix Update button protection (prevent double click #527)
+* optimized scheduler #515 (thx @beegee3)
+
 ## 0.5.62
 * fix MQTT `status` update
 * removed MQTT `available_text` (can be deducted from `available`)

src/app.h

@@ -155,8 +155,8 @@ class app : public IApp, public ah::Scheduler {
             return mApi.getTimezoneOffset();
         }
 
-        void getSchedulerInfo(uint16_t *everyMax, uint16_t *atMax) {
+        void getSchedulerInfo(uint8_t *max) {
-            return getStat(everyMax, atMax);
+            return getStat(max);
         }
 
         void setTimestamp(uint32_t newTime) {

src/appInterface.h

@@ -28,7 +28,7 @@ class IApp {
         virtual void setTimestamp(uint32_t newTime) = 0;
         virtual String getTimeStr(uint32_t offset) = 0;
         virtual uint32_t getTimezoneOffset() = 0;
-        virtual void getSchedulerInfo(uint16_t *everyMax, uint16_t *atMax);
+        virtual void getSchedulerInfo(uint8_t *max) = 0;
 
         virtual bool getRebootRequestState() = 0;
         virtual bool getSettingsValid() = 0;

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       62
+#define VERSION_PATCH       63
 
 //-------------------------------------
 typedef struct {

src/utils/scheduler.h

@@ -8,7 +8,6 @@
 #define __SCHEDULER_H__
 
 #include <functional>
-#include "llist.h"
 #include "dbg.h"
 
 namespace ah {
@@ -16,24 +15,17 @@ namespace ah {
 
     enum {SCD_SEC = 1, SCD_MIN = 60, SCD_HOUR = 3600, SCD_12H = 43200, SCD_DAY = 86400};
 
-    struct scdEvry_s {
+    struct sP {
         scdCb c;
         uint32_t timeout;
         uint32_t reload;
-        scdEvry_s() : c(NULL), timeout(0), reload(0) {}
+        bool isTimestamp;
-        scdEvry_s(scdCb a, uint32_t tmt, uint32_t rl) : c(a), timeout(tmt), reload(rl) {}
+        sP() : c(NULL), timeout(0), reload(0), isTimestamp(false) {}
+        sP(scdCb a, uint32_t tmt, uint32_t rl, bool its) : c(a), timeout(tmt), reload(rl), isTimestamp(its) {}
     };
 
-    struct scdAt_s {
+    #define MAX_NUM_TICKER  30
-        scdCb c;
-        uint32_t timestamp;
-        scdAt_s() : c(NULL), timestamp(0) {}
-        scdAt_s(scdCb a, uint32_t ts) : c(a), timestamp(ts) {}
-    };
 
-
-    typedef node_s<scdEvry_s, scdCb, uint32_t, uint32_t> sP;
-    typedef node_s<scdAt_s, scdCb, uint32_t> sPAt;
     class Scheduler {
         public:
             Scheduler() {}
@@ -41,7 +33,10 @@ namespace ah {
             void setup() {
                 mUptime     = 0;
                 mTimestamp  = 0;
+                mMax        = 0;
                 mPrevMillis = millis();
+                for (uint8_t i = 0; i < MAX_NUM_TICKER; i++)
+                    mTickerInUse[i] = false;
             }
 
             void loop(void) {
@@ -66,37 +61,29 @@ namespace ah {
                 mUptime += mDiffSeconds;
                 if(0 != mTimestamp)
                     mTimestamp += mDiffSeconds;
-                checkEvery();
+                checkTicker();
-                checkAt();
 
             }
 
-            void once(scdCb c, uint32_t timeout)     { mStack.add(c, timeout, 0); }
+            void once(scdCb c, uint32_t timeout)     { addTicker(c, timeout, 0, false); }
-            void onceAt(scdCb c, uint32_t timestamp) { mStackAt.add(c, timestamp); }
+            void onceAt(scdCb c, uint32_t timestamp) { addTicker(c, timestamp, 0, true); }
-            uint8_t every(scdCb c, uint32_t interval){ return mStack.add(c, interval, interval)->id; }
+            uint8_t every(scdCb c, uint32_t interval){ return addTicker(c, interval, interval, false); }
 
-            void everySec(scdCb c)  { mStack.add(c, SCD_SEC,  SCD_SEC);  }
+            void everySec(scdCb c)  { every(c, SCD_SEC);  }
-            void everyMin(scdCb c)  { mStack.add(c, SCD_MIN,  SCD_MIN);  }
+            void everyMin(scdCb c)  { every(c, SCD_MIN);  }
-            void everyHour(scdCb c) { mStack.add(c, SCD_HOUR, SCD_HOUR); }
+            void everyHour(scdCb c) { every(c, SCD_HOUR); }
-            void every12h(scdCb c)  { mStack.add(c, SCD_12H,  SCD_12H);  }
+            void every12h(scdCb c)  { every(c, SCD_12H);  }
-            void everyDay(scdCb c)  { mStack.add(c, SCD_DAY,  SCD_DAY);  }
+            void everyDay(scdCb c)  { every(c, SCD_DAY);  }
 
             virtual void setTimestamp(uint32_t ts) {
                 mTimestamp = ts;
             }
 
             bool resetEveryById(uint8_t id) {
-                sP *p = mStack.getFront();
+                if (mTickerInUse[id] == false)
-                while(NULL != p) {
+                    return false;
-                    if(p->id == id)
+                mTicker[id].timeout = mTicker[id].reload;
-                        break;
+                return true;
-                    p = mStack.get(p);
-                }
-                if(NULL != p) {
-                    p->d.timeout = p->d.reload;
-                    return true;
-                }
-                return false;
             }
 
             uint32_t getUptime(void) {
@@ -107,53 +94,57 @@ namespace ah {
                 return mTimestamp;
             }
 
-            void getStat(uint16_t *everyMax, uint16_t *atMax) {
+            void getStat(uint8_t *max) {
-                *everyMax = mStack.getMaxFill();
+                *max = mMax;
-                *atMax    = mStackAt.getMaxFill();
             }
 
         protected:
             uint32_t mTimestamp;
 
         private:
-            inline void checkEvery(void) {
+            inline uint8_t addTicker(scdCb c, uint32_t timeout, uint32_t reload, bool isTimestamp) {
-                sP *p = mStack.getFront();
+                for (uint8_t i = 0; i < MAX_NUM_TICKER; i++) {
-                while(NULL != p) {
+                    if (!mTickerInUse[i]) {
-                    if(mDiffSeconds >= p->d.timeout) { // expired
+                        mTickerInUse[i] = true;
-                        (p->d.c)();
+                        mTicker[i].c = c;
-                        yield();
+                        mTicker[i].timeout = timeout;
-                        if(0 == p->d.reload)
+                        mTicker[i].reload = reload;
-                            p = mStack.rem(p);
+                        mTicker[i].isTimestamp = isTimestamp;
-                        else {
+                        if(mMax == i)
-                            p->d.timeout = p->d.reload;
+                            mMax = i + 1;
-                            p = mStack.get(p);
+                        return i;
-                        }
-                    }
-                    else { // not expired
-                        p->d.timeout -= mDiffSeconds;
-                        p = mStack.get(p);
                     }
                 }
+                return 0xff;
             }
 
-            inline void checkAt(void) {
+            inline void checkTicker(void) {
-                sPAt *p = mStackAt.getFront();
+                bool inUse[MAX_NUM_TICKER];
-                while(NULL != p) {
+                for (uint8_t i = 0; i < MAX_NUM_TICKER; i++)
-                    if((p->d.timestamp) <= mTimestamp) {
+                    inUse[i] = mTickerInUse[i];
-                        (p->d.c)();
+                for (uint8_t i = 0; i < MAX_NUM_TICKER; i++) {
-                        yield();
+                    if (inUse[i]) {
-                        p = mStackAt.rem(p);
+                        if (mTicker[i].timeout <= ((mTicker[i].isTimestamp) ? mTimestamp : mDiffSeconds)) { // expired
+                            if(0 == mTicker[i].reload)
+                                mTickerInUse[i] = false;
+                            else
+                                mTicker[i].timeout = mTicker[i].reload;
+                            (mTicker[i].c)();
+                            yield();
+                        }
+                        else // not expired
+                            if (!mTicker[i].isTimestamp)
+                                mTicker[i].timeout -= mDiffSeconds;
                     }
-                    else
-                        p = mStackAt.get(p);
                 }
             }
 
-            llist<20, scdEvry_s, scdCb, uint32_t, uint32_t> mStack;
+            sP mTicker[MAX_NUM_TICKER];
-            llist<10, scdAt_s, scdCb, uint32_t> mStackAt;
+            bool mTickerInUse[MAX_NUM_TICKER];
             uint32_t mMillis, mPrevMillis, mDiff;
             uint32_t mUptime;
             uint8_t mDiffSeconds;
+            uint8_t mMax;
     };
 }
 

src/web/RestApi.h

@@ -201,10 +201,9 @@ class RestApi {
             //obj[F("littlefs_total")] = LittleFS.totalBytes();
             //obj[F("littlefs_used")] = LittleFS.usedBytes();
 
-            uint16_t evry, at;
+            uint8_t max;
-            mApp->getSchedulerInfo(&evry, &at);
+            mApp->getSchedulerInfo(&max);
-            obj[F("schEvryMax")] = evry;
+            obj[F("schMax")] = max;
-            obj[F("schAtMax")] = at;
         }
 
         void getHtmlSystem(JsonObject obj) {

src/web/html/update.html

@@ -19,9 +19,11 @@
         </div>
         <div id="wrapper">
             <div id="content">
-                <form method="POST" action="/update" enctype="multipart/form-data" accept-charset="utf-8">
+                <form id="form" method="POST" action="/update" enctype="multipart/form-data" accept-charset="utf-8">
-                    <input type="file" name="update"><input type="submit" value="Update">
+                    <input type="file" name="update">
+                    <input type="button" class="btn" value="Update" onclick="hide()">
                 </form>
+
             </div>
         </div>
         <div id="footer">
@@ -54,6 +56,12 @@
                 }
             }
 
+            function hide() {
+                document.getElementById("form").submit();
+                var e = document.getElementById("content");
+                e.replaceChildren(span("update started"));
+            }
+
             getAjax("/api/index", parse);
         </script>
     </body>