Merge remote-tracking branch 'ewowi/main'

src/Sys/SysModFiles.cpp

@@ -107,8 +107,7 @@ void SysModFiles::setup() {
 
 }
 
-void SysModFiles::loop() {
-  // SysModule::loop();
+void SysModFiles::loop20ms() {
 
   if (filesChanged) {
     filesChanged = false;

src/Sys/SysModFiles.h

@@ -28,7 +28,7 @@ class SysModFiles: public SysModule {
 
   SysModFiles();
   void setup();
-  void loop();
+  void loop20ms();
   void loop10s();
 
   bool remove(const char * path);

src/Sys/SysModInstances.h

@@ -334,8 +334,7 @@ class SysModInstances:public SysModule {
     }
   }
 
-  void loop() {
-    // SysModule::loop();
+  void loop20ms() { //20 ms instead of loop() tripples the loops/sec!
 
     handleNotifications();
 

src/Sys/SysModModel.cpp

@@ -71,8 +71,7 @@ void SysModModel::setup() {
   #endif //STARBASE_DEVMODE
 }
 
-  void SysModModel::loop() {
-  // SysModule::loop();
+void SysModModel::loop20ms() {
 
   if (!cleanUpModelDone) { //do after all setups
     cleanUpModelDone = true;

src/Sys/SysModModel.h

@@ -194,7 +194,7 @@ class SysModModel:public SysModule {
 
   SysModModel();
   void setup();
-  void loop();
+  void loop20ms();
 
   //scan all vars in the model and remove vars where var["o"] is negative or positive, if ro then remove ro values
   void cleanUpModel(JsonObject parent = JsonObject(), bool oPos = true, bool ro = false);

src/Sys/SysModPins.cpp

@@ -119,7 +119,7 @@ void SysModPins::setup() {
 #endif
 }
 
-void SysModPins::loop() {
+void SysModPins::loop20ms() {
 
   if (pinsChanged) {
     pinsChanged = false;

src/Sys/SysModPins.h

@@ -35,7 +35,7 @@ class SysModPins:public SysModule {
 
   SysModPins();
   void setup();
-  void loop();
+  void loop20ms();
 
   void allocatePin(unsigned8 pinNr, const char * owner, const char * details);
   void deallocatePin(unsigned8 pinNr, const char * owner);

src/Sys/SysModPrint.cpp

@@ -76,8 +76,7 @@ void SysModPrint::setup() {
   ui->initTextArea(parentVar, "log");
 }
 
-void SysModPrint::loop() {
-  // Module::loop();
+void SysModPrint::loop20ms() {
   if (!setupsDone) setupsDone = true;
 }
 

src/Sys/SysModPrint.h

@@ -23,7 +23,7 @@ class SysModPrint:public SysModule {
 
   SysModPrint();
   void setup();
-  void loop();
+  void loop20ms();
 
   //generic print function
   void printf(const char * format, ...);

src/Sys/SysModSystem.cpp

@@ -211,8 +211,6 @@ void SysModSystem::setup() {
 }
 
 void SysModSystem::loop() {
-  // SysModule::loop();
-
   loopCounter++;
   now = millis() + timebase;
 }

src/Sys/SysModUI.cpp

@@ -53,8 +53,7 @@ void SysModUI::setup() {
   }});
 }
 
-void SysModUI::loop() {
-  // SysModule::loop();
+void SysModUI::loop20ms() { //never more then 50 times a second!
 
   for (VarLoop &varLoop : loopFunctions) {
     if (millis() - varLoop.lastMillis >= varLoop.var["interval"].as<int>()) {

src/Sys/SysModUI.h

@@ -45,7 +45,7 @@ class SysModUI: public SysModule {
   //serve index.htm
   void setup();
 
-  void loop();
+  void loop20ms();
   void loop1s();
 
   //order: order%4 determines the column (WIP)

src/Sys/SysModWeb.cpp

@@ -144,8 +144,7 @@ void SysModWeb::setup() {
 
 }
 
-void SysModWeb::loop() {
-  // SysModule::loop();
+void SysModWeb::loop20ms() {
 
   //currently not used as each variable is send individually
   if (this->modelUpdated) {

src/Sys/SysModWeb.h

@@ -60,7 +60,7 @@ class SysModWeb:public SysModule {
   SysModWeb();
 
   void setup();
-  void loop();
+  void loop20ms();
   void loop1s();
 
   void reboot();

src/SysModule.h

@@ -60,6 +60,7 @@ class SysModule {
   const char * name;
   bool success;
   bool isEnabled;
+  unsigned long twentyMsMillis = millis() - random(1000); //random so not all 1s are fired at once
   unsigned long oneSecondMillis = millis() - random(1000); //random so not all 1s are fired at once
   unsigned long tenSecondMillis = millis() - random(10000); //random within a second
 
@@ -73,8 +74,9 @@ class SysModule {
 
   virtual void setup() {}
 
-  virtual void loop() {}
-  virtual void loop1s() {}
+  virtual void loop() {}//24000 fps if no load...
+  virtual void loop20ms() {} //50fps
+  virtual void loop1s() {} //1fps
   virtual void loop10s() {}
 
   virtual void reboot() {}

src/SysModules.cpp

@@ -92,7 +92,7 @@ void SysModules::setup() {
 
 void SysModules::loop() {
   // bool oneSec = false;
-  bool tenSec = false;
+  // bool tenSec = false;
   // if (millis() - oneSecondMillis >= 1000) {
   //   oneSecondMillis = millis();
   //   oneSec = true;
@@ -104,6 +104,10 @@ void SysModules::loop() {
   for (SysModule *module:modules) {
     if (module->isEnabled && module->success) {
       module->loop();
+      if (millis() - module->twentyMsMillis >= 20) {
+        module->twentyMsMillis = millis();
+        module->loop20ms();
+      }
       if (millis() - module->oneSecondMillis >= 1000) {
         module->oneSecondMillis = millis();
         module->loop1s();

src/User/UserModE131.h

@@ -135,8 +135,7 @@ class UserModE131:public SysModule {
     }
   }
 
-  void loop() {
-    // SysModule::loop();
+  void loop20ms() {
     if(!e131Created) {
       return;
     }

src/User/UserModHA.h

@@ -68,8 +68,7 @@ class UserModHA:public SysModule {
 
   }
 
-  void loop() override {
-    // SysModule::loop();
+  void loop20ms() override {
     mqtt->loop();
   }
 

src/User/UserModMDNS.h

@@ -29,10 +29,6 @@ class UserModMDNS:public SysModule {
 
   }
 
-  void loop() {
-    // SysModule::loop();
-  }
-
   void onOffChanged() {
     if (mdls->isConnected && isEnabled) {
 

src/User/UserModMPU6050.h

@@ -92,7 +92,7 @@ class UserModMPU6050: public SysModule {
     mdl->setValue("mtReady", motionTrackingReady);
   }
 
-  void loop() {
+  void loop20ms() { // loop(): 700/s, loop20ms: 3000/s, loop1s(): 5500/s, disabled: 6000/s
     // mpu.getMotion6(&accell.x, &accell.y, &accell.z, &gyro.x, &gyro.y, &gyro.z);
     // // display tab-separated accel/gyro x/y/z values
     // ppf("mpu6050 %d,%d,%d %d,%d,%d\n", accell.x, accell.y, accell.z, gyro.x, gyro.y, gyro.z);