Attempt to phase out outdated dependencies

hhvrc · hhvrc · commit 4575b6246ed7 · 2025-05-19T11:56:39.000+02:00
diff --git a/include/Core.h b/include/Core.h
diff --git a/include/Logging.h b/include/Logging.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Time.h"
+#include "Core.h"
 
 #include <esp32-hal-uart.h>
 
diff --git a/platformio.ini b/platformio.ini
@@ -19,11 +19,12 @@ build_flags =
   -Wextra
   ;-Wpedantic ; This can't be enabled yet because it screams about "ISO C++ prohibits anonymous structs in C code"
   -Wno-unknown-pragmas
+  -DCONFIG_ASYNC_TCP_QUEUE_SIZE=256
 build_unflags =
 	-std=gnu++11
 lib_deps =
-	https://github.com/OpenShock/flatbuffers#48403e50a086e69a2097f75da2bb4d5898cf6f72
-	https://github.com/OpenShock/ESPAsyncWebServer#ad02dfc69ba640c6727f775a50407a68d25c96b6
+	https://github.com/OpenShock/flatbuffers#aff1c9205b0fccf3b351f6aea9c48ab76744227f
+	https://github.com/OpenShock/ESPAsyncWebServer#e0d81e66ce75c27138370fdba5ac6451cf583d2f
 	https://github.com/OpenShock/BadWebSockets#7f6b0f23818807cdf2ffde67ec1080949e751afa
 custom_openshock.flash_size = 4MB; Can be overridden per board
 board_build.filesystem = littlefs
diff --git a/requirements.txt b/requirements.txt
diff --git a/src/CaptivePortal.cpp b/src/CaptivePortal.cpp
@@ -7,9 +7,9 @@ const char* const TAG = "CaptivePortal";
 #include "CaptivePortalInstance.h"
 #include "CommandHandler.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "GatewayConnectionManager.h"
 #include "Logging.h"
-#include "Time.h"
 
 #include <ESPAsyncWebServer.h>
 #include <WebSocketsServer.h>
diff --git a/src/CommandHandler.cpp b/src/CommandHandler.cpp
@@ -7,14 +7,14 @@ const char* const TAG = "CommandHandler";
 #include "Chipset.h"
 #include "Common.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "estop/EStopManager.h"
 #include "estop/EStopState.h"
 #include "events/Events.h"
 #include "Logging.h"
 #include "radio/RFTransmitter.h"
 #include "ReadWriteMutex.h"
 #include "SimpleMutex.h"
-#include "Time.h"
 #include "util/TaskUtils.h"
 
 #include <freertos/queue.h>
diff --git a/src/EStopManager.cpp b/src/EStopManager.cpp
@@ -6,10 +6,10 @@ const char* const TAG = "EStopManager";
 
 #include "Chipset.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "events/Events.h"
 #include "Logging.h"
 #include "SimpleMutex.h"
-#include "Time.h"
 #include "util/TaskUtils.h"
 
 #include <driver/gpio.h>
diff --git a/src/GatewayClient.cpp b/src/GatewayClient.cpp
@@ -4,12 +4,12 @@ const char* const TAG = "GatewayClient";
 
 #include "Common.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "events/Events.h"
 #include "Logging.h"
 #include "message_handlers/WebSocket.h"
 #include "OtaUpdateManager.h"
 #include "serialization/WSGateway.h"
-#include "Time.h"
 #include "util/CertificateUtils.h"
 #include "VisualStateManager.h"
 
diff --git a/src/GatewayConnectionManager.cpp b/src/GatewayConnectionManager.cpp
@@ -5,10 +5,10 @@ const char* const TAG = "GatewayConnectionManager";
 #include "VisualStateManager.h"
 
 #include "config/Config.h"
+#include "Core.h"
 #include "GatewayClient.h"
 #include "http/JsonAPI.h"
 #include "Logging.h"
-#include "Time.h"
 
 #include <unordered_map>
 
diff --git a/src/OtaUpdateManager.cpp b/src/OtaUpdateManager.cpp
@@ -5,14 +5,14 @@ const char* const TAG = "OtaUpdateManager";
 #include "CaptivePortal.h"
 #include "Common.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "GatewayConnectionManager.h"
 #include "Hashing.h"
 #include "http/HTTPRequestManager.h"
 #include "Logging.h"
 #include "SemVer.h"
 #include "serialization/WSGateway.h"
 #include "SimpleMutex.h"
