refactor(network): rewrite UdpClient into a class

SlimeVR · Jul 4, 2023 · 4c6401d · 4c6401d
1 parent 283c885
commit 4c6401d
Show file tree

Hide file tree

Showing 22 changed files with 829 additions and 850 deletions.
diff --git a/src/GlobalVars.h b/src/GlobalVars.h
@@ -28,6 +28,7 @@
 
 #include "LEDManager.h"
 #include "configuration/Configuration.h"
+#include "network/connection.h"
 #include "network/manager.h"
 #include "sensors/SensorManager.h"
 #include "status/StatusManager.h"
@@ -38,5 +39,6 @@ extern SlimeVR::Status::StatusManager statusManager;
 extern SlimeVR::Configuration::Configuration configuration;
 extern SlimeVR::Sensors::SensorManager sensorManager;
 extern SlimeVR::Network::Manager networkManager;
+extern SlimeVR::Network::Connection networkConnection;
 
 #endif
diff --git a/src/batterymonitor.cpp b/src/batterymonitor.cpp
@@ -21,7 +21,6 @@
     THE SOFTWARE.
 */
 #include "batterymonitor.h"
-#include "network/udpclient.h"
 #include "GlobalVars.h"
 
 #if ESP8266 && (BATTERY_MONITOR == BAT_INTERNAL || BATTERY_MONITOR == BAT_INTERNAL_MCP3021)
@@ -117,7 +116,7 @@ void BatteryMonitor::Loop()
                     level = 1;
                 else if (level < 0)
                     level = 0;
-                Network::sendBatteryLevel(voltage, level);
+                networkConnection.sendBatteryLevel(voltage, level);
                 #ifdef BATTERY_LOW_POWER_VOLTAGE
                     if (voltage < BATTERY_LOW_POWER_VOLTAGE)
                     {

diff --git a/src/main.cpp b/src/main.cpp
@@ -24,9 +24,6 @@
 #include "Wire.h"
 #include "ota.h"
 #include "GlobalVars.h"
-#include "sensors/SensorManager.h"
-#include "configuration/Configuration.h"
-#include "network/manager.h"
 #include "globals.h"
 #include "credentials.h"
 #include <i2cscan.h>
@@ -41,6 +38,7 @@ SlimeVR::LEDManager ledManager(LED_PIN);
 SlimeVR::Status::StatusManager statusManager;
 SlimeVR::Configuration::Configuration configuration;
 SlimeVR::Network::Manager networkManager;
+SlimeVR::Network::Connection networkConnection;
 
 int sensorToCalibrate = -1;
 bool blinking = false;