ERG Mode first try

CHANGELOG.md

@@ -8,12 +8,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added Webpage for Shifting.
+- Added /shift server on backend.
+- Split userConfig into userConfig and rtConfig.
+- Added ERG testing to btsimulator.html
+- Broke out ERG computation into it's own task.
 - Added image for wiki.
 
 ### Changed
 - Adjusted the order of "Submit" "Reboot" and "Reset to Defaults" on the settings page. 
 - Adjusted the setting webpage so "reset to defaults" is harder to accidentally press. 
 - Increased the amount of free stack by removing the default Arduino loop();
+- Updated /shift server on to rtConfig.
+- Fixed redeclaring global targetposition in moveStepper().
+- Renamed Settings page "Submit" button to "Save Setting"
 
 ### Hardware
 - Increased hex head and nut size to 13mm.

data/btsimulator.html

@@ -23,57 +23,88 @@ <h1>BLE Device Simulator</h1>
 
     <h2>Sim Heart Rate</h2>
     <p><span id="hrValue"></span></p>
-    <p><input type="range" onload="requestConfigValues()" onchange="updateHRSlider(this)" id="HRSlider" min="40"
+    <p><input type="range" onload="requestConfigValues()" onchange="updateHrSlider()" id="hrSlider" min="40"
         max="250" value="0" step="1" class="slider2"></p>
     <p><label class="switch"><input type="checkbox" onload="toggleHRCheckbox(this, true)"
           onchange="toggleHRCheckbox(this,true)" id="hrOutput"><span class="slider"></span></label></p>
 
     <h2>Sim Power Output</h2>
     <p><span id="wattsValue"></span></p>
-    <p><input type="range" onload="requestConfigValues()" onchange="updateWattsSlider(this)" id="WattsSlider" min="0"
-        max="2000" value="0" step="1" class="slider2"></p>
+    <p><input type="range" onload="requestConfigValues()" onchange="updateWattsSlider()" id="wattsSlider" min="0"
+        max="600" value="0" step="1" class="slider2"></p>
     <p><label class="switch"><input type="checkbox" onload="toggleWattsCheckbox(this,true)"
           onchange="toggleWattsCheckbox(this,true)" id="wattsOutput"><span class="slider"></span></label></p>
 
     <h2>Sim CAD Output</h2>
     <p><span id="cadValue"></span></p>
-    <p><input type="range" onload="requestConfigValues()" onchange="updateCadSlider(this)" id="CadSlider" min="0"
+    <p><input type="range" onload="requestConfigValues()" onchange="updateCadSlider()" id="cadSlider" min="0"
         max="180" value="0" step="1" class="slider2"></p>
     <p><label class="switch"><input type="checkbox" onload="toggleCadCheckbox(this,true)"
           onchange="toggleCadCheckbox(this,true)" id="cadOutput"><span class="slider"></span></label></p>
+
+    <h1>Trainer Simulator</h1>
+    <h2>Enable ERG</h2>
+    <p>
+      <label class="switch">
+        <input type="checkbox" onload="toggleEnableErgCheckbox(this)" onchange="toggleEnableErgCheckbox(this)"
+          id="enableErgCheckbox">
+        <span class="slider"></span>
+      </label>
+    </p>
+    <h2>ERG Target Watts</h2>
+    <p><span id="targetWattsValue"></span></p>
+    <p><input type="range" onload="requestConfigValues()" onchange="updateTargetWattsSlider()"
+        id="targetWattsSlider" min="0" max="600" value="0" step="1" class="slider2"></p>
+    <p>
+      <label class="switch">
+        <input type="checkbox" onload="toggleTargetWattsCheckbox(this,true)"
+          onchange="toggleTargetWattsCheckbox(this,true)" id="targetWattsOutput">
+        <span class="slider"></span>
+      </label>
+    </p>
 </body>
 <script>
