Upated UDP logging info in HTML

photonikus · Jan 27, 2022 · 30a01ef · 30a01ef
1 parent 21bce5d
commit 30a01ef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 35 deletions.
diff --git a/data/status.html b/data/status.html
@@ -116,6 +116,7 @@ <h2>
  var followElement = document.getElementById("follow");
  var updatePending = false;
  var updateTimer = undefined;
+ var udpLogEnabled = true;
 
  function onVisibilityChanged() {
  if (document.hidden || document.mozHidden || document.webkitHidden || document.msHidden) {
@@ -165,9 +166,12 @@ <h2>
  document.getElementById("inclineMultiplier").value = obj.inclineMultiplier;
  //--- document.getElementById("ERGSensitivity").value = obj.ERGSensitivity; ---//
  document.getElementById("connectedPowerMeter").value = obj.connectedPowerMeter;
+ if (obj.udpLogEnabled) {
+ udpLogEnabled = obj.udpLogEnabled.value;
+ }
  }
  };
- xhttp.open("GET", "/configJSON?includeDebugLog=false", true);
+ xhttp.open("GET", "/configJSON", true);
  xhttp.send();
  }
  }
@@ -186,17 +190,20 @@ <h2>
  document.getElementById("simulatedWatts").value = obj.simulatedWatts;
  document.getElementById("targetWatts").value = obj.targetWatts;
  document.getElementById("simulatedCad").value = obj.simulatedCad;
- if (obj.debug != null) {
- if (debugElement.innerHTML == "Loading") {
+ if (obj.debug != null || !udpLogEnabled) {
+ if (debugElement.innerHTML == "Loading" && !udpLogEnabled) {
  document.getElementById("debug").innerHTML = obj.debug;
- } else {
+ } else if (!udpLogEnabled) {
+ document.getElementById("debug").innerHTML = "UDP logging is enabled in settings.\n\nView logs using Logbert or a similar\nUDP logging utility, and define\na custom UDP logger on port 10000\nwithout a filter.";
+ }
+ else {
  document.getElementById("debug").innerHTML += obj.debug;
  }
  updateDebugView(obj.debug);
  }
  }
  };
- xhttp.open("GET", "/runtimeConfigJSON?includeDebugLog=true", true);
+ xhttp.open("GET", !udpLogEnabled ? "/runtimeConfigJSON" : "/runtimeConfigJSON?includeDebugLog=true", true);
  xhttp.send();
  }
  }
@@ -214,7 +221,7 @@ <h2>
  window.addEventListener('load', function () {
  setTimeout(loadCss, 100);
  requestConfigValues();
- requestRuntimeValues();
+ setTimeout(requestRuntimeValues(),200);
  startUpdate();
  }, false);
 </script>

diff --git a/include/Main.h b/include/Main.h
@@ -24,7 +24,6 @@ class SS2K {
  int shiftersHoldForScan;
  uint64_t scanDelayTime;
  uint64_t scanDelayStart;
- bool UDPloggingAutoDisabled;
 
  public:
  int32_t targetPosition;
@@ -48,7 +47,6 @@ class SS2K {
  void updateStealthchop();
  void checkDriverTemperature();
  void motorStop(bool releaseTension = false);
- void toggleUDPLog(bool requestOff = false);
 
  SS2K() {
  targetPosition = 0;
@@ -62,7 +60,6 @@ class SS2K {
  shiftersHoldForScan = SHIFTERS_HOLD_FOR_SCAN;
  scanDelayTime = 10000;
  scanDelayStart = 0;
- UDPloggingAutoDisabled = false;
  }
 };
 

diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
@@ -271,18 +271,12 @@ void HTTP_Server::start() {
  String tString;
  tString = userConfig.returnJSON(!server.arg("includeDebugLog").isEmpty());
  server.send(200, "text/plain", tString);
- if (!server.arg("includeDebugLog").isEmpty()) {
- ss2k.toggleUDPLog(true); // reduce WiFi use
- }
  });
 
  server.on("/runtimeConfigJSON", []() {
  String tString;
  tString = rtConfig.returnJSON(!server.arg("includeDebugLog").isEmpty());
  server.send(200, "text/plain", tString);
- if (!server.arg("includeDebugLog").isEmpty()) {
- ss2k.toggleUDPLog(true); // reduce WiFi use
- }
  });
 
  server.on("/PWCJSON", []() {

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -156,7 +156,7 @@ void SS2K::maintenanceLoop(void *pvParameters) {
  if ((millis() - intervalTimer) > 10000) { // add check here for when to restart WiFi
  // maybe if in STA mode and 8.8.8.8 no ping return?
  // ss2k.restartWifi();
-  ss2k.toggleUDPLog(false); // check to see if UDP Logging is disabled
+
  intervalTimer = millis();
  }
 
@@ -177,25 +177,6 @@ void SS2K::maintenanceLoop(void *pvParameters) {
 }
 #endif // UNIT_TEST
 
-// Test is False, Request Off is True
-void SS2K::toggleUDPLog(bool requestOff) {
- static bool userUDPpreference = userConfig.getUdpLogEnabled();
- if (!ss2k.UDPloggingAutoDisabled && !requestOff) { // timer check only, return fast.
- return;
- }
- if (!ss2k.UDPloggingAutoDisabled && requestOff) { // Initial request off
- userConfig.setUdpLogEnabled(false);
- ss2k.UDPloggingAutoDisabled = true;
- }
- if (ss2k.UDPloggingAutoDisabled && requestOff) { // Repeat request off
- userConfig.setUdpLogEnabled(false);
- }
- if (ss2k.UDPloggingAutoDisabled && !requestOff) { // timer expired, reset to original user setting.
- userConfig.setUdpLogEnabled(userUDPpreference);
- ss2k.UDPloggingAutoDisabled = false;
- }
-}
-
 void SS2K::restartWifi() {
  httpServer.stop();
  vTaskDelay(100 / portTICK_RATE_MS);