-#include "Time.h"
 #include "util/HexUtils.h"
 #include "util/PartitionUtils.h"
 #include "util/StringUtils.h"
diff --git a/src/RateLimiter.cpp b/src/RateLimiter.cpp
@@ -2,7 +2,7 @@
 
 #include "RateLimiter.h"
 
-#include "Time.h"
+#include "Core.h"
 
 #include <algorithm>
 
diff --git a/src/http/HTTPRequestManager.cpp b/src/http/HTTPRequestManager.cpp
@@ -3,10 +3,10 @@
 const char* const TAG = "HTTPRequestManager";
 
 #include "Common.h"
+#include "Core.h"
 #include "Logging.h"
 #include "RateLimiter.h"
 #include "SimpleMutex.h"
-#include "Time.h"
 #include "util/HexUtils.h"
 #include "util/StringUtils.h"
 
diff --git a/src/radio/RFTransmitter.cpp b/src/radio/RFTransmitter.cpp
@@ -4,10 +4,10 @@
 
 const char* const TAG = "RFTransmitter";
 
+#include "Core.h"
 #include "estop/EStopManager.h"
 #include "Logging.h"
 #include "radio/rmt/MainEncoder.h"
-#include "Time.h"
 #include "util/FnProxy.h"
 #include "util/TaskUtils.h"
 
diff --git a/src/serial/SerialInputHandler.cpp b/src/serial/SerialInputHandler.cpp
@@ -7,6 +7,7 @@ const char* const TAG = "SerialInputHandler";
 #include "config/Config.h"
 #include "config/SerialInputConfig.h"
 #include "Convert.h"
+#include "Core.h"
 #include "estop/EStopManager.h"
 #include "FormatHelpers.h"
 #include "http/HTTPRequestManager.h"
@@ -16,7 +17,6 @@ const char* const TAG = "SerialInputHandler";
 #include "serial/command_handlers/index.h"
 #include "serialization/JsonAPI.h"
 #include "serialization/JsonSerial.h"
-#include "Time.h"
 #include "util/Base64Utils.h"
 #include "util/StringUtils.h"
 #include "util/TaskUtils.h"
diff --git a/src/serial/command_handlers/sysinfo.cpp b/src/serial/command_handlers/sysinfo.cpp
@@ -1,7 +1,7 @@
 #include "serial/command_handlers/common.h"
 
+#include "Core.h"
 #include "FormatHelpers.h"
-#include "Time.h"
 #include "wifi/WiFiManager.h"
 #include "wifi/WiFiNetwork.h"
 
diff --git a/src/serialization/WSGateway.cpp b/src/serialization/WSGateway.cpp
@@ -5,8 +5,8 @@ const char* const TAG = "WSGateway";
 #include <esp_wifi.h>
 
 #include "config/Config.h"
+#include "Core.h"
 #include "Logging.h"
-#include "Time.h"
 
 using namespace OpenShock::Serialization;
 
diff --git a/src/util/ParitionUtils.cpp b/src/util/ParitionUtils.cpp
@@ -2,10 +2,10 @@
 
 const char* const TAG = "PartitionUtils";
 
+#include "Core.h"
 #include "Hashing.h"
 #include "http/HTTPRequestManager.h"
 #include "Logging.h"
-#include "Time.h"
 #include "util/HexUtils.h"
 
 bool OpenShock::TryGetPartitionHash(const esp_partition_t* partition, char (&hash)[65]) {
diff --git a/src/wifi/WiFiManager.cpp b/src/wifi/WiFiManager.cpp
@@ -4,10 +4,10 @@ const char* const TAG = "WiFiManager";
 
 #include "CaptivePortal.h"
 #include "config/Config.h"
+#include "Core.h"
 #include "FormatHelpers.h"
 #include "Logging.h"
 #include "serialization/WSLocal.h"
-#include "Time.h"
 #include "util/TaskUtils.h"
 #include "VisualStateManager.h"
 #include "wifi/WiFiNetwork.h"
