Nico1320 · May 26, 2021
diff --git a/‎.github/workflows/pre-commit.yml
+1-1 b/‎.github/workflows/pre-commit.yml
+1-1
diff --git a/‎CHANGELOG.md
+2 b/‎CHANGELOG.md
+2
diff --git a/‎build_date_macro.py
+3 b/‎build_date_macro.py
+3
diff --git a/‎data/settings.html
+12-8 b/‎data/settings.html
+12-8
diff --git a/‎data/status.html
+82-34 b/‎data/status.html
+82-34
diff --git a/‎data/style.css
+134-131 b/‎data/style.css
+134-131
diff --git a/‎include/BLE_Common.h
+1-4 b/‎include/BLE_Common.h
+1-4
diff --git a/‎include/HTTP_Server_Basic.h
+4 b/‎include/HTTP_Server_Basic.h
+4
diff --git a/‎include/Main.h
-5 b/‎include/Main.h
-5
diff --git a/‎include/SS2KLog.h
+114 b/‎include/SS2KLog.h
+114
diff --git a/‎include/SmartSpin_parameters.h
+1-1 b/‎include/SmartSpin_parameters.h
+1-1
diff --git a/‎include/settings.h
+3-1 b/‎include/settings.h
+3-1
diff --git a/‎lib/SS2K/include/sensors/CyclePowerData.h
+1-1 b/‎lib/SS2K/include/sensors/CyclePowerData.h
+1-1
diff --git a/‎lib/SS2K/include/sensors/FitnessMachineIndoorBikeData.h
+1-1 b/‎lib/SS2K/include/sensors/FitnessMachineIndoorBikeData.h
+1-1
diff --git a/‎lib/SS2K/include/sensors/HeartRateData.h
+1-1 b/‎lib/SS2K/include/sensors/HeartRateData.h
+1-1
diff --git a/‎lib/SS2K/include/sensors/SensorDataFactory.h
+6-4 b/‎lib/SS2K/include/sensors/SensorDataFactory.h
+6-4
diff --git a/‎lib/SS2K/src/sensors/FitnessMachineIndoorBikeData.cpp
+1-1 b/‎lib/SS2K/src/sensors/FitnessMachineIndoorBikeData.cpp
+1-1
diff --git a/‎lib/SS2K/src/sensors/SensorDataFactory.cpp
+7-5 b/‎lib/SS2K/src/sensors/SensorDataFactory.cpp
+7-5
diff --git a/‎platformio.ini
+26-20 b/‎platformio.ini
+26-20
diff --git a/‎src/BLE_Client.cpp
+68-81 b/‎src/BLE_Client.cpp
+68-81
diff --git a/‎src/BLE_Common.cpp
+27-19 b/‎src/BLE_Common.cpp
+27-19
diff --git a/‎src/BLE_Server.cpp
+86-71 b/‎src/BLE_Server.cpp
+86-71
diff --git a/‎src/BLE_Setup.cpp
+7-6 b/‎src/BLE_Setup.cpp
+7-6
diff --git a/‎src/HTTP_Server_Basic.cpp
+57-58 b/‎src/HTTP_Server_Basic.cpp
+57-58
diff --git a/‎src/Main.cpp
+29-42 b/‎src/Main.cpp
+29-42
diff --git a/‎src/SS2KLog.cpp
+86 b/‎src/SS2KLog.cpp
+86
diff --git a/‎src/SmartSpin_parameters.cpp
+24-29 b/‎src/SmartSpin_parameters.cpp
+24-29
@@ -28,4 +28,4 @@ jobs:
         if: steps.filter.outputs.software == 'true'
         uses: docker://kadaan/platformio_esp32:latest
         with:
-          args: --build=esp32doit
+          args: --build=release
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Filter Flywheel advertisements by name.
 - Add documentation to SensorData class.
 - Enabled native testing.
+- Added logging library which supports levels.
 
 ### Changed
 - Moved Vin to the correct side on the ESP32 connection diagram. 
@@ -56,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Ignore zero heart rate reported from remote FTMS.
 - Fix Assimoa Uno stuck cadence.
 - Started extract non-arduino code into a cross-platform library.
+- Changed all logging calls to new logging library.
 
 ### Removed
 - Deleted and ignored .pio folder which had been mistakenly committed.
@@ -0,0 +1,3 @@
+from datetime import datetime
+
+print("-DBUILD_TIMESTAMP='\"%s\"'" % datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"))
@@ -136,13 +136,14 @@ <h2>
 </body>
 
 <script>
-  //Update values on specified interval loading late because this tiny webserver hates frequent requests
-  setInterval(function () {
-    if (document.getElementById("ssid").value == "loading") {
-      requestConfigValues();
-    }
-
-  }, 1000);
+  function startConfigUpdate() {
+    //Update values on specified interval loading late because this tiny webserver hates frequent requests
+    setTimeout(function () {
+      if (document.getElementById("ssid").value == "loading") {
+        requestConfigValues();
+      }
+    }, 1000);
+  }
 
   function requestConfigValues() {
     var xhttp = new XMLHttpRequest();
@@ -161,7 +162,9 @@ <h2>
         updateSlider(document.getElementById("inclineMultiplier").value, document.getElementById("inclineMultiplierValue"));
         updateSlider(document.getElementById("stepperPower").value, document.getElementById("stepperPowerValue"));
         document.getElementById("loadingWatermark").opacity = 0;
-        setTimeout(function () { document.getElementById("loadingWatermark").remove(); }, 1000);
+        document.getElementById("loadingWatermark").remove();
+      } else {
+        startConfigUpdate();
       }
     };
     xhttp.open("GET", "/configJSON", true);
@@ -180,6 +183,7 @@ <h2>
   //Delay loading css to not swamp webserver
   window.addEventListener('load', function () {
     setTimeout(loadCss, 100);
+    startConfigUpdate();
   }, false);
 
   function updateSlider(x, valueElement) {
 
@@ -77,51 +77,99 @@ <h2>
           </tbody>
         </table>
       </form>
-      <p style="text-align: left; margin-left:0 auto;">Debugging Info:</p>
-      <div id="debug" name="debug"
-        style="margin-left:0 auto;background-color:black;background-image:radial-gradient(rgba(0,150,0,0.75), black 120%);text-align: left;height:30vh;width:100%;resize:both;border:1px solid #ccc;color:white;font:1.3rem Inconsolata, monospace;overflow:auto;text-shadow: 0 0 4px #C8C8C8;">
-        loading </div>
+      <table style="width: 100%;padding: 0;margin: 0;table-layout: fixed;">
+        <tbody>
+          <tr>
+            <td>
+              <p style="text-align: left;float: left;">Debugging Info:</p>
+            </td>
+            <td>
+              <div style="float: right;">
+                <input type="checkbox" id="follow" name="follow" checked="true">
+                <label for="follow">Follow</label>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <pre id="debug" name="debug" style="margin: 0;padding: 5;background-color:black;background-image:radial-gradient(rgba(0,150,0,0.75), black 120%);text-align: left;height:30vh;width:100%;resize:both;border:1px solid #ccc;color:white;font:1.3rem Inconsolata, monospace;overflow:auto;text-shadow: 0 0 4px #C8C8C8;">Loading</pre>
+            </td>
+          </tr>
+        </tbody>
+      </table>
       <br>
     </h2>
 </body>
 
 <script>
 
+  var debugElement = document.getElementById("debug");
+  var followElement = document.getElementById("follow");
+  var updatePending = false;
+  var updateTimer = undefined;
+  
+  function onVisibilityChanged() {
+    if (document.hidden || document.mozHidden || document.webkitHidden || document.msHidden) {
+      stopUpdate();
+    } else {
+      startUpdate();
+    }
+  }
 
-  var element = document.getElementById("debug");
-  element.scrollTop = element.scrollHeight;
+  document.addEventListener("visibilitychange", onVisibilityChanged, false);
+  document.addEventListener("mozvisibilitychange", onVisibilityChanged, false);
+  document.addEventListener("webkitvisibilitychange", onVisibilityChanged, false);
+  document.addEventListener("msvisibilitychange", onVisibilityChanged, false);
 
-  function updateScroll() {
-    var element = document.getElementById("debug");
-    element.scrollTop = element.scrollHeight;
+  function startUpdate() {
+    //Update values on specified interval loading late because this tiny webserver hates frequent requests
+    if (updateTimer === undefined) {
+      updateTimer = setInterval(function () {
+        requestConfigValues();
+      }, 1000);
+    }
   }
 
-  //Update values on specified interval loading late because this tiny webserver hates frequent requests
-  setInterval(function () {
-    requestConfigValues();
-  }, 1000);
+  function stopUpdate() {
+    clearInterval(updateTimer);
+    updateTimer = undefined;
+  }
+
+  function updateDebugView(newContent) {
+    if (followElement.checked) {
+      debugElement.scrollTop = debugElement.scrollHeight - debugElement.clientHeight
+    }
+  }
 
   function requestConfigValues() {
-    var xhttp = new XMLHttpRequest();
-    xhttp.onreadystatechange = function () {
-      if (this.readyState == 4 && this.status == 200) {
-        var obj = JSON.parse(this.responseText);
-        document.getElementById("ssid").value = obj.ssid;
-        document.getElementById("connectedHeartMonitor").value = obj.connectedHeartMonitor;
-        document.getElementById("deviceName").value = obj.deviceName;
-        document.getElementById("shiftStep").value = obj.shiftStep;
-        document.getElementById("inclineMultiplier").value = obj.inclineMultiplier;
-        document.getElementById("incline").value = obj.incline;
-        document.getElementById("simulatedHr").value = obj.simulatedHr;
-        document.getElementById("simulatedWatts").value = obj.simulatedWatts;
-        document.getElementById("simulatedCad").value = obj.simulatedCad;
-        document.getElementById("connectedPowerMeter").value = obj.connectedPowerMeter;
-        document.getElementById("debug").innerHTML += obj.debug;
-        updateScroll();
-      }
-    };
-    xhttp.open("GET", "/configJSON", true);
-    xhttp.send();
+    if (!updatePending) {
+      updatePending = true
+      var xhttp = new XMLHttpRequest();
+      xhttp.onreadystatechange = function () {
+        updatePending = false;
+        if (this.readyState == 4 && this.status == 200) {
+          var obj = JSON.parse(this.responseText);
+          document.getElementById("ssid").value = obj.ssid;
+          document.getElementById("connectedHeartMonitor").value = obj.connectedHeartMonitor;
+          document.getElementById("deviceName").value = obj.deviceName;
+          document.getElementById("shiftStep").value = obj.shiftStep;
+          document.getElementById("inclineMultiplier").value = obj.inclineMultiplier;
+          document.getElementById("incline").value = obj.incline;
+          document.getElementById("simulatedHr").value = obj.simulatedHr;
+          document.getElementById("simulatedWatts").value = obj.simulatedWatts;
+          document.getElementById("simulatedCad").value = obj.simulatedCad;
+          document.getElementById("connectedPowerMeter").value = obj.connectedPowerMeter;
+          if (debugElement.innerHTML == "Loading") {
+            document.getElementById("debug").innerHTML = obj.debug;
+          } else {
+            document.getElementById("debug").innerHTML += obj.debug;
+          }
+          updateDebugView(obj.debug);
+        }
+      };
+      xhttp.open("GET", "/configJSON?includeDebugLog=true", true);
+      xhttp.send();
+    }
   }
 
   //define function to load css
@@ -136,8 +184,8 @@ <h2>
   //Delay loading css to not swamp webserver
   window.addEventListener('load', function () {
     setTimeout(loadCss, 100);
+    startUpdate();
   }, false);
-
 </script>
 
 </html>
@@ -15,153 +15,160 @@ div{
   font-size: medium;
 }
 
-a{
-  color:#000000; 
+a {
+  color: #000000;
+}
+a:visited {
+  color: #000000;
+}
+h1 {
+  color: #03245c;
+  padding: 0.5rem;
+  line-height: 1em;
 }
-a:visited{
+h2 {
   color: #000000;
+  font-size: 1.5rem;
+  font-weight: bold;
+}
+p {
+  font-size: 1rem;
+}
+.button {
+  display: inline-block;
+  background-color: #2a9df4;
+  border: line;
+  border-radius: 4px;
+  color: #d0efff;
+  padding: 10px 40px;
+  text-decoration: none;
+  font-size: 20px;
+  margin: 0px;
+  cursor: pointer;
+}
+.button2 {
+  background-color: #f44336;
+  padding: 10px 35px;
+}
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 80px;
+  height: 40px;
+}
+.switch input {
+  display: none;
+}
+.slider {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  transition: 0.4s;
+  background-color: #03254c;
+  border-radius: 34px;
+}
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 37px;
+  width: 37px;
+  left: 2px;
+  bottom: 2px;
+  background-color: #d0efff;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+  border-radius: 68px;
+}
+input:checked + .slider {
+  transition: 0.4s;
+  background-color: #2a9df4;
+}
+input:checked + .slider:before {
+  -webkit-transform: translateX(38px);
+  -ms-transform: translateX(38px);
+  transform: translateX(38px);
 }
-  h1{
-    color: #03245c;
-    padding: .5rem;
-    line-height: 1em;
-  }
-  h2{
-    color: #000000;
-    font-size: 1.5rem;
-    font-weight: bold;
-  }
-  p{
-    font-size: 1rem;
-  }
-  .button {
-    display: inline-block;
-    background-color: #2a9df4;
-    border: line;
-    border-radius: 4px;
-    color: #d0efff;
-    padding: 10px 40px;
-    text-decoration: none;
-    font-size: 20px;
-    margin: 0px;
-    cursor: pointer;
-  }
-  .button2 {
-    background-color: #f44336;
-    padding: 10px 35px;
-  }
-  .switch {
-    position: relative; 
-    display: inline-block; 
-    width: 80px; 
-    height: 40px} 
-  .switch input {
-    display: none}
-  .slider {
-    position: absolute; 
-    top: 0; 
-    left: 0; 
-    right: 0; 
-    bottom: 0; 
-    transition: .4s;
-    background-color: #03254c; 
-    border-radius: 34px;
-  }
-  .slider:before {
-    position: absolute; 
-    content: ""; 
-    height: 37px; 
-    width: 37px; 
-    left: 2px; 
-    bottom: 2px; 
-    background-color: #d0efff; 
-    -webkit-transition: .4s; 
-    transition: .4s; 
-    border-radius: 68px;
-  }
-  input:checked+.slider {
-    transition: .4s;
-    background-color: #2a9df4}
-  input:checked+.slider:before {
-    -webkit-transform: translateX(38px); 
-    -ms-transform: translateX(38px); 
-    transform: translateX(38px);
-  }
-  .slider2 { 
-    -webkit-appearance: none; 
-    margin: 5px; 
-    width: 270px; 
-    height: 20px; 
-    background: #d0efff;
-    /*outline:8px ridge rgba(170,50,220, .6);
+.slider2 {
+  -webkit-appearance: none;
+  margin: 5px;
+  width: 270px;
+  height: 20px;
+  background: #d0efff;
+  /*outline:8px ridge rgba(170,50,220, .6);
     border-radius: 2rem;*/
-    outline: none;
-    -webkit-transition: .2s; transition: opacity .2s;
-  }
-  .slider2::-webkit-slider-thumb {
-    -webkit-appearance: none; 
-    appearance: none; width: 30px; 
-    height: 30px; background: #03254C; 
-    cursor: pointer;
-  }
-  .slider2::-moz-range-thumb { width: 30px; 
-    height: 30px; background: #1167b1; 
-    cursor: pointer; 
-  } 
+  outline: none;
+  -webkit-transition: 0.2s;
+  transition: opacity 0.2s;
+}
+.slider2::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 30px;
+  height: 30px;
+  background: #03254c;
+  cursor: pointer;
+}
+.slider2::-moz-range-thumb {
+  width: 30px;
+  height: 30px;
+  background: #1167b1;
+  cursor: pointer;
+}
+
+table.center {
+  margin-left: auto;
+  margin-right: auto;
+}
 
-  table.center {
-    margin-left:auto; 
-    margin-right:auto;
-  }
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted #03254c;
+}
 
