Merge pull request #293 from doudar/ERG-Respin

Erg respin

Author: doudar

CHANGELOG.md

@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- 
+
+### Changed
+- Refactored ERG 
+
+### Hardware
+- 
+
+#### IC4 Mod
+- 
+
+## [1.12.30]
+
 ### Added
 - Added userConfig shifterDir to change direction of shifters in software to compensate for wiring
 - Added userConfig StepperDir to change direction of stepper in software to compensate for wiring

include/ERG_Mode.h

@@ -14,29 +14,11 @@
 #define ERG_MODE_LOG_CSV_TAG "ERG_Mode_CSV"
 #define POWERTABLE_LOG_TAG   "PowTab"
 #define ERG_MODE_DELAY       700
-#define RETURN_ERROR -99
+#define RETURN_ERROR         -99
 
 extern TaskHandle_t ErgTask;
 void setupERG();
-void ergTaskLoop(void *pvParameters);
-
-class ErgMode {
- public:
-  void computErg(int newSetpoint);
-  void _writeLogHeader();
-  void _writeLog(int cycles, float currentIncline, float newIncline, int currentSetPoint, int newSetPoint, int currentWatts, int newWatts, int currentCadence, int newCadence);
-
- private:
-  bool engineStopped  = false;
-  bool initialized    = false;
-  int setPoint        = 0;
-  int cycles          = 0;
-  int offsetMultiplier = 0;
-  Measurement watts   = Measurement(0);
-  int cadence         = 0;
-
-  bool _userIsSpinning(int cadence, float incline);
-};
+void ergTaskLoop(void* pvParameters);
 
 class PowerEntry {
  public:
@@ -46,15 +28,15 @@ class PowerEntry {
   int readings;
 
   PowerEntry() {
-    this->watts    = 0;
+    this->watts          = 0;
     this->targetPosition = 0;
-    this->cad      = 0;
-    this->readings = 0;
+    this->cad            = 0;
+    this->readings       = 0;
   }
 };
 
 class PowerBuffer {
-  public:
+ public:
   PowerEntry powerEntry[POWER_SAMPLES];
   void set(int);
   void reset();
@@ -63,19 +45,55 @@ class PowerBuffer {
 class PowerTable {
  public:
   PowerEntry powerEntry[POWERTABLE_SIZE];
-  
+
+  // Pick up new power value and put them into the power table
+  void processPowerValue(PowerBuffer& powerBuffer, int cadence, Measurement watts);
+
+  // Sets stepper min/max value from power table
+  void setStepperMinMax();
+
   // Catalogs a new entry into the power table.
-  void newEntry(PowerBuffer powerBuffer);
-  
+  void newEntry(PowerBuffer& powerBuffer);
+
   // returns incline for wattTarget. Null if not found.
   int32_t lookup(int watts, int cad);
-  
+
   // load power table from spiffs
   bool load();
-  
+
   // save powertable from spiffs
   bool save();
-  
+
   // Display power table in log
   void toLog();
 };
+
+class ErgMode {
+ public:
+  ErgMode(PowerTable* powerTable) { this->powerTable = powerTable; }
+  void computErg();
+  void _writeLogHeader();
+  void _writeLog(int cycles, float currentIncline, float newIncline, int currentSetPoint, int newSetPoint, int currentWatts, int newWatts, int currentCadence, int newCadence);
+
+ private:
+  bool engineStopped   = false;
+  bool initialized     = false;
+  int setPoint         = 0;
+  int cycle            = 0;
+  int offsetMultiplier = 0;
+  Measurement watts    = Measurement(0);
+  int cadence          = 0;
+  PowerTable* powerTable;
+
+  // check if user is spinning, reset incline if user stops spinning
+  bool _userIsSpinning(int cadence, float incline);
+
+  // calculate incline if setpoint (from Zwift) changes
+  void _setPointChangeState(int newSetPoint, int newCadence, Measurement& newWatts, float currentIncline);
+
+  // calculate incline if setpoint is unchanged
+  void _inSetpointState(int newSetPoint, int newCadence, Measurement& newWatts, float currentIncline);
+
+  // update localvalues + incline, creates a log
+  void _updateValues(int newSetPoint, int newCadence, Measurement& newWatts, float currentIncline, float newIncline);
+};