Skip to content

Commit 02849a1

Browse files
committed
Fix pass agclient to openmetrics
previously, agclient initialized after setAirgradient
1 parent 074337a commit 02849a1

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

examples/OneOpenAir/OneOpenAir.ino

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void setup() {
210210
oledDisplay.setAirGradient(ag);
211211
stateMachine.setAirGradient(ag);
212212
wifiConnector.setAirGradient(ag);
213-
openMetrics.setAirGradient(ag, agClient);
213+
openMetrics.setAirGradient(ag);
214214
localServer.setAirGraident(ag);
215215
measurements.setAirGradient(ag);
216216

@@ -989,6 +989,9 @@ void initializeNetwork() {
989989
ESP.restart();
990990
}
991991

992+
// Provide openmetrics to have access to last transmission result
993+
openMetrics.setAirgradientClient(agClient);
994+
992995
if (networkOption == UseCellular) {
993996
// Disabling it again
994997
agSerial->setDebug(false);

examples/OneOpenAir/OpenMetrics.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ OpenMetrics::OpenMetrics(Measurements &measure, Configuration &config,
66

77
OpenMetrics::~OpenMetrics() {}
88

9-
void OpenMetrics::setAirGradient(AirGradient *ag, AirgradientClient *client) {
9+
void OpenMetrics::setAirGradient(AirGradient *ag) {
1010
this->ag = ag;
11+
}
12+
13+
void OpenMetrics::setAirgradientClient(AirgradientClient *client) {
1114
this->agClient = client;
1215
}
1316

examples/OneOpenAir/OpenMetrics.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class OpenMetrics {
1919
OpenMetrics(Measurements &measure, Configuration &config,
2020
WifiConnector &wifiConnector);
2121
~OpenMetrics();
22-
void setAirGradient(AirGradient *ag, AirgradientClient *client);
22+
void setAirGradient(AirGradient *ag);
23+
void setAirgradientClient(AirgradientClient *client);
2324
const char *getApiContentType(void);
2425
const char* getApi(void);
2526
String getPayload(void);

0 commit comments

Comments
 (0)