+  //Update values on specified interval
+  setInterval(function () {
+    requestConfigValues();
+
+  }, 2000);
+
+  let pwrTimer;
 
   function toggleHRCheckbox(element, updateServer) {
     if (element.checked) {
-      document.getElementById("HRSlider").hidden = false;
+      document.getElementById("hrSlider").hidden = false;
       document.getElementById("hrValue").hidden = false;
     }
     else {
-      document.getElementById("HRSlider").hidden = true;
+      document.getElementById("hrSlider").hidden = true;
       document.getElementById("hrValue").hidden = true;
     }
     if (updateServer) {
       var xhr = new XMLHttpRequest();
       if (element.checked) {
-        xhr.open("GET", "/hrslider?value=enable", true);
+        xhr.open("GET", "/hrSlider?value=enable", true);
         xhr.send();
       }
       else {
-        xhr.open("GET", "/hrslider?value=disable", true);
+        xhr.open("GET", "/hrSlider?value=disable", true);
         xhr.send();
       }
     }
   }
 
   function toggleWattsCheckbox(element, updateServer) {
     if (element.checked) {
-      document.getElementById("WattsSlider").hidden = false;
+      document.getElementById("wattsSlider").hidden = false;
       document.getElementById("wattsValue").hidden = false;
     }
     else {
-      document.getElementById("WattsSlider").hidden = true;
+      document.getElementById("wattsSlider").hidden = true;
       document.getElementById("wattsValue").hidden = true;
+      if (!!pwrTimer) {
+        clearInterval(pwrTimer);
+      }
     }
 
     if (updateServer) {
@@ -91,11 +122,11 @@ <h2>Sim CAD Output</h2>
 
   function toggleCadCheckbox(element, updateServer) {
     if (element.checked) {
-      document.getElementById("CadSlider").hidden = false;
+      document.getElementById("cadSlider").hidden = false;
       document.getElementById("cadValue").hidden = false;
     }
     else {
-      document.getElementById("CadSlider").hidden = true;
+      document.getElementById("cadSlider").hidden = true;
       document.getElementById("cadValue").hidden = true;
     }
 
@@ -112,64 +143,113 @@ <h2>Sim CAD Output</h2>
     }
   }
 
-  function updateHRSlider(element) {
-    var sliderValue = document.getElementById("HRSlider").value;
+  function updateHrSlider() {
+    var sliderValue = document.getElementById("hrSlider").value;
     document.getElementById("hrValue").innerHTML = sliderValue + " BPM";
     var xhr = new XMLHttpRequest();
-    xhr.open("GET", "/hrslider?value=" + sliderValue, true);
+    xhr.open("GET", "/hrSlider?value=" + sliderValue, true);
     xhr.send();
   }
 
-  function updateWattsSlider(element) {
-    var sliderValue = document.getElementById("WattsSlider").value;
+  function updateWattsSlider() {
+    var sliderValue = document.getElementById("wattsSlider").value;
     document.getElementById("wattsValue").innerHTML = sliderValue + " Watts";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", "/wattsslider?value=" + sliderValue, true);
     xhr.send();
   }
 
-  function updateCadSlider(element) {
-    var sliderValue = document.getElementById("CadSlider").value;
+  function updateCadSlider() {
+    var sliderValue = document.getElementById("cadSlider").value;
     document.getElementById("cadValue").innerHTML = sliderValue + " RPM";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", "/cadslider?value=" + sliderValue, true);
     xhr.send();
   }
 
-  //Update values on specified interval
-  setInterval(function () {
+  function updateTargetWattsSlider() {
+    var sliderValue = document.getElementById("targetWattsSlider").value;
+    document.getElementById("targetWattsValue").innerHTML = sliderValue + " Watts";
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", "/targetwattsslider?value=" + sliderValue, true);
+    xhr.send();
+  }
 
-    requestConfigValues();
+  function toggleTargetWattsCheckbox(element, updateServer) {
+    if (element.checked) {
+      document.getElementById("targetWattsSlider").hidden = false;
+      document.getElementById("targetWattsValue").hidden = false;
+    }
+    else {
+      document.getElementById("targetWattsSlider").hidden = true;
+      document.getElementById("targetWattsValue").hidden = true;
+    }
 
-  }, 2000);
+    if (updateServer) {
+      var xhr = new XMLHttpRequest();
+      if (element.checked) {
+        xhr.open("GET", "/targetwattsslider?value=enable", true);
+        xhr.send();
+      }
+      else {
+        xhr.open("GET", "/targetwattsslider?value=disable", true);
+        xhr.send();
+      }
+    }
+  }
+
+  function toggleEnableErgCheckbox(element) {
+    var xhr = new XMLHttpRequest();
+    if (element.checked) {
+      xhr.open("GET", "/ergmode?value=enable", true);
+      xhr.send();
+    }
+    else {
+      xhr.open("GET", "/ergmode?value=disable", true);
+      xhr.send();
+    }
+  }
 
   function requestConfigValues() {
     var xhttp = new XMLHttpRequest();
     xhttp.onreadystatechange = function () {
       if (this.readyState == 4 && this.status == 200) {
         var obj = JSON.parse(this.responseText);
         document.getElementById("wattsValue").innerHTML = obj.simulatedWatts + " Watts";
-        document.getElementById("WattsSlider").value = obj.simulatedWatts;
+        document.getElementById("wattsSlider").value = obj.simulatedWatts;
         document.getElementById("wattsOutput").checked = obj.simulateWatts;
-        document.getElementById("WattsSlider").hidden = !obj.simulateWatts;
+        document.getElementById("wattsSlider").hidden = !obj.simulateWatts;
         document.getElementById("wattsValue").hidden = !obj.simulateWatts;
 
         document.getElementById("hrValue").innerHTML = obj.simulatedHr + " BPM";
-        document.getElementById("HRSlider").value = obj.simulatedHr;
+        document.getElementById("hrSlider").value = obj.simulatedHr;
         document.getElementById("hrOutput").checked = obj.simulateHr;
-        document.getElementById("HRSlider").hidden = !obj.simulateHr;
+        document.getElementById("hrSlider").hidden = !obj.simulateHr;
         document.getElementById("hrValue").hidden = !obj.simulateHr;
 
         document.getElementById("cadValue").innerHTML = obj.simulatedCad + " RPM";
-        document.getElementById("CadSlider").value = obj.simulatedCad;
+        document.getElementById("cadSlider").value = obj.simulatedCad;
         document.getElementById("cadOutput").checked = obj.simulateCad;
-        document.getElementById("CadSlider").hidden = !obj.simulateCad;
+        document.getElementById("cadSlider").hidden = !obj.simulateCad;
         document.getElementById("cadValue").hidden = !obj.simulateCad;
 
-        setTimeout(function () { document.getElementById("loadingWatermark").remove(); }, 1000);
+        document.getElementById("enableErgCheckbox").checked = obj.ERGMode;
+
+        document.getElementById("targetWattsValue").innerHTML = obj.targetWatts + " Watts";
+        document.getElementById("targetWattsSlider").value = obj.targetWatts == null ? 0 : obj.targetWatts;
+        document.getElementById("targetWattsOutput").checked = obj.simulateTargetWatts;
+        document.getElementById("targetWattsSlider").hidden = !obj.simulateTargetWatts;
+        document.getElementById("targetWattsValue").hidden = !obj.simulateTargetWatts;
+
+        setTimeout(function () {
+          const watermark = document.getElementById("loadingWatermark");
+          if (!!watermark) {
+            document.getElementById("loadingWatermark")?.remove();
+          }
+        }, 1000);
       }
     };
-    xhttp.open("GET", "/configJSON", true);
+    xhttp.open("GET", "/runtimeConfigJSON", true);
     xhttp.send();
   }
 

data/settings.html

@@ -97,8 +97,8 @@ <h2>
                 <input type='button' onclick="clickStep(document.getElementById('ERGSensitivity'), this.value)"
                   value="-">
                 <input style="width:50%; position: relative; top: 5px;" type="range" id="ERGSensitivity"
-                  name="ERGSensitivity" value="1.0" min=".5" max="5" step=".1" class="slider1"
-                  onchange="updateSlider(this, document.getElementById('ERGSensitivityValue'))" />
+                  name="ERGSensitivity" value="1.0" min=".5" max="20" step=".1" class="slider1"
+                  onchange="updateSlider(this.value, document.getElementById('ERGSensitivityValue'))" />
                 <input type='button' onclick="clickStep(document.getElementById('ERGSensitivity'), this.value)"
                   value="+">
               </td>
@@ -140,7 +140,7 @@ <h2>
             </tr>
           </tbody>
         </table>
-        <input type="submit" value="Submit" />
+        <input type="submit" value="Save Settings" />
       </form>
       <p></p>
       <form action="/reboot.html">

data/shift.html

@@ -68,7 +68,7 @@ <h1>Shift</h1>
                 }
             }
         };
-        xhttp.open("GET", "/configJSON", true);
+        xhttp.open("GET", "/runtimeConfigJSON", true);
         xhttp.send();
     }
 

