From 02849a193854890f861b3739b1b764e7b9ff4441 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Thu, 1 May 2025 13:38:42 +0800 Subject: [PATCH] Fix pass agclient to openmetrics previously, agclient initialized after setAirgradient --- examples/OneOpenAir/OneOpenAir.ino | 5 ++++- examples/OneOpenAir/OpenMetrics.cpp | 5 ++++- examples/OneOpenAir/OpenMetrics.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index 399a0cc5..1ba41df5 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -210,7 +210,7 @@ void setup() { oledDisplay.setAirGradient(ag); stateMachine.setAirGradient(ag); wifiConnector.setAirGradient(ag); - openMetrics.setAirGradient(ag, agClient); + openMetrics.setAirGradient(ag); localServer.setAirGraident(ag); measurements.setAirGradient(ag); @@ -989,6 +989,9 @@ void initializeNetwork() { ESP.restart(); } + // Provide openmetrics to have access to last transmission result + openMetrics.setAirgradientClient(agClient); + if (networkOption == UseCellular) { // Disabling it again agSerial->setDebug(false); diff --git a/examples/OneOpenAir/OpenMetrics.cpp b/examples/OneOpenAir/OpenMetrics.cpp index 55850ff6..12a6a2a8 100644 --- a/examples/OneOpenAir/OpenMetrics.cpp +++ b/examples/OneOpenAir/OpenMetrics.cpp @@ -6,8 +6,11 @@ OpenMetrics::OpenMetrics(Measurements &measure, Configuration &config, OpenMetrics::~OpenMetrics() {} -void OpenMetrics::setAirGradient(AirGradient *ag, AirgradientClient *client) { +void OpenMetrics::setAirGradient(AirGradient *ag) { this->ag = ag; +} + +void OpenMetrics::setAirgradientClient(AirgradientClient *client) { this->agClient = client; } diff --git a/examples/OneOpenAir/OpenMetrics.h b/examples/OneOpenAir/OpenMetrics.h index 276a0ee7..2c7ffe86 100644 --- a/examples/OneOpenAir/OpenMetrics.h +++ b/examples/OneOpenAir/OpenMetrics.h @@ -19,7 +19,8 @@ class OpenMetrics { OpenMetrics(Measurements &measure, Configuration &config, WifiConnector &wifiConnector); ~OpenMetrics(); - void setAirGradient(AirGradient *ag, AirgradientClient *client); + void setAirGradient(AirGradient *ag); + void setAirgradientClient(AirgradientClient *client); const char *getApiContentType(void); const char* getApi(void); String getPayload(void);