Rewrote how processPowerValue got their readings for the power table.

include/ERG_Mode.h

@@ -19,6 +19,7 @@
 class PowerEntry {
  public:
   int watts;
+  int resistance; 
   int32_t targetPosition;
   int cad;
   int readings;
@@ -28,6 +29,7 @@ class PowerEntry {
     this->targetPosition = 0;
     this->cad            = 0;
     this->readings       = 0;
+    this->resistance     = 0; 
   }
 };
 

include/settings.h

@@ -254,7 +254,7 @@ const char* const DEFAULT_PASSWORD = "password";
 #define RUNTIMECONFIG_JSON_SIZE 1000 + DEBUG_LOG_BUFFER_SIZE
 
 // PowerTable Version
-#define TABLE_VERSION 5
+#define TABLE_VERSION 6
 
 /* Number of entries in the ERG Power Lookup Table
  This is currently maintained as to keep memory usage lower and reduce the print output of the table.

src/ERG_Mode.cpp

@@ -15,6 +15,7 @@
 #include <cmath>
 #include <limits>
 #include <numeric>
+#include <unordered_map>
 
 PowerTable* powerTable = new PowerTable;
 
@@ -108,18 +109,30 @@ int PowerBuffer::getReadings() {
   return ret;
 }
 
-void PowerTable::processPowerValue(PowerBuffer& powerBuffer, int cadence, Measurement watts) {
+void PowerTable::processPowerValue(PowerBuffer& powerBuffer, int cadence, Measurement watts) { //this basically checks the constaraints and if everything is good it adds it into the powerbuffer. no need to change
+  static int calcStep; //calcStep is the percentage range of the stepper motor 
+
   if ((cadence >= (MINIMUM_TABLE_CAD - (POWERTABLE_CAD_INCREMENT / 2))) &&
-      (cadence <= (MINIMUM_TABLE_CAD + (POWERTABLE_CAD_INCREMENT * POWERTABLE_CAD_SIZE) - (POWERTABLE_CAD_SIZE / 2))) && (watts.getValue() > 10) &&
+      (cadence <= (MINIMUM_TABLE_CAD + (POWERTABLE_CAD_INCREMENT * POWERTABLE_CAD_SIZE) - (POWERTABLE_CAD_SIZE / 2))) && (watts.getValue() > 10) && //adding constraints 
       (watts.getValue() < (POWERTABLE_WATT_SIZE * POWERTABLE_WATT_INCREMENT))) {
-    if (powerBuffer.powerEntry[0].readings == 0) {
+
+        if(rtConfig->getMaxStep() == DEFAULT_STEPPER_TRAVEL && rtConfig->getMinStep() == -DEFAULT_STEPPER_TRAVEL){
+          int totalStep = ((rtConfig->getMaxStep() - rtConfig->getMaxStep() / 2000000)); //stepper distance is 400,000,000 so dividing it by 2,000,000 gives us 200
+          calcStep = totalStep * 0.05; // 5% of that would give us around a 10 positive and negative range
+        } else if (rtConfig->getHomed()){
+          int totalStep = (rtConfig->getMaxStep() / 100); //maxStep should be around 22000 / 100 gives us 200ish
+          calcStep = totalStep * 0.05; // 5% of that would give us around a 10 positive and negative range
+        }
+
+    if (powerBuffer.powerEntry[0].readings == 0) { //we need to make sure stepper position is not negative so it only takes positive resistance values
       // Take Initial reading
       powerBuffer.set(0);
-      // Check that reading is within 1/2 of the initial reading
-    } else if ((abs(powerBuffer.powerEntry[0].watts - watts.getValue()) < (POWERTABLE_WATT_INCREMENT / 2)) &&
-               (abs(powerBuffer.powerEntry[0].cad - cadence) < (POWERTABLE_CAD_INCREMENT))) {
+      // Check if the current stepper posistion is within a 5% range of the previous stepper position and that the current position is not negative
+    } if (((ss2k->getCurrentPosition()/100) >= ((powerBuffer.powerEntry[0].targetPosition) - calcStep)) &&
+    ((ss2k->getCurrentPosition()/100) <= ((powerBuffer.powerEntry[0].targetPosition) + calcStep))) {
       for (int i = 1; i < POWER_SAMPLES; i++) {
         if (powerBuffer.powerEntry[i].readings == 0) {
+          SS2K_LOG(POWERTABLE_LOG_TAG, "Success!"); 
           powerBuffer.set(i);  // Add additional readings to the buffer.
           break;
         }
@@ -129,8 +142,8 @@ void PowerTable::processPowerValue(PowerBuffer& powerBuffer, int cadence, Measur
         this->toLog();
         this->_manageSaveState();
         powerBuffer.reset();
-      }
-    } else {  // Reading was outside the range - clear the buffer and start over.
+        }
+    }  else {  // Reading was outside the range - clear the buffer and start over.
       powerBuffer.reset();
     }
   }