include/BLE_Common.h

@@ -77,7 +77,7 @@ extern SpinBLEServer spinBLEServer;
 
 void startBLEServer();
 bool spinDown();
-void computeERG(int = 0);
+// void computeERG(int = 0);
 void computeCSC();
 void logCharacteristic(char *buffer, const size_t bufferCapacity, const byte *data, const size_t dataLength, const NimBLEUUID serviceUUID, const NimBLEUUID charUUID,
                        const char *format, ...);

include/ERG_Mode.h

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#pragma once
+
+#include "settings.h"
+#include "SmartSpin_parameters.h"
+
+#define ERG_MODE_LOG_TAG     "ERG_Mode"
+#define ERG_MODE_LOG_CSV_TAG "ERG_Mode_CSV"
+#define POWERTABLE_LOG_TAG   "PowTab"
+#define ERG_MODE_DELAY       700
+
+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 offsetMuliplier = 0;
+  Measurement watts   = Measurement(0);
+  int cadence         = 0;
+
+  bool _userIsSpinning(int cadence, float incline);
+};
+
+class PowerEntry {
+ public:
+  int watts;
+  int32_t targetPosition;
+  int cad;
+  int readings;
+
+  PowerEntry() {
+    this->watts    = 0;
+    this->targetPosition = 0;
+    this->cad      = 0;
+    this->readings = 0;
+  }
+};
+
+class PowerBuffer {
+  public:
+  PowerEntry powerEntry[POWER_SAMPLES];
+  void set(int);
+  void reset();
+};
+
+class PowerTable {
+ public:
+  PowerEntry powerEntry[POWERTABLE_SIZE];
+
+  // Catalogs a new entry into the power table.
+  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();
+};