Erg_Mode, Stepper and HTTP_Server_Consolidated.

doudar · Sep 2, 2024 · 0e75789 · 0e75789
1 parent 0044afd
commit 0e75789
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 171 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,7 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed driver temp checking. It's not accurate on the ESP32. 
 - Peloton resistance limit enhancements.
 - Continue updating power metrics to other clients if one client disconnects.
-
+- Freed 13k of ram by consolidating tasks and using timers instead of delays. 
 
 ### Hardware
 - added Yesoul S3.

diff --git a/include/ERG_Mode.h b/include/ERG_Mode.h
@@ -16,10 +16,6 @@
 #define ERG_MODE_DELAY       700
 #define RETURN_ERROR         INT32_MIN
 
-extern TaskHandle_t ErgTask;
-void setupERG();
-void ergTaskLoop(void* pvParameters);
-
 class PowerEntry {
  public:
   int watts;
@@ -95,6 +91,9 @@ class PowerTable {
  public:
   TableRow tableRow[POWERTABLE_CAD_SIZE];
 
+  // What used to be in the ERGTaskLoop(). This is the main control function for ERG Mode and the powertable operations.
+  void runERG();
+
   // Pick up new power value and put them into the power table
   void processPowerValue(PowerBuffer& powerBuffer, int cadence, Measurement power);
 

diff --git a/include/HTTP_Server_Basic.h b/include/HTTP_Server_Basic.h
@@ -25,7 +25,7 @@ class HTTP_Server {
   static void handleHrSlider();
   static void FirmwareUpdate();
 
-  static void webClientUpdate(void *pvParameters);
+  static void webClientUpdate();
 
   HTTP_Server() { internetConnection = false; }
 };

diff --git a/include/Main.h b/include/Main.h
@@ -43,10 +43,10 @@ class SS2K {
   bool isUpdating          = false;
 
   bool IRAM_ATTR deBounce();
-  static void IRAM_ATTR moveStepper(void *pvParameters);
   static void IRAM_ATTR maintenanceLoop(void *pvParameters);
   static void IRAM_ATTR shiftUp();
   static void IRAM_ATTR shiftDown();
+  static void moveStepper();
   void resetIfShiftersHeld();
   void startTasks();
   void stopTasks();

diff --git a/include/settings.h b/include/settings.h
@@ -11,10 +11,10 @@
 #define AUTO_FIRMWARE_UPDATE true
 
 // Default Bluetooth WiFi and MDNS Name
-const char * const DEVICE_NAME  = "SmartSpin2k";
+const char* const DEVICE_NAME = "SmartSpin2k";
 
 // Default WiFi Password
-const char * const DEFAULT_PASSWORD = "password";
+const char* const DEFAULT_PASSWORD = "password";
 
 // default URL To get Updates From.
 // If changed you'll also need to get a root certificate from the new server
@@ -38,7 +38,7 @@ const char * const DEFAULT_PASSWORD = "password";
 // name of local file to save Physical Working Capacity in LittleFS
 #define userPWCFILENAME "/userPWC.txt"
 
-// name of the local file to save the torque table. 
+// name of the local file to save the torque table.
 #define POWER_TABLE_FILENAME "/PowerTable.txt"
 
 // Default Incline Multiplier.
@@ -80,13 +80,13 @@ const char * const DEFAULT_PASSWORD = "password";
 // Amount to change watt target per shift in ERG mode.
 #define ERG_PER_SHIFT 10
 
-//Pass all of the FTMS commands sent to SS2k down to a connected FTMS device. 
+// Pass all of the FTMS commands sent to SS2k down to a connected FTMS device.
 #define FTMS_PASSTHROUGH false
 
 // Use internal ERG control on external FTMS Trainer.
-//#define INTERNAL_ERG_4EXT_FTMS
+// #define INTERNAL_ERG_4EXT_FTMS
 
-//Minimum cadence where ERG mode stops.
+// Minimum cadence where ERG mode stops.
 #define MIN_ERG_CADENCE 30
 
 // Default Min Watts to stop stepper.
@@ -268,7 +268,7 @@ const char * const DEFAULT_PASSWORD = "password";
 // Size of increments (in watts) for the ERG Lookup Table. This needs to be a decimal for proper calculation.
 #define POWERTABLE_WATT_INCREMENT 30
 
-// Size of increments (in CAD) for the ERG Lookup Table. This needs to be a decimal for proper calculation. 
+// Size of increments (in CAD) for the ERG Lookup Table. This needs to be a decimal for proper calculation.
 #define POWERTABLE_CAD_INCREMENT 5
 
 // Number of similar power samples to take before writing to the Power Table
@@ -283,8 +283,8 @@ const char * const DEFAULT_PASSWORD = "password";
 // Where does the CAD portion of the table start?
 #define MINIMUM_TABLE_CAD 60
 
-//Minimum positions recorded in the active table before attempting to load the saved table.
-//Increase this value if the offset for the loaded table is inaccurate.
+// Minimum positions recorded in the active table before attempting to load the saved table.
+// Increase this value if the offset for the loaded table is inaccurate.
 #define MINIMUM_RELIABLE_POSITIONS 3
 
 // Temperature of the ESP32 at which to start reducing the power output of the stepper motor driver.
@@ -303,21 +303,18 @@ const char * const DEFAULT_PASSWORD = "password";
 #define BLE_RECONNECT_INTERVAL 1
 
 // Interval for polling ble battery updates
-#define BATTERY_UPDATE_INTERVAL_MILLIS 300000 
+#define BATTERY_UPDATE_INTERVAL_MILLIS 300000
 
 // Initial and web scan duration.
 #define DEFAULT_SCAN_DURATION 5
 
 // BLE automatic reconnect duration. Set this low to avoid interruption.
 #define BLE_RECONNECT_SCAN_DURATION 5
 
-//Task Stack Sizes
-#define MAIN_STACK 4500
-#define ERG_STACK 6000
-#define HTTP_STACK 6000
-#define BLE_COMM_STACK 6000
+// Task Stack Sizes
+#define MAIN_STACK       5000
+#define BLE_COMM_STACK   6000
 #define BLE_CLIENT_STACK 5500
-#define STEPPER_STACK 2000
 
 // Uncomment to enable stack size debugging info
 // #define DEBUG_STACK

diff --git a/src/BLE_Setup.cpp b/src/BLE_Setup.cpp
@@ -14,24 +14,19 @@
 void setupBLE() {  // Common BLE setup for both client and server
   SS2K_LOG(BLE_SETUP_LOG_TAG, "Starting Arduino BLE Client application...");
   BLEDevice::init(userConfig->getDeviceName());
-  BLEDevice::setMTU(515); //-- enabling this is very important for BLE firmware updates.
+  BLEDevice::setMTU(515);  //-- enabling this is very important for BLE firmware updates.
   spinBLEClient.start();
   startBLEServer();
 
   xTaskCreatePinnedToCore(BLECommunications,      /* Task function. */
                           "BLECommunicationTask", /* name of task. */
-                          BLE_COMM_STACK,                   /* Stack size of task*/
+                          BLE_COMM_STACK,         /* Stack size of task*/
                           NULL,                   /* parameter of the task */
                           3,                      /* priority of the task*/
                           &BLECommunicationTask,  /* Task handle to keep track of created task */
                           1);                     /* pin task to core */
 
   SS2K_LOG(BLE_SETUP_LOG_TAG, "BLE Notify Task Started");
-  /*vTaskDelay(100 / portTICK_PERIOD_MS);
-  if (strcmp(userConfig->getConnectedPowerMeter(), "none") != 0 || strcmp(userConfig->getConnectedHeartMonitor(), "none") != 0) {
-    spinBLEClient.serverScan(true);
-    SS2K_LOG(BLE_SETUP_LOG_TAG, "Scanning");
-  }*/
   SS2K_LOG(BLE_SETUP_LOG_TAG, "%s %s %s", userConfig->getConnectedPowerMeter(), userConfig->getConnectedHeartMonitor(), userConfig->getConnectedRemote());
   SS2K_LOG(BLE_SETUP_LOG_TAG, "End BLE Setup");
 }
diff --git a/src/ERG_Mode.cpp b/src/ERG_Mode.cpp
@@ -16,42 +16,30 @@
 #include <limits>
 #include <numeric>
 
-TaskHandle_t ErgTask;
 PowerTable* powerTable = new PowerTable;
 
 // Create a torque table representing 0w-1000w in 50w increments.
 // i.e. powerTable[1] corresponds to the incline required for 50w. powerTable[2] is the incline required for 100w and so on.
 
-void setupERG() {
-  SS2K_LOG(ERG_MODE_LOG_TAG, "Starting ERG Mode task...");
-  xTaskCreatePinnedToCore(ergTaskLoop,    /* Task function. */
-                          "FTMSModeTask", /* name of task. */
-                          ERG_STACK,      /* Stack size of task*/
-                          NULL,           /* parameter of the task */
-                          1,              /* priority of the task*/
-                          &ErgTask,       /* Task handle to keep track of created task */
-                          0);             /* pin task to core 0 */
-
-  SS2K_LOG(ERG_MODE_LOG_TAG, "ERG Mode task started");
-}
+void PowerTable::runERG() {
+  static ErgMode ergMode;
+  static PowerBuffer powerBuffer;
 
-void ergTaskLoop(void* pvParameters) {
-  ErgMode ergMode;
-  PowerBuffer powerBuffer;
+  // ergMode._writeLogHeader();
+  static bool hasConnectedPowerMeter = false;
+  static bool simulationRunning      = false;
+  static int loopCounter             = 0;
 
-  ergMode._writeLogHeader();
-  bool hasConnectedPowerMeter = false;
-  bool simulationRunning      = false;
-  int loopCounter             = 0;
+  static unsigned long int ergTimer = millis();
 
-  while (true) {
+  if ((millis() - ergTimer) > ERG_MODE_DELAY) {
+    // reset the timer.
+    ergTimer = millis();
     // be quiet while updating via BLE
-    while (ss2k->isUpdating) {
-      vTaskDelay(ERG_MODE_DELAY / portTICK_PERIOD_MS);
+    if (ss2k->isUpdating) {
+      return;
     }
 
-    vTaskDelay(ERG_MODE_DELAY / portTICK_PERIOD_MS);
-
     if (rtConfig->cad.getValue() > 0 && rtConfig->watts.getValue() > 0) {
       hasConnectedPowerMeter = spinBLEClient.connectedPM;
       simulationRunning      = rtConfig->watts.getTarget();
@@ -82,12 +70,7 @@ void ergTaskLoop(void* pvParameters) {
     if (ss2k->resetPowerTableFlag) {
       powerTable->reset();
     }
-
     loopCounter++;
-
-#ifdef DEBUG_STACK
-    Serial.printf("ERG Task: %d \n", uxTaskGetStackHighWaterMark(ErgTask));
-#endif  // DEBUG_STACK
   }
 }
 
@@ -932,8 +915,8 @@ bool PowerTable::_manageSaveState() {
         }
         this->tableRow[i].tableEntry[j].targetPosition = savedTargetPosition;
         this->tableRow[i].tableEntry[j].readings       = savedReadings;
-        //SS2K_LOG(POWERTABLE_LOG_TAG, "Position %d, %d, Target %d, Readings %d, loaded", i, j, this->tableRow[i].tableEntry[j].targetPosition,
-        //         this->tableRow[i].tableEntry[j].readings);
+        // SS2K_LOG(POWERTABLE_LOG_TAG, "Position %d, %d, Target %d, Readings %d, loaded", i, j, this->tableRow[i].tableEntry[j].targetPosition,
+        //          this->tableRow[i].tableEntry[j].readings);
       }
     }
 

diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
@@ -26,8 +26,6 @@
 
 File fsUploadFile;
 
-TaskHandle_t webClientTask;
-
 IPAddress myIP;
 
 // DNS server
@@ -55,7 +53,7 @@ void _staSetup() {
 void _APSetup() {
   // WiFi.eraseAP(); //Needed if we switch back to espressif32 @6.5.0
   WiFi.mode(WIFI_AP);
-  WiFi.setHostname("reset"); // Fixes a bug when switching Arduino Core Versions
+  WiFi.setHostname("reset");  // Fixes a bug when switching Arduino Core Versions
   WiFi.softAPsetHostname("reset");
   WiFi.setHostname(userConfig->getDeviceName());
   WiFi.softAPsetHostname(userConfig->getDeviceName());
@@ -399,14 +397,6 @@ void HTTP_Server::start() {
   /********************************************End Server
    * Handlers*******************************/
 
-  xTaskCreatePinnedToCore(HTTP_Server::webClientUpdate,             /* Task function. */
-                          "webClientUpdate",                        /* name of task. */
-                          HTTP_STACK + (DEBUG_LOG_BUFFER_SIZE * 2), /* Stack size of task Used to be 3000*/
-                          NULL,                                     /* parameter of the task */
-                          10,                                       /* priority of the task */
-                          &webClientTask,                           /* Task handle to keep track of created task */
-                          0);                                       /* pin task to core */
-
 #ifdef USE_TELEGRAM
   xTaskCreatePinnedToCore(telegramUpdate,   /* Task function. */
                           "telegramUpdate", /* name of task. */
@@ -420,26 +410,24 @@ void HTTP_Server::start() {
   SS2K_LOG(HTTP_SERVER_LOG_TAG, "HTTP server started");
 }
 
-void HTTP_Server::webClientUpdate(void *pvParameters) {
-  static unsigned long mDnsTimer = millis();  // NOLINT: There is no overload in String for uint64_t
-  for (;;) {
+void HTTP_Server::webClientUpdate() {
+  static unsigned long int _webClientTimer = millis();
+  if (millis() - _webClientTimer > WEBSERVER_DELAY) {
+    _webClientTimer                 = millis();
+    static unsigned long mDnsTimer = millis();  // NOLINT: There is no overload in String for uint64_t
     server.handleClient();
-    vTaskDelay(WEBSERVER_DELAY / portTICK_RATE_MS);
     if (WiFi.getMode() != WIFI_MODE_STA) {
       dnsServer.processNextRequest();
     }
     // Keep MDNS alive
     if ((millis() - mDnsTimer) > 30000) {
       MDNS.addServiceTxt("http", "_tcp", "lf", String(mDnsTimer));
       mDnsTimer = millis();
-#ifdef DEBUG_STACK
-      Serial.printf("HttpServer: %d \n", uxTaskGetStackHighWaterMark(webClientTask));
-#endif  // DEBUG_STACK
     }
   }
 }
 
-void HTTP_Server::handleBTScanner(){
+void HTTP_Server::handleBTScanner() {
   spinBLEClient.doScan = true;
   handleLittleFSFile();
 }