-  .tooltip {
-    position: relative;
-    display: inline-block;
-    border-bottom: 1px dotted #03254c;
-  }
-  
-  .tooltip .tooltiptext {
-    visibility: hidden;
-    width: 120px;
-    background-color: #03254c;
-    color: #d0efff;
-    text-align: center;
-    border-radius: 6px;
-    padding: 5px 0;
-  
-    /* Position the tooltip */
-    position: absolute;
-    z-index: 1;
-  }
-  
-  .tooltip:hover .tooltiptext {
-    visibility: visible;
-  }
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 120px;
+  background-color: #03254c;
+  color: #d0efff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
 
-  .watermark
-{
+  /* Position the tooltip */
+  position: absolute;
+  z-index: 1;
+}
+
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+
+.watermark {
   display: inline;
   position: fixed;
   top: 0px;
   left: 0px;
- transform: translate(calc(50vw - 200px), calc(50vh - 170px)) rotate(45deg);
- transition: .4s ease-in-out;
- opacity:.7;
- z-index:99;
- color:grey;
- font-size: 7rem
+  transform: translate(calc(50vw - 200px), calc(50vh - 170px)) rotate(45deg);
+  transition: 0.4s ease-in-out;
+  opacity: 0.7;
+  z-index: 99;
+  color: grey;
+  font-size: 7rem;
 }
 
 .watermark:hidden {
   transition: visibility 0s 2s, opacity 2s linear;
 }
 
 body {
-  display: block; 
+  display: block;
   margin: 0 auto;
-  background-color:#1167b1;
+  background-color: #1167b1;
   opacity: 1;
-  transition: .5s ease-in-out;
+  transition: 0.5s ease-in-out;
 }
 
 fieldset{
@@ -173,7 +180,3 @@ fieldset{
   margin: 0 auto;
   z-index: -1;
 }
-
-
-
-    
 
@@ -34,9 +34,8 @@ extern bool updateConnParametersFlag;
 
 void startBLEServer();
 void computeERG(int, int);
-void computeCSC();
 void updateIndoorBikeDataChar();
-void updateCyclingPowerMesurementChar();
+void updateCyclingPowerMeasurementChar();
 void calculateInstPwrFromHR();
 void updateHeartRateMeasurementChar();
 int connectedClientCount();
@@ -96,8 +95,6 @@ class SpinBLEAdvertisedDevice {
     userSelectedCT    = false;  // Controllable Trainer
     doConnect         = false;  // Initiate connection flag
   }
-
-  void print();
 };
 
 class SpinBLEClient {
 
@@ -18,8 +18,12 @@ void handleHrSlider();
 void FirmwareUpdate();
 
 #ifdef USE_TELEGRAM
+#define SEND_TO_TELEGRAM(message) sendTelegram(message);
+
 void sendTelegram(String textToSend);
 void telegramUpdate(void *pvParameters);
+#else
+#define SEND_TO_TELEGRAM(message) (void)message
 #endif
 
 // wifi Function
 
@@ -17,7 +17,6 @@ bool IRAM_ATTR deBounce();
 void IRAM_ATTR moveStepper(void* pvParameters);
 void IRAM_ATTR shiftUp();
 void IRAM_ATTR shiftDown();
-void debugDirector(String, bool = true, bool = false);
 void resetIfShiftersHeld();
 void scanIfShiftersHeld();
 void setupTMCStepperDriver();
@@ -30,7 +29,3 @@ extern userParameters userConfig;
 // Users Physical Working Capacity Calculation Parameters (heartrate to Power
 // calculation)
 extern physicalWorkingCapacity userPWC;
-
-// Variable that will store debugging information that will get appended and
-// then cleared once posted to HTML or a timer expires.
-extern String debugToHTML;
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#pragma once
+
+#include "sdkconfig.h"
+#include "esp_log.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <SPIFFS.h>
+#include <freertos/semphr.h>
+
+#ifndef DEBUG_LOG_BUFFER_SIZE
+#define DEBUG_LOG_BUFFER_SIZE 1000
+#endif
+
+#ifndef DEBUG_FILE_CHARS_PER_LINE
+#define DEBUG_FILE_CHARS_PER_LINE 64
+#endif
+
+#ifndef CORE_DEBUG_LEVEL
+#define CORE_DEBUG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
+#endif
+
+#if CORE_DEBUG_LEVEL >= 4
+#define SS2K_LOGD(tag, format, ...) SS2K_MODLOG_DFLT(ERROR, "D %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+#else
+#define SS2K_LOGD(tag, format, ...) (void)tag
+#endif
+
+#if CORE_DEBUG_LEVEL >= 3
+#define SS2K_LOGI(tag, format, ...) SS2K_MODLOG_DFLT(ERROR, "I %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+#else
+#define SS2K_LOGI(tag, format, ...) (void)tag
+#endif
+
+#if CORE_DEBUG_LEVEL >= 2
+#define SS2K_LOGW(tag, format, ...) SS2K_MODLOG_DFLT(ERROR, "W %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+#else
+#define SS2K_LOGW(tag, format, ...) (void)tag
+#endif
+
+#if CORE_DEBUG_LEVEL >= 1
+#define SS2K_LOGE(tag, format, ...) SS2K_MODLOG_DFLT(ERROR, "E %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+#else
+#define SS2K_LOGE(tag, format, ...) (void)tag
+#endif
+
+#define SS2K_LOGC(tag, format, ...) SS2K_MODLOG_DFLT(CRITICAL, "C %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+#define SS2K_LOG(tag, format, ...)  SS2K_MODLOG_DFLT(CRITICAL, "N %lu %s: " #format "\n", millis(), tag, ##__VA_ARGS__)
+
+class DebugInfo {
+ public:
+  static void appendLog(const char *format, ...);
+
+  static const std::string getAndClearLogs();
+
+ private:
+  static DebugInfo INSTANCE;
+#if DEBUG_LOG_BUFFER_SIZE > 0
+  DebugInfo() : logBufferLength(0), logBufferMutex(xSemaphoreCreateMutex()) { logBuffer[0] = '\0'; }
+  int logBufferLength;
+  char logBuffer[DEBUG_LOG_BUFFER_SIZE];
+  SemaphoreHandle_t logBufferMutex;
+  void appendLog_internal(const char *format, va_list args);
+  const std::string getAndClearLogs_internal();
+#else
+  DebugInfo() {}
+#endif
+};
+
+#if DEBUG_LOG_BUFFER_SIZE > 0
+#define SS2K_MODLOG_ESP_LOCAL(level, ml_msg_, ...)          \
+  do {                                                      \
+    if (LOG_LOCAL_LEVEL >= level) {                         \
+      esp_log_write(level, "SS2K", ml_msg_, ##__VA_ARGS__); \
+      DebugInfo::appendLog(ml_msg_, ##__VA_ARGS__);         \
+    }                                                       \
+  } while (0)
+#else
+#define SS2K_MODLOG_ESP_LOCAL(level, ml_msg_, ...)                                      \
+  do {                                                                                  \
+    if (LOG_LOCAL_LEVEL >= level) esp_log_write(level, "SS2K", ml_msg_, ##__VA_ARGS__); \
+  } while (0)
+#endif
+
+#define SS2K_MODLOG_DEBUG(ml_mod_, ml_msg_, ...) SS2K_MODLOG_ESP_LOCAL(ESP_LOG_DEBUG, ml_msg_, ##__VA_ARGS__)
+
+#define SS2K_MODLOG_INFO(ml_mod_, ml_msg_, ...) SS2K_MODLOG_ESP_LOCAL(ESP_LOG_INFO, ml_msg_, ##__VA_ARGS__)
+
+#define SS2K_MODLOG_WARN(ml_mod_, ml_msg_, ...) SS2K_MODLOG_ESP_LOCAL(ESP_LOG_WARN, ml_msg_, ##__VA_ARGS__)
+
+#define SS2K_MODLOG_ERROR(ml_mod_, ml_msg_, ...) SS2K_MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
+
+#define SS2K_MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) SS2K_MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
+
+#define SS2K_MODLOG(ml_lvl_, ml_mod_, ...) SS2K_MODLOG_##ml_lvl_((ml_mod_), __VA_ARGS__)
+
+#define SS2K_MODLOG_DFLT(ml_lvl_, ...) SS2K_MODLOG(ml_lvl_, LOG_MODULE_DEFAULT, __VA_ARGS__);
+
+void ss2k_remove_newlines(std::string *str);
+
+int ss2k_log_hex_to_buffer(const byte *data, const size_t data_length, char *buffer, const int buffer_offset, const size_t buffer_length);
+
+void ss2k_log_file_internal(const char *tag, File file);
+
+#define SS2K_LOG_FILE(tag, file)       \
+  do {                                 \
+    ss2k_log_file_internal(tag, file); \
+  } while (0)
@@ -82,7 +82,7 @@ class userParameters {
   void setConnectedPowerMeter(String cpm) { connectedPowerMeter = cpm; }
   void setConnectedHeartMonitor(String cHr) { connectedHeartMonitor = cHr; }
 
-  String returnJSON();
+  String returnJSON(bool includeDebugLog = false);
   void saveToSPIFFS();
   void loadFromSPIFFS();
   void printFile();
 
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "SS2KLog.h"
+
 // Update firmware on boot?
 #define AUTO_FIRMWARE_UPDATE true
 
@@ -116,7 +118,7 @@
 #define WIFI_CONNECT_TIMEOUT 10
 
 // Max size of userconfig
-#define USERCONFIG_JSON_SIZE 768
+#define USERCONFIG_JSON_SIZE 768 + DEBUG_LOG_BUFFER_SIZE
 
 // Uncomment to enable sending Telegram debug messages back to the chat
 // specified in telegram_token.h
 
@@ -11,7 +11,7 @@
 
 class CyclePowerData : public SensorData {
  public:
-  CyclePowerData() : SensorData("CPS"), power() {}
+  CyclePowerData() : SensorData("CPS") {}
 
   bool hasHeartRate();
   bool hasCadence();
 
@@ -11,7 +11,7 @@
 
 class FitnessMachineIndoorBikeData : public SensorData {
  public:
-  FitnessMachineIndoorBikeData() : SensorData("FTMS") {
+  FitnessMachineIndoorBikeData() : SensorData("FTMS(IBD)") {
     for (int i = 0; i < FieldCount; i++) {
       this->values[i] = nan("");
     }
 
@@ -11,7 +11,7 @@
 
 class HeartRateData : public SensorData {
  public:
-  HeartRateData() : SensorData("HRM") {}
+  HeartRateData() : SensorData("HRS(HRM)") {}
 
   bool hasHeartRate();
   bool hasCadence();
 
@@ -16,17 +16,19 @@ class SensorDataFactory {
  public:
   SensorDataFactory() {}
 
-  std::shared_ptr<SensorData> getSensorData(NimBLEUUID characteristicUUID, uint8_t *data, size_t length);
+  std::shared_ptr<SensorData> getSensorData(NimBLEUUID characteristicUUID, const uint64_t peerAddress, uint8_t *data, size_t length);
 
  private:
   class KnownDevice {
    public:
-    KnownDevice(NimBLEUUID uuid, std::shared_ptr<SensorData> sensorData) : uuid(uuid), sensorData(sensorData) {}
-    NimBLEUUID getUUID();
+    KnownDevice(const NimBLEUUID characteristicUUID, const uint64_t peerAddress, std::shared_ptr<SensorData> sensorData)
+        : characteristicId(characteristicUUID), peerAddress(peerAddress), sensorData(sensorData) {}
     std::shared_ptr<SensorData> decode(uint8_t *data, size_t length);
+    bool isSameDeviceCharacteristic(const NimBLEUUID characteristicUUID, const uint64_t peerAddress);
 
    private:
-    NimBLEUUID uuid;
+    NimBLEUUID characteristicId;
+    uint64_t peerAddress;
     std::shared_ptr<SensorData> sensorData;
   };
 
 
@@ -76,7 +76,7 @@ void FitnessMachineIndoorBikeData::decode(uint8_t *data, size_t length) {
         continue;
       }
     }
-    values[typeIndex] = NAN;
+    values[typeIndex] = nanf("");
   }
 }
 
 
@@ -14,9 +14,9 @@
 #include "sensors/HeartRateData.h"
 #include "sensors/EchelonData.h"
 
-std::shared_ptr<SensorData> SensorDataFactory::getSensorData(const NimBLEUUID characteristicUUID, uint8_t *data, size_t length) {
+std::shared_ptr<SensorData> SensorDataFactory::getSensorData(const NimBLEUUID characteristicUUID, const uint64_t peerAddress, uint8_t *data, size_t length) {
   for (auto &it : SensorDataFactory::knownDevices) {
-    if (it->getUUID() == characteristicUUID) {
+    if (it->isSameDeviceCharacteristic(characteristicUUID, peerAddress)) {
       return it->decode(data, length);
     }
   }
@@ -36,18 +36,20 @@ std::shared_ptr<SensorData> SensorDataFactory::getSensorData(const NimBLEUUID ch
     return NULL_SENSOR_DATA;
   }
 
-  KnownDevice *knownDevice = new KnownDevice(characteristicUUID, sensorData);
+  KnownDevice *knownDevice = new KnownDevice(characteristicUUID, peerAddress, sensorData);
   SensorDataFactory::knownDevices.push_back(knownDevice);
   return knownDevice->decode(data, length);
 }
 
-NimBLEUUID SensorDataFactory::KnownDevice::getUUID() { return this->uuid; }
-
 std::shared_ptr<SensorData> SensorDataFactory::KnownDevice::decode(uint8_t *data, size_t length) {
   this->sensorData->decode(data, length);
   return this->sensorData;
 }
 
+bool SensorDataFactory::KnownDevice::isSameDeviceCharacteristic(const NimBLEUUID characteristicUUID, const uint64_t peerAddress) {
+  return this->characteristicId == characteristicUUID && this->peerAddress == peerAddress;
+}
+
 bool SensorDataFactory::NullData::hasHeartRate() { return false; }
 
 bool SensorDataFactory::NullData::hasCadence() { return false; }
 
@@ -8,18 +8,9 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 [platformio]
-default_envs = esp32doit
+default_envs = debug
 
-[common_env_data]
-lib_deps = 
-    ;https://github.com/h2zero/NimBLE-Arduino.git#master //Nimble is tracked and including this will probably cause issues. 
-	teemuatlut/TMCStepper@^0.7.1
-	bblanchon/ArduinoJson@^6.17.2
-	https://github.com/witnessmenow/Universal-Arduino-Telegram-Bot/archive/V1.3.0.zip
-
-[env:esp32doit]
-build_flags = 
-	!python git_tag_macro.py
+[esp32doit]
 lib_ldf_mode = chain+
 lib_compat_mode = strict
 platform = espressif32
@@ -29,17 +20,32 @@ platform_packages = framework-arduinoespressif32@https://github.com/espressif/ar
 board_build.partitions = min_spiffs.csv
 upload_speed = 921600
 monitor_speed = 512000
-debug_init_break = tbreak setup
+build_flags = 
+    !python git_tag_macro.py
+    !python build_date_macro.py
+    -DCONFIG_BT_NIMBLE_MAX_CONNECTIONS=6
 lib_deps = 
-	${common_env_data.lib_deps}
-	lib/SS2K
+    ;https://github.com/h2zero/NimBLE-Arduino.git#master //Nimble is tracked and including this will probably cause issues. 
+    teemuatlut/TMCStepper@^0.7.1
+    bblanchon/ArduinoJson@^6.17.2
+    https://github.com/witnessmenow/Universal-Arduino-Telegram-Bot/archive/V1.3.0.zip 
+
+[env:release]
+extends = esp32doit
+
+[env:debug]
+extends = esp32doit
+build_type = debug
+build_flags = ${esp32doit.build_flags} -D__DEBUG__=1
+debug_tool = esp-prog
+debug_init_break = tbreak setup
 check_tool = cppcheck
-check_flags = 
-	--enable=all
-	--suppress=*:*/.pio/*
-	--suppress=*:*/lib/NimBLE-Arduino/*
-	--suppress=unmatchedSuppression
-	--suppress=missingIncludeSystem
+check_flags =
+    --enable=all
+    --suppress=*:*/.pio/*
+    --suppress=*:*/lib/NimBLE-Arduino/*
+    --suppress=unmatchedSuppression
+    --suppress=missingIncludeSystem
 check_severity = medium, high
 check_skip_packages = true
 
 
@@ -6,6 +6,7 @@
  */
 
 #include "Main.h"
+#include "SS2KLog.h"
 #include "BLE_Common.h"
 
 #include <math.h>
@@ -23,7 +24,12 @@ void BLECommunications(void *pvParameters) {
     // **********************************Client***************************************
     for (size_t x = 0; x < NUM_BLE_DEVICES; x++) {  // loop through discovered devices
       if (spinBLEClient.myBLEDevices[x].connectedClientID != BLE_HS_CONN_HANDLE_NONE) {
-        // spinBLEClient.myBLEDevices[x].print();
+        SS2K_LOGD("BLE_Client", "Address: (%s) Client ID: (%d) SerUUID: (%s) CharUUID: (%s) HRM: (%s) PM: (%s) CSC: (%s) CT: (%s) doConnect: (%s)",
+                  spinBLEClient.myBLEDevices[x].peerAddress.toString().c_str(), spinBLEClient.myBLEDevices[x].connectedClientID,
+                  spinBLEClient.myBLEDevices[x].serviceUUID.toString().c_str(), spinBLEClient.myBLEDevices[x].charUUID.toString().c_str(),
+                  spinBLEClient.myBLEDevices[x].userSelectedHR ? "true" : "false", spinBLEClient.myBLEDevices[x].userSelectedPM ? "true" : "false",
+                  spinBLEClient.myBLEDevices[x].userSelectedCSC ? "true" : "false", spinBLEClient.myBLEDevices[x].userSelectedCT ? "true" : "false",
+                  spinBLEClient.myBLEDevices[x].doConnect ? "true" : "false");
         if (spinBLEClient.myBLEDevices[x].advertisedDevice) {  // is device registered?
           // debugDirector("1",false);
           SpinBLEAdvertisedDevice myAdvertisedDevice = spinBLEClient.myBLEDevices[x];
@@ -44,47 +50,50 @@ void BLECommunications(void *pvParameters) {
 
                 // 250 == Data(60), Spaces(Data/2), Arrow(4), SvrUUID(37), Sep(3), ChrUUID(37), Sep(3),
                 //        Name(10), Prefix(2), HR(8), SEP(1), CD(10), SEP(1), PW(8), SEP(1), SP(7), Suffix(2), Nul(1) - 225 rounded up
-                char logBuf[250];
-                char *logBufP = logBuf;
-                for (int i = 0; i < length; i++) {
-                  logBufP += sprintf(logBufP, "%02x ", pData[i]);
-                }
-                logBufP += sprintf(logBufP, "<- %.8s | %.8s", myAdvertisedDevice.serviceUUID.toString().c_str(), myAdvertisedDevice.charUUID.toString().c_str());
+                const int kLogBufMaxLength = 250;
+                char logBuf[kLogBufMaxLength];
+                SS2K_LOG("BLE_Common", "Data length: %d", data.length());
+                int logBufLength = ss2k_log_hex_to_buffer(pData, length, logBuf, 0, kLogBufMaxLength);
+
+                logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "<- %.8s | %.8s", myAdvertisedDevice.serviceUUID.toString().c_str(),
+                                         myAdvertisedDevice.charUUID.toString().c_str());
 
-                std::shared_ptr<SensorData> sensorData = sensorDataFactory.getSensorData(pRemoteBLECharacteristic->getUUID(), pData, length);
+                std::shared_ptr<SensorData> sensorData = sensorDataFactory.getSensorData(
+                    pRemoteBLECharacteristic->getUUID(), (uint64_t)pRemoteBLECharacteristic->getRemoteService()->getClient()->getPeerAddress(), pData, length);
 
-                logBufP += sprintf(logBufP, " | %s:[", sensorData->getId().c_str());
+                logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " | %s[", sensorData->getId().c_str());
                 if (sensorData->hasHeartRate() && !userConfig.getSimulateHr()) {
                   int heartRate = sensorData->getHeartRate();
                   userConfig.setSimulatedHr(heartRate);
                   spinBLEClient.connectedHR |= true;
-                  logBufP += sprintf(logBufP, " HR(%d)", heartRate % 1000);
+                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " HR(%d)", heartRate % 1000);
                 }
                 if (sensorData->hasCadence() && !userConfig.getSimulateCad()) {
                   float cadence = sensorData->getCadence();
                   userConfig.setSimulatedCad(cadence);
                   spinBLEClient.connectedCD |= true;
-                  logBufP += sprintf(logBufP, " CD(%.2f)", fmodf(cadence, 1000.0));
+                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " CD(%.2f)", fmodf(cadence, 1000.0));
                 }
                 if (sensorData->hasPower() && !userConfig.getSimulateWatts()) {
                   int power = sensorData->getPower() * userConfig.getPowerCorrectionFactor();
                   userConfig.setSimulatedWatts(power);
                   spinBLEClient.connectedPM |= true;
-                  logBufP += sprintf(logBufP, " PW(%d)", power % 10000);
+                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " PW(%d)", power % 10000);
                 }
                 if (sensorData->hasSpeed()) {
                   float speed = sensorData->getSpeed();
                   userConfig.setSimulatedSpeed(speed);
-                  logBufP += sprintf(logBufP, " SD(%.2f)", fmodf(speed, 1000.0));
+                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " SD(%.2f)", fmodf(speed, 1000.0));
                 }
-                strcat(logBufP, " ]");
-                debugDirector(String(logBuf), true, true);
+                strncat(logBuf + logBufLength, " ]", kLogBufMaxLength - logBufLength);
+                SS2K_LOG("BLE_Common", "%s", logBuf);
+                SEND_TO_TELEGRAM(String(logBuf));
               } else if (!pClient->isConnected()) {  // This shouldn't ever be
                                                      // called...
                 if (pClient->disconnect() == 0) {    // 0 is a successful disconnect
                   BLEDevice::deleteClient(pClient);
                   vTaskDelay(100 / portTICK_PERIOD_MS);
-                  debugDirector("Workaround connect");
+                  SS2K_LOG("BLE_Common", "Workaround connect");
                   myAdvertisedDevice.doConnect = true;
                 }
               }
@@ -116,9 +125,8 @@ void BLECommunications(void *pvParameters) {
 
     if (connectedClientCount() > 0) {
       // update the BLE information on the server
-      computeCSC();
       updateIndoorBikeDataChar();
-      updateCyclingPowerMesurementChar();
+      updateCyclingPowerMeasurementChar();
       updateHeartRateMeasurementChar();
 
       if (updateConnParametersFlag) {
@@ -135,7 +143,7 @@ void BLECommunications(void *pvParameters) {
     }
     if (BLEDevice::getAdvertising()) {
       if (!(BLEDevice::getAdvertising()->isAdvertising()) && (BLEDevice::getServer()->getConnectedCount() < CONFIG_BT_NIMBLE_MAX_CONNECTIONS - NUM_BLE_DEVICES)) {
-        debugDirector("Starting Advertising From Communication Loop");
+        SS2K_LOG("BLE_Common", "Starting Advertising From Communication Loop");
         BLEDevice::startAdvertising();
       }
     }
 
@@ -6,6 +6,7 @@
  */
 
 #include "Main.h"
+#include "SS2KLog.h"
 #include "BLE_Common.h"
 
 #include <ArduinoJson.h>
@@ -21,8 +22,7 @@ BLECharacteristic *cyclingPowerMeasurementCharacteristic;
 BLECharacteristic *fitnessMachineFeature;
 BLECharacteristic *fitnessMachineIndoorBikeData;
 
-/********************************Bit field Flag
- * Example***********************************/
+/******** Bit field Flag Example ********/
 // 00000000000000000001 - 1   - 0x001 - Pedal Power Balance Present
 // 00000000000000000010 - 2   - 0x002 - Pedal Power Balance Reference
 // 00000000000000000100 - 4   - 0x004 - Accumulated Torque Present
@@ -63,7 +63,7 @@ uint8_t ftmsPowerRange[6]           = {0x00, 0x00, 0xA0, 0x0F, 0x01, 0x00};
 
 void startBLEServer() {
   // Server Setup
-  debugDirector("Starting BLE Server");
+  SS2K_LOG("BLE_Server", "Starting BLE Server");
   pServer = BLEDevice::createServer();
 
   // HEART RATE MONITOR SERVICE SETUP
@@ -130,7 +130,7 @@ void startBLEServer() {
   pAdvertising->setScanResponse(true);
   BLEDevice::startAdvertising();
 
-  debugDirector("Bluetooth Characteristic defined!");
+  SS2K_LOG("BLE_Server", "Bluetooth Characteristic defined!");
 }
 
 void computeERG(int currentWatts, int setPoint) {
@@ -166,25 +166,6 @@ void computeERG(int currentWatts, int setPoint) {
   userConfig.setIncline(newIncline);
 }
 
-void computeCSC() {  // What was SIG smoking when they came up with the Cycling
-                     // Speed and Cadence Characteristic?
-  if (userConfig.getSimulatedCad() > 0) {
-    float crankRevPeriod = (60 * 1024) / userConfig.getSimulatedCad();
-    spinBLEClient.cscCumulativeCrankRev++;
-    spinBLEClient.cscLastCrankEvtTime += crankRevPeriod;
-    int remainder, quotient;
-    quotient                   = spinBLEClient.cscCumulativeCrankRev / 256;
-    remainder                  = spinBLEClient.cscCumulativeCrankRev % 256;
-    cyclingPowerMeasurement[5] = remainder;
-    cyclingPowerMeasurement[6] = quotient;
-    quotient                   = spinBLEClient.cscLastCrankEvtTime / 256;
-    remainder                  = spinBLEClient.cscLastCrankEvtTime % 256;
-    cyclingPowerMeasurement[7] = remainder;
-    cyclingPowerMeasurement[8] = quotient;
-  }  // ^^Using the old way of setting bytes because I like it and it makes
-     // more sense to me looking at it.
-}
-
 void updateIndoorBikeDataChar() {
   float cadRaw = userConfig.getSimulatedCad();
   int cad      = static_cast<int>(cadRaw * 2);
@@ -208,106 +189,141 @@ void updateIndoorBikeDataChar() {
   ftmsIndoorBikeData[7] = (uint8_t)(watts >> 8);  // power value, constrained to avoid negative values,
                                                   // although the specification allows for a sint16
   ftmsIndoorBikeData[8] = (uint8_t)hr;
+
+  // 200 == Data(30), Sep(data/2), Arrow(3), CharId(37), Sep(3), CharId(37), Sep(3), Name(10), Prefix(2), HR(7), SEP(1), CD(10), SEP(1), PW(8), SEP(1), SD(7), Suffix(2), Nul(1) ==
+  // 178, rounded up
+  const int kLogBufMaxLength = 200;
+  char logBuf[kLogBufMaxLength];
+  int logBufLength = ss2k_log_hex_to_buffer(ftmsIndoorBikeData, *(&ftmsIndoorBikeData + 1) - ftmsIndoorBikeData, logBuf, 0, kLogBufMaxLength);
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "-> %s | %s | FTMS(IBD)[", FITNESSMACHINESERVICE_UUID.toString().c_str(),
+                           fitnessMachineIndoorBikeData->getUUID().toString().c_str());
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " HR(%d)", hr % 1000);
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " CD(%.2f)", fmodf(cadRaw, 1000.0));
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " PW(%d)", watts % 10000);
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " SD(%.2f)", fmodf(speed, 1000.0));
+  strncat(logBuf + logBufLength, " ]", kLogBufMaxLength - logBufLength);
+
   fitnessMachineIndoorBikeData->setValue(ftmsIndoorBikeData, 9);
   fitnessMachineFeature->notify();
   fitnessMachineIndoorBikeData->notify();
+
+  SS2K_LOG("BLE_Server", "%s", logBuf);
 }  // ^^Using the New Way of setting Bytes.
 
-void updateCyclingPowerMesurementChar() {
+void updateCyclingPowerMeasurementChar() {
+  int power = userConfig.getSimulatedWatts();
   int remainder, quotient;
-  quotient                   = userConfig.getSimulatedWatts() / 256;
-  remainder                  = userConfig.getSimulatedWatts() % 256;
+  quotient                   = power / 256;
+  remainder                  = power % 256;
   cyclingPowerMeasurement[2] = remainder;
   cyclingPowerMeasurement[3] = quotient;
   cyclingPowerMeasurementCharacteristic->setValue(cyclingPowerMeasurement, 9);
 
-  // Data(18), Sep(data/2), Static(13), Nul(1) == 41, rounded up
-  char logBuf[50];
-  char *logBufP = logBuf;
-  for (const auto &it : cyclingPowerMeasurement) {
-    logBufP += sprintf(logBufP, "%02x ", it);
+  float cadence = userConfig.getSimulatedCad();
+  if (cadence > 0) {
+    float crankRevPeriod = (60 * 1024) / cadence;
+    spinBLEClient.cscCumulativeCrankRev++;
+    spinBLEClient.cscLastCrankEvtTime += crankRevPeriod;
+    int remainder, quotient;
+    quotient                   = spinBLEClient.cscCumulativeCrankRev / 256;
+    remainder                  = spinBLEClient.cscCumulativeCrankRev % 256;
+    cyclingPowerMeasurement[5] = remainder;
+    cyclingPowerMeasurement[6] = quotient;
+    quotient                   = spinBLEClient.cscLastCrankEvtTime / 256;
+    remainder                  = spinBLEClient.cscLastCrankEvtTime % 256;
+    cyclingPowerMeasurement[7] = remainder;
+    cyclingPowerMeasurement[8] = quotient;
+  }  // ^^Using the old way of setting bytes because I like it and it makes more sense to me looking at it.
+
+  // 150 == Data(18), Sep(data/2), Arrow(3), CharId(37), Sep(3), CharId(37), Sep(3),Name(8), Prefix(2), CD(10), SEP(1), PW(8), Suffix(2), Nul(1) == 142, rounded up
+  const int kLogBufMaxLength = 150;
+  char logBuf[kLogBufMaxLength];
+  int logBufLength = ss2k_log_hex_to_buffer(cyclingPowerMeasurement, *(&cyclingPowerMeasurement + 1) - cyclingPowerMeasurement, logBuf, 0, kLogBufMaxLength);
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "-> %s | %s | CPS(CPM)[ ", CYCLINGPOWERSERVICE_UUID.toString().c_str(),
+                           cyclingPowerMeasurementCharacteristic->getUUID().toString().c_str());
+
+  if (cadence > 0) {
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "CD(%.2f) ", fmodf(cadence, 1000.0));
   }
-  strcat(logBufP, "<-- CPMC sent");
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "PW(%d) ", power % 10000);
+  strncat(logBuf + logBufLength, "]", kLogBufMaxLength - logBufLength);
 
   cyclingPowerMeasurementCharacteristic->notify();
-  debugDirector(String(logBuf), true);
+  SS2K_LOG("BLE_Server", "%s", logBuf);
 }
 
 void updateHeartRateMeasurementChar() {
-  heartRateMeasurement[1] = userConfig.getSimulatedHr();
+  int hr                  = userConfig.getSimulatedHr();
+  heartRateMeasurement[1] = hr;
   heartRateMeasurementCharacteristic->setValue(heartRateMeasurement, 2);
 
-  // Data(10), Sep(data/2), Static(11), Nul(1) == 26, rounded up
-  char logBuf[35];
-  char *logBufP = logBuf;
-  for (const auto &it : heartRateMeasurement) {
-    logBufP += sprintf(logBufP, "%02x ", it);
-  }
-  strcat(logBufP, "<-- HR sent");
+  // 125 == Data(10), Sep(data/2), Arrow(3), CharId(37), Sep(3), CharId(37), Sep(3), Name(8), Prefix(2), HR(7), Suffix(2), Nul(1) == 118, rounded up
+  const int kLogBufMaxLength = 125;
+  char logBuf[kLogBufMaxLength];
+  int logBufLength = ss2k_log_hex_to_buffer(heartRateMeasurement, *(&heartRateMeasurement + 1) - heartRateMeasurement, logBuf, 0, kLogBufMaxLength);
+  snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "-> %s | %s | HRS(HRM)[ HR(%d) ]", HEARTSERVICE_UUID.toString().c_str(),
+           heartRateMeasurementCharacteristic->getUUID().toString().c_str(), hr % 1000);
 
   heartRateMeasurementCharacteristic->notify();
-  debugDirector(String(logBuf), true);
+  SS2K_LOG("BLE_Server", "%s", logBuf);
 }
 
 // Creating Server Connection Callbacks
 
 void MyServerCallbacks::onConnect(BLEServer *pServer, ble_gap_conn_desc *desc) {
-  debugDirector("Bluetooth Remote Client Connected: " + String(NimBLEAddress(desc->peer_ota_addr).toString().c_str()) +
-                " Connected Clients: " + String(pServer->getConnectedCount()));
+  SS2K_LOG("BLE_Server", "Bluetooth Remote Client Connected: %s Connected Clients: %d", NimBLEAddress(desc->peer_ota_addr).toString().c_str(), pServer->getConnectedCount());
   updateConnParametersFlag = true;
   bleConnDesc              = desc->conn_handle;
 
   if (pServer->getConnectedCount() < CONFIG_BT_NIMBLE_MAX_CONNECTIONS - NUM_BLE_DEVICES) {
     BLEDevice::startAdvertising();
   } else {
-    debugDirector("Max Remote Client Connections Reached");
+    SS2K_LOG("BLE_Server", "Max Remote Client Connections Reached");
     BLEDevice::stopAdvertising();
   }
 }
 
 void MyServerCallbacks::onDisconnect(BLEServer *pServer) {
-  debugDirector("Bluetooth Remote Client Disconnected. Remaining Clients: " + String(pServer->getConnectedCount()));
+  SS2K_LOG("BLE_Server", "Bluetooth Remote Client Disconnected. Remaining Clients: %d", pServer->getConnectedCount());
   BLEDevice::startAdvertising();
 }
 
 void MyCallbacks::onWrite(BLECharacteristic *pCharacteristic) {
   std::string rxValue = pCharacteristic->getValue();
 
   if (rxValue.length() > 1) {
-    for (const auto &text : rxValue) {  // Range-for!
-      debugDirector(String(text, HEX) + " ", false);
-    }
-    debugDirector("<-- From APP ", false);
-    /* 0x11 17 means FTMS Incline Control Mode  (aka SIM mode)*/
-
-    if (static_cast<int>(rxValue[0]) == 17) {
+    // 175 == Data(16), Spaces(Data/2), Arrow(3), ChrUUID(37), Sep(3), ChrUUID(37), Sep(3),
+    //        Name(8), Prefix(2), TGT(9), SEP(1), CUR(9), SEP(1), INC(11), Suffix(2), Nul(1) - 151 rounded up
+    const int kLogBufMaxLength = 175;
+    char logBuf[kLogBufMaxLength];
+    int logBufLength = ss2k_log_hex_to_buffer(reinterpret_cast<const unsigned char *>(rxValue.c_str()), rxValue.length(), logBuf, 0, kLogBufMaxLength);
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "<- %s | %s ", FITNESSMACHINESERVICE_UUID.toString().c_str(),
+                             pCharacteristic->getUUID().toString().c_str());
+
+    if (static_cast<int>(rxValue[0]) == 17) {  // 0x11 17 means FTMS Incline Control Mode  (aka SIM mode)
       signed char buf[2];
       buf[0] = rxValue[3];  // (Least significant byte)
       buf[1] = rxValue[4];  // (Most significant byte)
 
-      int port = bytes_to_u16(buf[1], buf[0]);
-      userConfig.setIncline(port);
+      int targetIncline = bytes_to_u16(buf[1], buf[0]);
+      userConfig.setIncline(targetIncline);
       if (userConfig.getERGMode()) {
         userConfig.setERGMode(false);
       }
-      debugDirector(" Target Incline: " + String((userConfig.getIncline() / 100)), false);
+      snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " | FTMS(CP)[ INC(%.2f) ]", fmodf(targetIncline / 100, 1000.0));
+      SS2K_LOG("BLE_Server", "%s", logBuf);
+      SEND_TO_TELEGRAM(String(logBuf));
     }
-    debugDirector("");
-
-    /* 0x05 5 means FTMS Watts Control Mode (aka ERG mode) */
-    if ((static_cast<int>(rxValue[0]) == 5) && (spinBLEClient.connectedPM)) {
+    if ((static_cast<int>(rxValue[0]) == 5) && (spinBLEClient.connectedPM)) {  // 0x05 5 means FTMS Watts Control Mode (aka ERG mode)
       int targetWatts = bytes_to_u16(rxValue[2], rxValue[1]);
       if (!userConfig.getERGMode()) {
         userConfig.setERGMode(true);
       }
       computeERG(userConfig.getSimulatedWatts(), targetWatts);
-      debugDirector("ERG MODE", false);
-      debugDirector(" Target: " + String(targetWatts), false);
-      debugDirector(" Current: " + String(userConfig.getSimulatedWatts()),
-                    false);  // not displaying numbers less than 256 correctly
-                             // but they do get sent to Zwift correctly.
-      debugDirector(" Incline: " + String(userConfig.getIncline() / 100), false);
-      debugDirector("");
+      snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " | FTMS(CP)[ TGT(%d) CUR(%d) INC(%.2f) ]", targetWatts % 10000, userConfig.getSimulatedWatts() % 10000,
+               fmodf(userConfig.getIncline() / 100, 1000.0));
+      SS2K_LOG("BLE_Server", "%s", logBuf);
+      SEND_TO_TELEGRAM(String(logBuf));
     }
   }
 }
@@ -325,9 +341,8 @@ void calculateInstPwrFromHR() {
   static int oldHR    = userConfig.getSimulatedHr();
   static int newHR    = userConfig.getSimulatedHr();
   static double delta = 0;
-
-  oldHR = newHR;  // Copying HR from Last loop
-  newHR = userConfig.getSimulatedHr();
+  oldHR               = newHR;  // Copying HR from Last loop
+  newHR               = userConfig.getSimulatedHr();
 
   delta = (newHR - oldHR) / (BLE_CLIENT_DELAY / 1000);
 
@@ -352,5 +367,5 @@ void calculateInstPwrFromHR() {
   userConfig.setSimulatedCad(90);
 #endif
 
-  debugDirector("Power From HR: " + String(avgP));
+  SS2K_LOG("BLE_Server", "Power From HR: %d", avgP);
 }
@@ -7,11 +7,12 @@
 
 #include "BLE_Common.h"
 #include "Main.h"
+#include "SS2KLog.h"
 #include <ArduinoJson.h>
 #include <NimBLEDevice.h>
 
 void setupBLE() {  // Common BLE setup for both client and server
-  debugDirector("Starting Arduino BLE Client application...");
+  SS2K_LOG("BLE_Setup", "Starting Arduino BLE Client application...");
   BLEDevice::init(userConfig.getDeviceName());
   spinBLEClient.start();
   startBLEServer();
@@ -24,12 +25,12 @@ void setupBLE() {  // Common BLE setup for both client and server
                           &BLECommunicationTask,  /* Task handle to keep track of created task */
                           1);                     /* pin task to core 0 */
 
-  debugDirector("BLE Notify Task Started");
+  SS2K_LOG("BLE_Setup", "BLE Notify Task Started");
   vTaskDelay(100 / portTICK_PERIOD_MS);
-  if (!((String(userConfig.getconnectedPowerMeter()) == "none") && (String(userConfig.getconnectedHeartMonitor()) == "none"))) {
+  if (strcmp(userConfig.getconnectedPowerMeter(), "none") != 0 || strcmp(userConfig.getconnectedHeartMonitor(), "none") != 0) {
     spinBLEClient.serverScan(true);
-    debugDirector("Scanning");
+    SS2K_LOG("BLE_Setup", "Scanning");
   }
-  debugDirector(String(userConfig.getconnectedPowerMeter()) + " " + String(userConfig.getconnectedHeartMonitor()));
-  debugDirector("End BLE Setup");
+  SS2K_LOG("BLE_Setup", "%s %s", userConfig.getconnectedPowerMeter(), userConfig.getconnectedHeartMonitor());
+  SS2K_LOG("BLE_Setup", "End BLE Setup");
 }
@@ -10,6 +10,7 @@
 #include "Builtin_Pages.h"
 #include "HTTP_Server_Basic.h"
 #include "cert.h"
+#include "SS2KLog.h"
 #include <WebServer.h>
 #include <HTTPClient.h>
 #include <HTTPUpdate.h>
@@ -47,7 +48,7 @@ void startWifi() {
   int i = 0;
 
   // Trying Station mode first:
-  debugDirector("Connecting to: " + String(userConfig.getSsid()));
+  SS2K_LOG("HTTP_Server", "Connecting to: %s", userConfig.getSsid());
   if (String(WiFi.SSID()) != userConfig.getSsid()) {
     WiFi.mode(WIFI_STA);
     WiFi.setTxPower(WIFI_POWER_19_5dBm);
@@ -56,11 +57,11 @@ void startWifi() {
 
   while (WiFi.status() != WL_CONNECTED) {
     vTaskDelay(1000 / portTICK_RATE_MS);
-    debugDirector(".", false);
+    SS2K_LOG("HTTP_Server", "Waiting for connection to be established...");
     i++;
     if (i > WIFI_CONNECT_TIMEOUT || (String(userConfig.getSsid()) == DEVICE_NAME)) {
       i = 0;
-      debugDirector("Couldn't Connect. Switching to AP mode");
+      SS2K_LOG("HTTP_Server", "Couldn't Connect. Switching to AP mode");
       WiFi.disconnect();
       WiFi.mode(WIFI_AP);
       break;
@@ -89,30 +90,32 @@ void startWifi() {
   }
 
   if (!MDNS.begin(userConfig.getDeviceName())) {
-    debugDirector("Error setting up MDNS responder!");
+    SS2K_LOG("HTTP_Server", "Error setting up MDNS responder!");
   }
 
   MDNS.addService("http", "_tcp", 80);
   MDNS.addServiceTxt("http", "_tcp", "lf", "0");
-  debugDirector("Connected to " + String(userConfig.getSsid()) + " IP address: " + myIP.toString(), true, true);
-  debugDirector(String("Open http://") + userConfig.getDeviceName() + ".local/");
+  SS2K_LOG("HTTP_Server", "Connected to %s IP address: %s", userConfig.getSsid(), myIP.toString().c_str());
+  SEND_TO_TELEGRAM("Connected to " + String(userConfig.getSsid()) + " IP address: " + myIP.toString());
+  SS2K_LOG("HTTP_Server", "Open http://%s.local/", userConfig.getDeviceName());
   WiFi.setTxPower(WIFI_POWER_19_5dBm);
 
   if (WiFi.getMode() == WIFI_STA) {
-    Serial.print("Retrieving time: ");
+    SS2K_LOG("HTTP_Server", "Syncing clock...");
     configTime(0, 0, "pool.ntp.org");  // get UTC time via NTP
     time_t now = time(nullptr);
     while (now < 10) {  // wait 10 seconds
-      Serial.print(".");
+      SS2K_LOG("HTTP_Server", "Waiting for clock sync...");
       delay(100);
       now = time(nullptr);
     }
+    SS2K_LOG("HTTP_Server", "Clock synced to: %.f", difftime(now, (time_t)0));
     Serial.println(now);
   }
 }
 
 void startHttpServer() {
-  server.onNotFound([]() { debugDirector("Link Not Found: " + server.uri()); });
+  server.onNotFound([]() { SS2K_LOG("HTTP_Server", "Link Not Found: %s", server.uri().c_str()); });
 
   /********************************************Begin
    * Handlers***********************************/
@@ -132,7 +135,7 @@ void startHttpServer() {
   server.on("/jquery.js.gz", handleSpiffsFile);
 
   server.on("/BLEScan", []() {
-    debugDirector("Scanning from web request");
+    SS2K_LOG("HTTP_Server", "Scanning from web request");
     String response =
         "<!DOCTYPE html><html><body>Scanning for BLE Devices. Please wait "
         "15 seconds.</body><script> setTimeout(\"location.href = 'http://" +
@@ -143,7 +146,7 @@ void startHttpServer() {
   });
 
   server.on("/load_defaults.html", []() {
-    debugDirector("Setting Defaults from Web Request");
+    SS2K_LOG("HTTP_Server", "Setting Defaults from Web Request");
     SPIFFS.format();
     userConfig.setDefaults();
     userConfig.saveToSPIFFS();
@@ -157,7 +160,7 @@ void startHttpServer() {
   });
 
   server.on("/reboot.html", []() {
-    debugDirector("Rebooting from Web Request");
+    SS2K_LOG("HTTP_Server", "Rebooting from Web Request");
     String response = "Rebooting....<script> setTimeout(\"location.href = 'http://" + myIP.toString() + "/index.html';\",500); </script>";
     server.send(200, "text/html", response);
     vTaskDelay(100 / portTICK_PERIOD_MS);
@@ -169,14 +172,14 @@ void startHttpServer() {
     if (value == "enable") {
       userConfig.setSimulateHr(true);
       server.send(200, "text/plain", "OK");
-      debugDirector("HR Simulator turned on");
+      SS2K_LOG("HTTP_Server", "HR Simulator turned on");
     } else if (value == "disable") {
       userConfig.setSimulateHr(false);
       server.send(200, "text/plain", "OK");
-      debugDirector("HR Simulator turned off");
+      SS2K_LOG("HTTP_Server", "HR Simulator turned off");
     } else {
       userConfig.setSimulatedHr(value.toInt());
-      debugDirector("HR is now: " + String(userConfig.getSimulatedHr()));
+      SS2K_LOG("HTTP_Server", "HR is now: %d", userConfig.getSimulatedHr());
       server.send(200, "text/plain", "OK");
     }
   });
@@ -186,14 +189,14 @@ void startHttpServer() {
     if (value == "enable") {
       userConfig.setSimulateWatts(true);
       server.send(200, "text/plain", "OK");
-      debugDirector("Watt Simulator turned on");
+      SS2K_LOG("HTTP_Server", "Watt Simulator turned on");
     } else if (value == "disable") {
       userConfig.setSimulateWatts(false);
       server.send(200, "text/plain", "OK");
-      debugDirector("Watt Simulator turned off");
+      SS2K_LOG("HTTP_Server", "Watt Simulator turned off");
     } else {
       userConfig.setSimulatedWatts(value.toInt());
-      debugDirector("Watts are now: " + String(userConfig.getSimulatedWatts()));
+      SS2K_LOG("HTTP_Server", "Watts are now: %d", userConfig.getSimulatedWatts());
       server.send(200, "text/plain", "OK");
     }
   });
@@ -203,32 +206,28 @@ void startHttpServer() {
     if (value == "enable") {
       userConfig.setSimulateCad(true);
       server.send(200, "text/plain", "OK");
-      debugDirector("CAD Simulator turned on");
+      SS2K_LOG("HTTP_Server", "CAD Simulator turned on");
     } else if (value == "disable") {
       userConfig.setSimulateCad(false);
       server.send(200, "text/plain", "OK");
-      debugDirector("CAD Simulator turned off");
+      SS2K_LOG("HTTP_Server", "CAD Simulator turned off");
     } else {
       userConfig.setSimulatedCad(value.toInt());
-      debugDirector("CAD is now: " + String(userConfig.getSimulatedCad()));
+      SS2K_LOG("HTTP_Server", "CAD is now: %f", userConfig.getSimulatedCad());
       server.send(200, "text/plain", "OK");
     }
   });
 
   server.on("/configJSON", []() {
     String tString;
-    tString = userConfig.returnJSON();
-    tString.remove(tString.length() - 1, 1);
-    tString += String(",\"debug\":\"") + debugToHTML + "\",\"firmwareVersion\":\"" + String(FIRMWARE_VERSION) + "\"}";
+    tString = userConfig.returnJSON(!server.arg("includeDebugLog").isEmpty());
     server.send(200, "text/plain", tString);
-    debugToHTML = " ";
   });
 
   server.on("/PWCJSON", []() {
     String tString;
     tString = userPWC.returnJSON();
     server.send(200, "text/plain", tString);
-    debugToHTML = " ";
   });
 
   server.on("/login", HTTP_GET, []() {
@@ -253,7 +252,7 @@ void startHttpServer() {
         HTTPUpload &upload = server.upload();
         if (upload.filename == String("firmware.bin").c_str()) {
           if (upload.status == UPLOAD_FILE_START) {
-            debugDirector("Update: " + upload.filename);
+            SS2K_LOG("HTTP_Server", "Update: %s", upload.filename.c_str());
             if (!Update.begin(UPDATE_SIZE_UNKNOWN)) {  // start with max
                                                        // available size
               Update.printError(Serial);
@@ -279,7 +278,7 @@ void startHttpServer() {
             if (!filename.startsWith("/")) {
               filename = "/" + filename;
             }
-            debugDirector("handleFileUpload Name: " + filename);
+            SS2K_LOG("HTTP_Server", "handleFileUpload Name: %s", filename.c_str());
             fsUploadFile = SPIFFS.open(filename, "w");
             filename     = String();
           } else if (upload.status == UPLOAD_FILE_WRITE) {
@@ -290,7 +289,7 @@ void startHttpServer() {
             if (fsUploadFile) {
               fsUploadFile.close();
             }
-            debugDirector(String("handleFileUpload Size: ") + String(upload.totalSize));
+            SS2K_LOG("HTTP_Server", "handleFileUpload Size: %zu", upload.totalSize);
             server.send(200, "text/plain", String(upload.filename + " Uploaded Sucessfully."));
           }
         }
@@ -299,13 +298,13 @@ void startHttpServer() {
   /********************************************End Server
    * Handlers*******************************/
 
-  xTaskCreatePinnedToCore(webClientUpdate,   /* Task function. */
-                          "webClientUpdate", /* name of task. */
-                          4500,              /* Stack size of task Used to be 3000*/
-                          NULL,              /* parameter of the task */
-                          1,                 /* priority of the task  - 29 worked*/
-                          &webClientTask,    /* Task handle to keep track of created task */
-                          1);                /* pin task to core 1 */
+  xTaskCreatePinnedToCore(webClientUpdate,                    /* Task function. */
+                          "webClientUpdate",                  /* name of task. */
+                          4500 + (DEBUG_LOG_BUFFER_SIZE * 2), /* Stack size of task Used to be 3000*/
+                          NULL,                               /* parameter of the task */
+                          1,                                  /* priority of the task  - 29 worked*/
+                          &webClientTask,                     /* Task handle to keep track of created task */
+                          1);                                 /* pin task to core 1 */
 
 #ifdef USE_TELEGRAM
   xTaskCreatePinnedToCore(telegramUpdate,   /* Task function. */
@@ -316,9 +315,8 @@ void startHttpServer() {
                           &telegramTask,    /* Task handle to keep track of created task */
                           1);               /* pin task to core 1 */
 #endif
-
   server.begin();
-  debugDirector("HTTP server started");
+  SS2K_LOG("HTTP_Server", "HTTP server started");
 }
 
 void webClientUpdate(void *pvParameters) {
@@ -343,8 +341,9 @@ void handleIndexFile() {
     File file = SPIFFS.open(filename, FILE_READ);
     server.streamFile(file, "text/html");
     file.close();
+    SS2K_LOG("HTTP_Server", "Served %s", filename.c_str());
   } else {
-    debugDirector(filename + " not found. Sending builtin Index.html");
+    SS2K_LOG("HTTP_Server", "%s not found. Sending builtin Index.html", filename.c_str());
     server.send(200, "text/html", noIndexHTML);
   }
 }
@@ -360,9 +359,9 @@ void handleSpiffsFile() {
     }
     server.streamFile(file, "text/" + fileType);
     file.close();
-    debugDirector("Served " + filename);
+    SS2K_LOG("HTTP_Server", "Served %s", filename.c_str());
   } else {
-    debugDirector(filename + " not found. Sending builtin Index.html");
+    SS2K_LOG("HTTP_Server", "%s not found. Sending 404.", filename.c_str());
     server.send(404, "text/html",
                 "<html><body><h1>ERROR 404 <br> FILE NOT "
                 "FOUND!</h1></body></html>");
@@ -482,7 +481,7 @@ void settingsProcessor() {
         myIP.toString() + "/index.html';\",1000);</script></html>";
   }
   server.send(200, "text/html", response);
-  debugDirector("Config Updated From Web");
+  SS2K_LOG("HTTP_Server", "Config Updated From Web");
   userConfig.saveToSPIFFS();
   userConfig.printFile();
   userPWC.saveToSPIFFS();
@@ -497,7 +496,7 @@ void FirmwareUpdate() {
   // WiFiClientSecure client;
 
   client.setCACert(rootCACertificate);
-  debugDirector("Checking for newer firmware:");
+  SS2K_LOG("HTTP_Server", "Checking for newer firmware:");
   http.begin(userConfig.getFirmwareUpdateURL() + String(FW_VERSIONFILE),
              rootCACertificate);  // check version URL
   delay(100);
@@ -507,10 +506,10 @@ void FirmwareUpdate() {
   if (httpCode == HTTP_CODE_OK) {  // if version received
     payload = http.getString();    // save received version
     payload.trim();
-    debugDirector("  - Server version: " + payload);
+    SS2K_LOG("HTTP_Server", "  - Server version: %s", payload.c_str());
     internetConnection = true;
   } else {
-    debugDirector("error downloading " + String(FW_VERSIONFILE) + " " + String(httpCode));
+    SS2K_LOG("HTTP_Server", "error downloading %s %d", FW_VERSIONFILE, httpCode);
     internetConnection = false;
   }
 
@@ -519,54 +518,54 @@ void FirmwareUpdate() {
     bool updateAnyway = false;
     if (!SPIFFS.exists("/index.html")) {
       updateAnyway = true;
-      debugDirector("  -index.html not found. Forcing update");
+      SS2K_LOG("HTTP_Server", "  -index.html not found. Forcing update");
     }
     Version availiableVer(payload.c_str());
     Version currentVer(FIRMWARE_VERSION);
 
     if ((availiableVer > currentVer) || (updateAnyway)) {
-      debugDirector("New firmware detected!");
-      debugDirector("Upgrading from " + String(FIRMWARE_VERSION) + " to " + payload);
+      SS2K_LOG("HTTP_Server", "New firmware detected!");
+      SS2K_LOG("HTTP_Server", "Upgrading from %s to %s", FIRMWARE_VERSION, payload.c_str());
 
       // Update Spiffs
       httpUpdate.setLedPin(LED_BUILTIN, LOW);
-      debugDirector("Updating FileSystem");
+      SS2K_LOG("HTTP_Server", "Updating FileSystem");
       t_httpUpdate_return ret = httpUpdate.updateSpiffs(client, userConfig.getFirmwareUpdateURL() + String(FW_SPIFFSFILE));
       vTaskDelay(100 / portTICK_PERIOD_MS);
       switch (ret) {
         case HTTP_UPDATE_OK:
-          debugDirector("Saving Config.txt");
+          SS2K_LOG("HTTP_Server", "Saving Config.txt");
           userConfig.saveToSPIFFS();
           userPWC.saveToSPIFFS();
-          debugDirector("Updating Program");
+          SS2K_LOG("HTTP_Server", "Updating Program");
           break;
 
         case HTTP_UPDATE_NO_UPDATES:
-          debugDirector("HTTP_UPDATE_NO_UPDATES");
+          SS2K_LOG("HTTP_Server", "HTTP_UPDATE_NO_UPDATES");
           break;
 
         case HTTP_UPDATE_FAILED:
-          debugDirector("SPIFFS Update Failed: " + String(httpUpdate.getLastError()) + " : " + httpUpdate.getLastErrorString());
+          SS2K_LOG("HTTP_Server", "SPIFFS Update Failed: %d : %s", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
           break;
       }
 
       // Update Firmware
       ret = httpUpdate.update(client, userConfig.getFirmwareUpdateURL() + String(FW_BINFILE));
       switch (ret) {
         case HTTP_UPDATE_FAILED:
-          debugDirector("HTTP_UPDATE_FAILD Error " + String(httpUpdate.getLastError()) + " : " + httpUpdate.getLastErrorString());
+          SS2K_LOG("HTTP_Server", "HTTP_UPDATE_FAILD Error %d : %s", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
           break;
 
         case HTTP_UPDATE_NO_UPDATES:
-          debugDirector("HTTP_UPDATE_NO_UPDATES");
+          SS2K_LOG("HTTP_Server", "HTTP_UPDATE_NO_UPDATES");
           break;
 
         case HTTP_UPDATE_OK:
-          debugDirector("HTTP_UPDATE_OK");
+          SS2K_LOG("HTTP_Server", "HTTP_UPDATE_OK");
           break;
       }
     } else {  // don't update
-      debugDirector("  - Current Version: " + String(FIRMWARE_VERSION));
+      SS2K_LOG("HTTP_Server", "  - Current Version: %s", FIRMWARE_VERSION);
     }
   }
 }
@@ -601,7 +600,7 @@ void telegramUpdate(void *pvParameters) {
       bool rm                = (bot.sendMessage(TELEGRAM_CHAT_ID, telegramMessage, ""));
       if (!rm) {
         telegramFailures++;
-        debugDirector("Telegram failed to send!", +TELEGRAM_CHAT_ID);
+        SS2K_LOG("HTTP_Server", "Telegram failed to send! %s", TELEGRAM_CHAT_ID);
         if (telegramFailures > 2) {
           internetConnection = false;
         }
 
@@ -6,22 +6,23 @@
  */
 
 #include "Main.h"
+#include "SS2KLog.h"
 #include <TMCStepper.h>
 #include <Arduino.h>
 #include <SPIFFS.h>
 #include <HardwareSerial.h>
 
-String debugToHTML = "<br>Firmware Version " + String(FIRMWARE_VERSION);
-bool lastDir       = true;  // Stepper Last Direction
+bool lastDir = true;  // Stepper Last Direction
 
 // Debounce Setup
 uint64_t lastDebounceTime = 0;    // the last time the output pin was toggled
 uint64_t debounceDelay    = 500;  // the debounce time; increase if the output flickers
 
 // Stepper Speed - Lower is faster
-int maxStepperSpeed = 500;
-int shifterPosition = 0;
-int stepperPosition = 0;
+int maxStepperSpeed     = 500;
+int lastShifterPosition = 0;
+int shifterPosition     = 0;
+int stepperPosition     = 0;
 HardwareSerial stepperSerial(2);
 TMC2208Stepper driver(&SERIAL_PORT, R_SENSE);  // Hardware Serial
 
@@ -45,12 +46,12 @@ void setup() {
   // Serial port for debugging purposes
   Serial.begin(512000);
   stepperSerial.begin(57600, SERIAL_8N2, STEPPERSERIAL_RX, STEPPERSERIAL_TX);
-  debugDirector("Compiled " + String(__DATE__) + String(__TIME__));
+  SS2K_LOG("Main", "Compiled %s%s", __DATE__, __TIME__);
 
   // Initialize SPIFFS
-  debugDirector("Mounting Filesystem");
+  SS2K_LOG("Main", "Mounting Filesystem");
   if (!SPIFFS.begin(true)) {
-    debugDirector("An Error has occurred while mounting SPIFFS");
+    SS2K_LOGE("Main", "An Error has occurred while mounting SPIFFS");
     return;
   }
 
@@ -80,7 +81,7 @@ void setup() {
 
   setupTMCStepperDriver();
 
-  debugDirector("Setting up cpu Tasks");
+  SS2K_LOG("Main", "Setting up cpu Tasks");
   disableCore0WDT();  // Disable the watchdog timer on core 0 (so long stepper
                       // moves don't cause problems)
 
@@ -106,7 +107,7 @@ void setup() {
   setupBLE();
   startHttpServer();
   resetIfShiftersHeld();
-  debugDirector("Creating Shifter Interrupts");
+  SS2K_LOG("Main", "Creating Shifter Interrupts");
   // Setup Interrups so shifters work anytime
   attachInterrupt(digitalPinToInterrupt(SHIFT_UP_PIN), shiftUp, CHANGE);
   attachInterrupt(digitalPinToInterrupt(SHIFT_DOWN_PIN), shiftDown, CHANGE);
@@ -115,11 +116,15 @@ void setup() {
 
 void loop() {
   vTaskDelay(1000 / portTICK_RATE_MS);
-  scanIfShiftersHeld();
 
-  if (debugToHTML.length() > 500) {  // Clear up memory
-    debugToHTML = "<br>HTML Debug Truncated. Increase buffer if required.";
+  if (shifterPosition > lastShifterPosition) {
+    SS2K_LOG("Main", "Shift UP: %d", shifterPosition);
+  } else if (shifterPosition < lastShifterPosition) {
+    SS2K_LOG("Main", "Shift DOWN: %d", shifterPosition);
   }
+  lastShifterPosition = shifterPosition;
+
+  scanIfShiftersHeld();
 
 #ifdef DEBUG_STACK
   Serial.printf("Stepper: %d \n", uxTaskGetStackHighWaterMark(moveStepperTask));
@@ -186,7 +191,6 @@ void IRAM_ATTR shiftUp() {  // Handle the shift up interrupt IRAM_ATTR is to kee
   if (deBounce()) {
     if (!digitalRead(SHIFT_UP_PIN)) {  // double checking to make sure the interrupt wasn't triggered by emf
       shifterPosition = (shifterPosition + userConfig.getShiftStep());
-      debugDirector("Shift UP: " + String(shifterPosition));
     } else {
       lastDebounceTime = 0;
     }  // Probably Triggered by EMF, reset the debounce
@@ -197,7 +201,6 @@ void IRAM_ATTR shiftDown() {  // Handle the shift down interrupt
   if (deBounce()) {
     if (!digitalRead(SHIFT_DOWN_PIN)) {  // double checking to make sure the interrupt wasn't triggered by emf
       shifterPosition = (shifterPosition - userConfig.getShiftStep());
-      debugDirector("Shift DOWN: " + String(shifterPosition));
     } else {
       lastDebounceTime = 0;
     }  // Probably Triggered by EMF, reset the debounce
@@ -206,8 +209,8 @@ void IRAM_ATTR shiftDown() {  // Handle the shift down interrupt
 
 void resetIfShiftersHeld() {
   if ((digitalRead(SHIFT_UP_PIN) == LOW) && (digitalRead(SHIFT_DOWN_PIN) == LOW)) {
-    debugDirector("Resetting to defaults via shifter buttons.");
-    for (int x = 0; x < 10; x++) {  // blink fast to acknoledge
+    SS2K_LOG("Main", "Resetting to defaults via shifter buttons.");
+    for (int x = 0; x < 10; x++) {  // blink fast to acknowledge
       digitalWrite(LED_PIN, HIGH);
       vTaskDelay(200 / portTICK_PERIOD_MS);
       digitalWrite(LED_PIN, LOW);
@@ -224,18 +227,18 @@ void resetIfShiftersHeld() {
 
 void scanIfShiftersHeld() {
   if ((digitalRead(SHIFT_UP_PIN) == LOW) && (digitalRead(SHIFT_DOWN_PIN) == LOW)) {  // are both shifters held?
-    debugDirector("Shifters Held " + String(shiftersHoldForScan));
+    SS2K_LOG("Main", "Shifters Held %d", shiftersHoldForScan);
     if (shiftersHoldForScan < 1) {  // have they been held for enough loops?
-      debugDirector("Shifters Held < 1 " + String(shiftersHoldForScan));
+      SS2K_LOG("Main", "Shifters Held < 1 %d", shiftersHoldForScan);
       if ((millis() - scanDelayStart) >= scanDelayTime) {  // Has this already been done within 10 seconds?
         scanDelayStart += scanDelayTime;
         spinBLEClient.resetDevices();
         spinBLEClient.serverScan(true);
         shiftersHoldForScan = SHIFTERS_HOLD_FOR_SCAN;
         digitalWrite(LED_PIN, LOW);
-        debugDirector("Scan From Buttons");
+        SS2K_LOG("Main", "Scan From Buttons");
       } else {
-        debugDirector("Shifters Held but timer not up " + String((millis() - scanDelayStart) >= scanDelayTime));
+        SS2K_LOG("Main", "Shifters Held but timer not up %d", (millis() - scanDelayStart) >= scanDelayTime);
         shiftersHoldForScan = SHIFTERS_HOLD_FOR_SCAN;
         return;
       }
@@ -245,29 +248,13 @@ void scanIfShiftersHeld() {
   }
 }
 
-// String Text to print, Optional Make newline, Optional Send to Telegram
-void debugDirector(String textToPrint, bool newline, bool telegram) {
-  if (newline) {
-    Serial.println(textToPrint);
-    debugToHTML += String("<br>") + textToPrint;
-  } else {
-    Serial.print(textToPrint);
-    debugToHTML += textToPrint;
-  }
-#ifdef USE_TELEGRAM
-  if (telegram) {
-    sendTelegram(textToPrint);
-  }
-#endif
-}
-
 void setupTMCStepperDriver() {
   driver.begin();
   driver.pdn_disable(true);
   driver.mstep_reg_select(true);
 
   uint16_t msread = driver.microsteps();
-  debugDirector(" read:ms=" + msread);
+  SS2K_LOG("Main", " read:ms=%ud", msread);
 
   driver.rms_current(userConfig.getStepperPower());  // Set motor RMS current
   driver.microsteps(4);                              // Set microsteps to 1/8th
@@ -279,8 +266,8 @@ void setupTMCStepperDriver() {
   msread               = driver.microsteps();
   uint16_t currentread = driver.cs_actual();
 
-  debugDirector(" read:current=" + currentread);
-  debugDirector(" read:ms=" + msread);
+  SS2K_LOG("Main", " read:current=%ud", currentread);
+  SS2K_LOG("Main", " read:ms=%ud", msread);
 
   driver.toff(5);
   bool t_bool = userConfig.getStealthchop();
@@ -290,7 +277,7 @@ void setupTMCStepperDriver() {
 }
 
 void updateStepperPower() {
-  debugDirector("Stepper power is now " + String(userConfig.getStepperPower()));
+  SS2K_LOG("Main", "Stepper power is now %d", userConfig.getStepperPower());
   driver.rms_current(userConfig.getStepperPower());
 }
 
@@ -299,5 +286,5 @@ void updateStealthchop() {
   driver.en_spreadCycle(!t_bool);
   driver.pwm_autoscale(t_bool);
   driver.pwm_autograd(t_bool);
-  debugDirector("Stealthchop is now " + String(t_bool));
+  SS2K_LOG("Main", "Stealthchop is now %d", t_bool);
 }
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#include "SS2KLog.h"
+
+DebugInfo DebugInfo::INSTANCE = DebugInfo();
+
+#if DEBUG_LOG_BUFFER_SIZE > 0
+void DebugInfo::appendLog(const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  DebugInfo::INSTANCE.appendLog_internal(format, args);
+  va_end(args);
+}
+
+const std::string DebugInfo::getAndClearLogs() { return DebugInfo::INSTANCE.getAndClearLogs_internal(); }
+
+void DebugInfo::appendLog_internal(const char *format, va_list args) {
+  if (xSemaphoreTake(logBufferMutex, 1000) == pdTRUE) {
+    int written = vsnprintf(logBuffer + logBufferLength, DEBUG_LOG_BUFFER_SIZE - logBufferLength, format, args);
+    SS2K_LOGD("DebugInfo", "Wrote %d bytes to log", written);
+    if (written < 0 || logBufferLength + written > DEBUG_LOG_BUFFER_SIZE) {
+      logBufferLength = snprintf(logBuffer, DEBUG_LOG_BUFFER_SIZE, "...\n");
+    } else {
+      logBufferLength += written;
+    }
+    SS2K_LOGD("DebugInfo", "Log buffer length %d of %d bytes", logBufferLength, DEBUG_LOG_BUFFER_SIZE);
+    xSemaphoreGive(logBufferMutex);
+  }
+}
+
+const std::string DebugInfo::getAndClearLogs_internal() {
+  if (xSemaphoreTake(logBufferMutex, 500) == pdTRUE) {
+    const std::string debugLog = std::string(logBuffer, logBufferLength);
+    logBufferLength            = 0;
+    logBuffer[0]               = '\0';
+    xSemaphoreGive(logBufferMutex);
+    SS2K_LOGD("DebugInfo", "Log buffer read %d bytes and cleared", logBufferLength);
+    return debugLog;
+  }
+  return "";
+}
+#else
+void DebugInfo::appendLog(const char *format, ...) {}
+
+String DebugInfo::getAndClearLogs() { return ""; }
+#endif
+
+void ss2k_remove_newlines(std::string *str) {
+  std::string::size_type pos = 0;
+  while ((pos = (*str).find("\n", pos)) != std::string::npos) {
+    (*str).replace(pos, 1, " ");
+  }
+}
+
+int ss2k_log_hex_to_buffer(const byte *data, const size_t data_length, char *buffer, const int buffer_offset, const size_t buffer_length) {
+  int written = 0;
+  for (int data_offset = 0; data_offset < data_length; data_offset++) {
+    written += snprintf(buffer + buffer_offset + written, buffer_length - written + buffer_offset, "%02x ", *(data + data_offset));
+  }
+  return written;
+}
+
+void ss2k_log_file_internal(const char *tag, File file) {
+  if (!file.available()) {
+    return;
+  }
+  char char_buffer[DEBUG_FILE_CHARS_PER_LINE + 1];
+  int bytes_cur_line;
+
+  while (file.available()) {
+    if (file.available() > DEBUG_FILE_CHARS_PER_LINE) {
+      bytes_cur_line = DEBUG_FILE_CHARS_PER_LINE;
+    } else {
+      bytes_cur_line = file.available();
+    }
+    for (int i = 0; i < bytes_cur_line; i++) {
+      sprintf(char_buffer + i, "%c", file.read());
+    }
+    SS2K_LOG(tag, "%s", char_buffer);
+  }
+}
@@ -6,6 +6,7 @@
  */
 
 #include "Main.h"
+#include "SS2KLog.h"
 #include "SmartSpin_parameters.h"
 
 #include <ArduinoJson.h>
@@ -39,14 +40,15 @@ void userParameters::setDefaults() {  // Move these to set the values as #define
 
 //---------------------------------------------------------------------------------
 //-- return all config as one a single JSON string
-String userParameters::returnJSON() {
+String userParameters::returnJSON(bool includeDebugLog) {
   // Allocate a temporary JsonDocument
   // Don't forget to change the capacity to match your requirements.
   // Use arduinojson.org/assistant to compute the capacity.
   StaticJsonDocument<USERCONFIG_JSON_SIZE> doc;
   // Set the values in the document
 
   doc["firmwareUpdateURL"]     = firmwareUpdateURL;
+  doc["firmwareVersion"]       = FIRMWARE_VERSION;
   doc["incline"]               = incline;
   doc["simulatedWatts"]        = simulatedWatts;
   doc["simulatedHr"]           = simulatedHr;
@@ -67,6 +69,9 @@ String userParameters::returnJSON() {
   doc["foundDevices"]          = foundDevices;
   doc["connectedPowerMeter"]   = connectedPowerMeter;
   doc["connectedHeartMonitor"] = connectedHeartMonitor;
+  if (includeDebugLog) {
+    doc["debug"] = DebugInfo::getAndClearLogs();
+  }
   String output;
   serializeJson(doc, output);
   return output;
@@ -78,10 +83,10 @@ void userParameters::saveToSPIFFS() {
   SPIFFS.remove(configFILENAME);
 
   // Open file for writing
-  debugDirector("Writing File: " + String(configFILENAME));
+  SS2K_LOG("Config", "Writing File: %s", configFILENAME);
   File file = SPIFFS.open(configFILENAME, FILE_WRITE);
   if (!file) {
-    debugDirector(F("Failed to create file"));
+    SS2K_LOGE("Config", "Failed to create file");
     return;
   }
 
@@ -117,7 +122,7 @@ void userParameters::saveToSPIFFS() {
 
   // Serialize JSON to file
   if (serializeJson(doc, file) == 0) {
-    debugDirector(F("Failed to write to file"));
+    SS2K_LOGE("Config", "Failed to write to file");
   }
   // Close the file
   file.close();
@@ -126,12 +131,12 @@ void userParameters::saveToSPIFFS() {
 // Loads the JSON configuration from a file into a userParameters Object
 void userParameters::loadFromSPIFFS() {
   // Open file for reading
-  debugDirector("Reading File: " + String(configFILENAME));
+  SS2K_LOG("Config", "Reading File: %s", configFILENAME);
   File file = SPIFFS.open(configFILENAME);
 
   // load defaults if filename doesn't exist
   if (!file) {
-    debugDirector("Couldn't find configuration file. Loading Defaults");
+    SS2K_LOG("Config", "Couldn't find configuration file. Loading Defaults");
     setDefaults();
     return;
   }
@@ -143,7 +148,7 @@ void userParameters::loadFromSPIFFS() {
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, file);
   if (error) {
-    debugDirector(F("Failed to read file, using default configuration"));
+    SS2K_LOGE("Config", "Failed to read file, using default configuration");
     setDefaults();
     return;
   }
@@ -171,25 +176,20 @@ void userParameters::loadFromSPIFFS() {
   setConnectedPowerMeter(doc["connectedPowerMeter"]);
   setConnectedHeartMonitor(doc["connectedHeartMonitor"]);
 
-  debugDirector("Config File Loaded: " + String(configFILENAME));
+  SS2K_LOG("Config", "Config File Loaded: %s", configFILENAME);
   file.close();
 }
 
 // Prints the content of a file to the Serial
 void userParameters::printFile() {
   // Open file for reading
-  debugDirector("Contents of file: " + String(configFILENAME));
+  SS2K_LOG("Config", "Contents of file: %s", configFILENAME);
   File file = SPIFFS.open(configFILENAME);
   if (!file) {
-    debugDirector(F("Failed to read file"));
+    SS2K_LOGE("Config", "Failed to read file");
     return;
   }
 
-  // Extract each characters by one by one
-  while (file.available()) {
-    debugDirector(String(static_cast<char>(file.read())), false);
-  }
-  debugDirector(String(" "));
   // Close the file
   file.close();
 }
@@ -225,10 +225,10 @@ void physicalWorkingCapacity::saveToSPIFFS() {
   SPIFFS.remove(userPWCFILENAME);
 
   // Open file for writing
-  debugDirector("Writing File: " + String(userPWCFILENAME));
+  SS2K_LOG("Config", "Writing File: %s", userPWCFILENAME);
   File file = SPIFFS.open(userPWCFILENAME, FILE_WRITE);
   if (!file) {
-    debugDirector(F("Failed to create file"));
+    SS2K_LOGE("Config", "Failed to create file");
     return;
   }
 
@@ -242,7 +242,7 @@ void physicalWorkingCapacity::saveToSPIFFS() {
 
   // Serialize JSON to file
   if (serializeJson(doc, file) == 0) {
-    debugDirector(F("Failed to write to file"));
+    SS2K_LOGE("Config", "Failed to write to file");
   }
   // Close the file
   file.close();
@@ -251,12 +251,12 @@ void physicalWorkingCapacity::saveToSPIFFS() {
 // Loads the JSON configuration from a file
 void physicalWorkingCapacity::loadFromSPIFFS() {
   // Open file for reading
-  debugDirector("Reading File: " + String(userPWCFILENAME));
+  SS2K_LOG("Config", "Reading File: %s", userPWCFILENAME);
   File file = SPIFFS.open(userPWCFILENAME);
 
   // load defaults if filename doesn't exist
   if (!file) {
-    debugDirector("Couldn't find configuration file. Loading Defaults");
+    SS2K_LOG("Config", "Couldn't find configuration file. Loading Defaults");
     setDefaults();
     return;
   }
@@ -266,7 +266,7 @@ void physicalWorkingCapacity::loadFromSPIFFS() {
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, file);
   if (error) {
-    debugDirector(F("Failed to read file, using default configuration"));
+    SS2K_LOGE("Config", "Failed to read file, using default configuration");
     setDefaults();
     return;
   }
@@ -278,25 +278,20 @@ void physicalWorkingCapacity::loadFromSPIFFS() {
   session2Pwr = doc["session2Pwr"];
   hr2Pwr      = doc["hr2Pwr"];
 
-  debugDirector("Config File Loaded: " + String(userPWCFILENAME));
+  SS2K_LOG("Config", "Config File Loaded: %s", userPWCFILENAME);
   file.close();
 }
 
 // Prints the content of a file to the Serial
 void physicalWorkingCapacity::printFile() {
   // Open file for reading
-  debugDirector("Contents of file: " + String(userPWCFILENAME));
+  SS2K_LOG("Config", "Contents of file: %s", userPWCFILENAME);
   File file = SPIFFS.open(userPWCFILENAME);
   if (!file) {
-    debugDirector(F("Failed to read file"));
+    SS2K_LOGE("Config", "Failed to read file");
     return;
   }
 
-  // Extract each characters by one by one
-  while (file.available()) {
-    debugDirector(String(static_cast<char>(file.read())), false);
-  }
-  debugDirector(String(" "));
   // Close the file
   file.close();
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from datetime import datetime`
	`2`	`+`
	`3`	`+print("-DBUILD_TIMESTAMP='\"%s\"'" % datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"))`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`class FitnessMachineIndoorBikeData : public SensorData {`
`13`	`13`	`public:`
`14`		`- FitnessMachineIndoorBikeData() : SensorData("FTMS") {`
	`14`	`+ FitnessMachineIndoorBikeData() : SensorData("FTMS(IBD)") {`
`15`	`15`	`for (int i = 0; i < FieldCount; i++) {`
`16`	`16`	`this->values[i] = nan("");`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void FitnessMachineIndoorBikeData::decode(uint8_t *data, size_t length) {`
`76`	`76`	`continue;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- values[typeIndex] = NAN;`
	`79`	`+ values[typeIndex] = nanf("");`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`