From f7dcef39ced03ce2a993f657172a6068a4133092 Mon Sep 17 00:00:00 2001
From: Jm <jm@casler.org>
Date: Tue, 5 Jan 2021 23:21:14 -0800
Subject: [PATCH] intermediate work

---
 src/airtime.cpp                                 | 2 +-
 src/main.cpp                                    | 2 +-
 src/{meshwifi => mesh/wifi}/WebServerThread.cpp | 4 ++--
 src/{meshwifi => mesh/wifi}/WebServerThread.h   | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename src/{meshwifi => mesh/wifi}/WebServerThread.cpp (78%)
 rename src/{meshwifi => mesh/wifi}/WebServerThread.h (77%)

diff --git a/src/airtime.cpp b/src/airtime.cpp
index a8399fbcd..5c8eb67fd 100644
--- a/src/airtime.cpp
+++ b/src/airtime.cpp
@@ -97,7 +97,7 @@ AirTime::AirTime() : concurrency::OSThread("AirTime") {}
 
 int32_t AirTime::runOnce()
 {
-    // DEBUG_MSG("AirTime::runOnce()\n");
+    //DEBUG_MSG("AirTime::runOnce()\n");
 
     airtimeRotatePeriod();
     secSinceBoot++;
diff --git a/src/main.cpp b/src/main.cpp
index 32704093a..2c9485e22 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
 #include "main.h"
 #include "meshwifi/meshhttp.h"
 #include "meshwifi/meshwifi.h"
-#include "meshwifi/WebServerThread.h"
+#include "mesh/wifi/WebServerThread.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include <OneButton.h>
diff --git a/src/meshwifi/WebServerThread.cpp b/src/mesh/wifi/WebServerThread.cpp
similarity index 78%
rename from src/meshwifi/WebServerThread.cpp
rename to src/mesh/wifi/WebServerThread.cpp
index dbb4a82f2..2bf0f79c7 100644
--- a/src/meshwifi/WebServerThread.cpp
+++ b/src/mesh/wifi/WebServerThread.cpp
@@ -1,7 +1,6 @@
-#include "meshwifi/WebServerThread.h"
+#include "mesh/wifi/WebServerThread.h"
 #include <Arduino.h>
 
-// Thread for the HTTP Server
 WebServerThread webServerThread;
 
 WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {}
@@ -12,3 +11,4 @@ int32_t WebServerThread::runOnce()
 
     return (1000 * 1);
 }
+
diff --git a/src/meshwifi/WebServerThread.h b/src/mesh/wifi/WebServerThread.h
similarity index 77%
rename from src/meshwifi/WebServerThread.h
rename to src/mesh/wifi/WebServerThread.h
index 2f3b55101..43e357f13 100644
--- a/src/meshwifi/WebServerThread.h
+++ b/src/mesh/wifi/WebServerThread.h
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "concurrency/OSThread.h"
-#include "concurrency/Periodic.h"
+#include "configuration.h"
 #include <Arduino.h>
 #include <functional>
-#include "configuration.h"
 
 
 class WebServerThread : private concurrency::OSThread
@@ -13,10 +12,9 @@ class WebServerThread : private concurrency::OSThread
   public:
     WebServerThread();
 
-
   protected:
 
     virtual int32_t runOnce();
 };
 
-extern WebServerThread webServerThread;
\ No newline at end of file
+extern WebServerThread webServerThread;