initial change

Author: doudar

data/hrtowatts.html

@@ -22,44 +22,54 @@ <h1>
     <h1><strong>Physical Working Capacity</strong></h1>
     <h2>
       <p>For the most accurate power estimation when not using a power meter, please submit the following information.
-          <br>Note: You can get estimated watts from any outdoor ride recorded in Strava with heart rate information. 
+        <br>Note: You can get estimated watts from any outdoor ride recorded in Strava with heart rate information.
       </p>
       <form action="/send_settings">
         <table class="center" height="182" cellspacing="1">
           <tbody>
             <tr>
               <td>
-                <p class="tooltip">Easy Session Average HR<span class="tooltiptext">Session 1 HR<br><br>Average Heartrate over an easy 1 Hour course.</span></p>
+                <p class="tooltip">Easy Session Average HR<span class="tooltiptext">Session 1 HR<br><br>Average
+                    Heartrate over an easy 1 Hour course.</span></p>
               </td>
               <td><input type="number" id="session1HR" name="session1HR" value="0" /></td>
             </tr>
             <tr>
               <td>
-                <p class="tooltip">Easy Session Average Power<span class="tooltiptext">Average Power over an easy 1 hour course in watts.</span></p>
+                <p class="tooltip">Easy Session Average Power<span class="tooltiptext">Average Power over an easy 1 hour
+                    course in watts.</span></p>
               </td>
               <td><input type="number" id="session1Pwr" name="session1Pwr" value="0" />
               </td>
             </tr>
             <tr>
               <td>
-                <p class="tooltip">Hard Session Average HR<span class="tooltiptext">Average HR over a hard 1 hour course.</span></p>
+                <p class="tooltip">Hard Session Average HR<span class="tooltiptext">Average HR over a hard 1 hour
+                    course.</span></p>
               </td>
               <td><input type="number" id="session2HR" name="session2HR" value="0" />
               </td>
-            </tr>
             <tr>
               <td>
-                <p class="tooltip">Hard Session Average Power<span class="tooltiptext">Average Power over a hard 1 hour course in watts.</span></p>
+                <p class="tooltip">Hard Session Average Power<span class="tooltiptext">Average Power over a hard 1 hour
+                    course in watts.</span></p>
               </td>
               <td><input type="number" id="session2Pwr" name="session2Pwr" value="0" />
               </td>
             </tr>
-            
+            <tr>
+              <td>
+                <p class="tooltip">HR->PWR<span class="tooltiptext">Automatically calculate watts using
+                    heartrate when powermeter not connected</span></p>
+              </td>
+              <td><label class="switch"><input type="checkbox" name="stealthchop" id="stealthchop"><span
+                    class="slider"></span></label>
+              </td>
             </tr>
-      </tbody>
-      </table><br>
-      <input type="submit" value="Submit" />
-    </form>
+          </tbody>
+        </table><br>
+        <input type="submit" value="Submit" />
+      </form>
     </h2>
 </body>
 
@@ -83,6 +93,7 @@ <h2>
         document.getElementById("session1Pwr").value = obj.session1Pwr;
         document.getElementById("session2HR").value = obj.session2HR;
         document.getElementById("session2Pwr").value = obj.session2Pwr;
+        document.getElementById("hr2Pwr").checked = obj.hr2Pwr;
         setTimeout(function () { document.getElementById("loadingWatermark").remove(); }, 1000);
       }
     };

include/SmartSpin_parameters.h

@@ -90,6 +90,7 @@ int     session1HR;
 int     session1Pwr;
 int     session2HR;
 int     session2Pwr;
+bool    hr2Pwr;
 
 void    setDefaults();
 String  returnJSON();

src/BLE_Server.cpp

@@ -172,7 +172,7 @@ void BLENotify(void *pvParameters)
 {
   for (;;)
   {
-    if (spinBLEClient.connectedHR && !spinBLEClient.connectedPM && (userConfig.getSimulatedHr() > 0))
+    if (spinBLEClient.connectedHR && !spinBLEClient.connectedPM && (userConfig.getSimulatedHr() > 0) && userPWC.hr2Pwr)
     {
       calculateInstPwrFromHR();
     }

src/HTTP_Server_Basic.cpp

@@ -202,6 +202,10 @@ void startHttpServer()
     {
       userPWC.session2Pwr = server.arg("session2Pwr").toInt();
     }
+    if (!server.arg("hr2Pwr").isEmpty())
+    {
+      userPWC.hr2Pwr = server.arg("hr2Pwr");
+    }
 
     String response = "<!DOCTYPE html><html><body><h2>";
     if (wasBTUpdate) //Special BT update response

src/SmartSpin_parameters.cpp

@@ -241,6 +241,7 @@ session1HR    = 129; //examples from https://www.cyclinganalytics.com/
 session1Pwr   = 100;
 session2HR    = 154; 
 session2Pwr   = 150;
+hr2Pwr        = true;
 }
 
 //-- return all config as one a single JSON string
@@ -253,6 +254,7 @@ String physicalWorkingCapacity::returnJSON()
   doc["session1Pwr"]  = session1Pwr;
   doc["session2HR"]   = session2HR;
   doc["session2Pwr"]  = session2Pwr;
+  doc["hr2Pwr"]       = hr2Pwr;
 
   String output;
   serializeJson(doc, output);
@@ -280,6 +282,8 @@ void physicalWorkingCapacity::saveToSPIFFS()
   doc["session1Pwr"]  = session1Pwr;
   doc["session2HR"]   = session2HR;
   doc["session2Pwr"]  = session2Pwr;
+  doc["hr2Pwr"]       = hr2Pwr;
+
 
   // Serialize JSON to file
   if (serializeJson(doc, file) == 0)
@@ -321,6 +325,7 @@ void physicalWorkingCapacity::loadFromSPIFFS()
   session1Pwr = doc["session1Pwr"];
   session2HR  = doc["session2HR"];
   session2Pwr = doc["session2Pwr"];
+  hr2Pwr      = doc["hr2Pwr"];
 
   debugDirector("Config File Loaded: " + String(userPWCFILENAME));
   file.close();