From e5ece399e82c7c5143b0d675ae4823cb344b77ea Mon Sep 17 00:00:00 2001 From: Vynwg Date: Wed, 22 Nov 2023 19:35:36 -0300 Subject: [PATCH] Fix 9999999 errors --- platformio.ini | 2 +- src/comm.cpp | 20 +++++++++----------- src/comm.h | 14 +++++++------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/platformio.ini b/platformio.ini index 6ef56c1..f8b7c01 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,4 +17,4 @@ lib_deps = dfrobot/DFRobot_QMC5883@^1.0.0 juerd/ESP-WiFiSettings@^3.8.0 https://github.com/sivar2311/WebMonitor -upload_flags = --auth=senha1234 +; upload_flags = --auth=senha1234 diff --git a/src/comm.cpp b/src/comm.cpp index ae5d287..fe0d3fd 100644 --- a/src/comm.cpp +++ b/src/comm.cpp @@ -1,19 +1,16 @@ #include "comm.h" -void CommunicationsController::initota() { +void CommunicationsController::initOta() { ArduinoOTA.setHostname(WIFI_SSID); ArduinoOTA.setPassword(WIFI_PASSWORD); ArduinoOTA.begin(); } -void CommunicationsController::init_wifi() { +void CommunicationsController::initWifi() { WiFiSettings.hostname = WIFI_SSID; WiFiSettings.password = WIFI_PASSWORD; - WiFiSettings.onPortal = []() { - ota(); - }; WiFiSettings.onPortalWaitLoop = []() { ArduinoOTA.handle(); }; @@ -22,8 +19,8 @@ void CommunicationsController::init_wifi() { } void CommunicationsController::init() { - ota(); - wifi(); + initOta(); + initWifi(); WebMonitor.begin(); } @@ -35,6 +32,7 @@ void CommunicationsController::process() { } if (l4s.connected()) { + handle_client(); } else { create_connection(); @@ -43,13 +41,13 @@ void CommunicationsController::process() { void CommunicationsController::handle_client() { l4s.flush(); - recv = recv(); - Serial.println(recv); + received = recv(); + WebMonitor.println(received); } void CommunicationsController::parseLook4Sat(float* azimuth, float* altitude) { - azimuth = recv.substring(); - altitude = recv.substring(); //TODO + *azimuth = received.substring(0, 3).toFloat(); + *altitude = received.substring(3, 6).toFloat(); //TODO } void CommunicationsController::create_connection() { diff --git a/src/comm.h b/src/comm.h index 94c4461..731e751 100644 --- a/src/comm.h +++ b/src/comm.h @@ -14,13 +14,13 @@ class CommunicationsController { private: - String recv; - WifiClient l4s; - WifiServer l4sServer(L4S_PORT); + String received; + WiFiClient l4s; + WiFiServer l4sServer{L4S_PORT}; - void recv(); - void init_ota(); - void init_wifi(); + String recv(); + void initOta(); + void initWifi(); void handle_client(); void create_connection(); @@ -28,6 +28,6 @@ class CommunicationsController { void init(); void process(); void parseLook4Sat(float* azimuth, float* altitude); -} +}; #endif