From 977e47d109ccf46675b33a661de031e88e94c420 Mon Sep 17 00:00:00 2001
From: Jm <jm@casler.org>
Date: Fri, 8 Jan 2021 20:06:11 -0800
Subject: [PATCH] partial work

---
 proto                             |  2 +-
 src/JMTest.cpp                    | 14 --------------
 src/JMTest.h                      | 20 --------------------
 src/main.cpp                      |  6 +++++-
 src/mesh/wifi/WebServerThread.cpp |  2 +-
 src/mesh/wifi/WebServerThread.h   |  2 +-
 6 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 src/JMTest.cpp
 delete mode 100644 src/JMTest.h

diff --git a/proto b/proto
index dfe7bc121..75078afe4 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit dfe7bc1217a00c23eecb9dfcf1d56fe95ebddc3b
+Subproject commit 75078afe43934f4ce15ef86ebc6950658a170145
diff --git a/src/JMTest.cpp b/src/JMTest.cpp
deleted file mode 100644
index 1f2877af5..000000000
--- a/src/JMTest.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "JMTest.h"
-#include <Arduino.h>
-
-JMTest jMTest;
-
-JMTest::JMTest() : concurrency::OSThread("JMTest") {}
-
-int32_t JMTest::runOnce()
-{
-    DEBUG_MSG("JMTest::runOnce()\n");
-
-    return (1000);
-}
-
diff --git a/src/JMTest.h b/src/JMTest.h
deleted file mode 100644
index dfb87345c..000000000
--- a/src/JMTest.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "concurrency/OSThread.h"
-#include "configuration.h"
-#include <Arduino.h>
-#include <functional>
-
-
-class JMTest : private concurrency::OSThread
-{
-
-  public:
-    JMTest();
-
-  protected:
-
-    virtual int32_t runOnce();
-};
-
-extern JMTest jMTest;
diff --git a/src/main.cpp b/src/main.cpp
index 077a9e2dd..5808e3fa1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -517,6 +517,10 @@ void setup()
     // Initialize Wifi
     initWifi(forceSoftAP);
 
+    // Start web server thread.
+    //webServerThread = new WebServerThread();
+
+
     if (!rIf)
         recordCriticalError(CriticalErrorCode_NoRadio);
     else
@@ -577,7 +581,7 @@ void loop()
 #endif
 
     // TODO: This should go into a thread handled by FreeRTOS.
-    handleWebResponse();
+    //handleWebResponse();
 
     service.loop();
 
diff --git a/src/mesh/wifi/WebServerThread.cpp b/src/mesh/wifi/WebServerThread.cpp
index 2bf0f79c7..32fb5a385 100644
--- a/src/mesh/wifi/WebServerThread.cpp
+++ b/src/mesh/wifi/WebServerThread.cpp
@@ -1,7 +1,7 @@
 #include "mesh/wifi/WebServerThread.h"
 #include <Arduino.h>
 
-WebServerThread webServerThread;
+WebServerThread *webServerThread;
 
 WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {}
 
diff --git a/src/mesh/wifi/WebServerThread.h b/src/mesh/wifi/WebServerThread.h
index 43e357f13..f57afb751 100644
--- a/src/mesh/wifi/WebServerThread.h
+++ b/src/mesh/wifi/WebServerThread.h
@@ -17,4 +17,4 @@ class WebServerThread : private concurrency::OSThread
     virtual int32_t runOnce();
 };
 
-extern WebServerThread webServerThread;
+extern WebServerThread *webServerThread;