From 4e651afc8c0132d9232c5b2c6537b41b543c6c19 Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Wed, 26 Mar 2025 17:43:39 +0700
Subject: [PATCH] Remove oneopenair deps from AgApiClient

---
 examples/OneOpenAir/OneOpenAir.ino  |  9 +++------
 examples/OneOpenAir/OpenMetrics.cpp | 14 ++++++++------
 examples/OneOpenAir/OpenMetrics.h   | 10 +++++-----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index 3619c75..fe8bdb5 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -27,7 +27,6 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 
 */
 
-#include "AgApiClient.h"
 #include "AgConfigure.h"
 #include "AgSchedule.h"
 #include "AgStateMachine.h"
@@ -91,7 +90,6 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 static MqttClient mqttClient(Serial);
 static TaskHandle_t mqttTask = NULL;
 static Configuration configuration(Serial);
-static AgApiClient apiClient(Serial, configuration);
 static Measurements measurements(configuration);
 static AirGradient *ag;
 static OledDisplay oledDisplay(configuration, measurements, Serial);
@@ -99,8 +97,7 @@ static StateMachine stateMachine(oledDisplay, Serial, measurements,
                                  configuration);
 static WifiConnector wifiConnector(oledDisplay, Serial, stateMachine,
                                    configuration);
-static OpenMetrics openMetrics(measurements, configuration, wifiConnector,
-                               apiClient);
+static OpenMetrics openMetrics(measurements, configuration, wifiConnector);
 static LocalServer localServer(Serial, openMetrics, measurements, configuration,
                                wifiConnector);
 static AgSerial *agSerial;
@@ -200,7 +197,7 @@ void setup() {
   oledDisplay.setAirGradient(ag);
   stateMachine.setAirGradient(ag);
   wifiConnector.setAirGradient(ag);
-  openMetrics.setAirGradient(ag);
+  openMetrics.setAirGradient(ag, agClient);
   localServer.setAirGraident(ag);
   measurements.setAirGradient(ag);
 
@@ -577,7 +574,7 @@ void otaHandlerCallback(AirgradientOTA::OtaResult result, const char *msg) {
     displayExecuteOta(result, fwNewVersion, 0);
     break;
   case AirgradientOTA::InProgress:
-    Serial.printf("OTA progress: %s", msg);
+    Serial.printf("OTA progress: %s\n", msg);
     displayExecuteOta(result, "", std::stoi(msg));
     break;
   case AirgradientOTA::Failed:
diff --git a/examples/OneOpenAir/OpenMetrics.cpp b/examples/OneOpenAir/OpenMetrics.cpp
index a744522..55850ff 100644
--- a/examples/OneOpenAir/OpenMetrics.cpp
+++ b/examples/OneOpenAir/OpenMetrics.cpp
@@ -1,13 +1,15 @@
 #include "OpenMetrics.h"
 
 OpenMetrics::OpenMetrics(Measurements &measure, Configuration &config,
-                         WifiConnector &wifiConnector, AgApiClient &apiClient)
-    : measure(measure), config(config), wifiConnector(wifiConnector),
-      apiClient(apiClient) {}
+                         WifiConnector &wifiConnector)
+    : measure(measure), config(config), wifiConnector(wifiConnector) {}
 
 OpenMetrics::~OpenMetrics() {}
 
-void OpenMetrics::setAirGradient(AirGradient *ag) { this->ag = ag; }
+void OpenMetrics::setAirGradient(AirGradient *ag, AirgradientClient *client) { 
+  this->ag = ag; 
+  this->agClient = client;
+}
 
 const char *OpenMetrics::getApiContentType(void) {
   return "application/openmetrics-text; version=1.0.0; charset=utf-8";
@@ -43,13 +45,13 @@ String OpenMetrics::getPayload(void) {
              "1 if the AirGradient device was able to successfully fetch its "
              "configuration from the server",
              "gauge");
-  add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
+  add_metric_point("", agClient->isLastFetchConfigSucceed() ? "1" : "0");
 
   add_metric(
       "post_ok",
       "1 if the AirGradient device was able to successfully send to the server",
       "gauge");
-  add_metric_point("", apiClient.isPostToServerFailed() ? "0" : "1");
+  add_metric_point("", agClient->isLastPostMeasureSucceed() ? "1" : "0");
 
   add_metric(
       "wifi_rssi",
diff --git a/examples/OneOpenAir/OpenMetrics.h b/examples/OneOpenAir/OpenMetrics.h
index ed890f5..276a0ee 100644
--- a/examples/OneOpenAir/OpenMetrics.h
+++ b/examples/OneOpenAir/OpenMetrics.h
@@ -5,21 +5,21 @@
 #include "AgValue.h"
 #include "AgWiFiConnector.h"
 #include "AirGradient.h"
-#include "AgApiClient.h"
+#include "Libraries/airgradient-client/src/airgradientClient.h"
 
 class OpenMetrics {
 private:
   AirGradient *ag;
+  AirgradientClient *agClient;
   Measurements &measure;
   Configuration &config;
   WifiConnector &wifiConnector;
-  AgApiClient &apiClient;
 
 public:
-  OpenMetrics(Measurements &measure, Configuration &conig,
-              WifiConnector &wifiConnector, AgApiClient& apiClient);
+  OpenMetrics(Measurements &measure, Configuration &config,
+              WifiConnector &wifiConnector);
   ~OpenMetrics();
-  void setAirGradient(AirGradient *ag);
+  void setAirGradient(AirGradient *ag, AirgradientClient *client);
   const char *getApiContentType(void);
   const char* getApi(void);
   String getPayload(void);