airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-27 23:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix changes to other examples

Browse Source
This commit is contained in:
samuelbles07
2025-01-24 18:17:41 +07:00
parent a28931493a
commit 4bb97fc8be
9 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/BASIC/BASIC.ino
View File

@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
static AirGradient ag(DIY_BASIC); static AirGradient ag(DIY_BASIC);
static Configuration configuration(Serial); static Configuration configuration(Serial);
static AgApiClient apiClient(Serial, configuration); static AgApiClient apiClient(Serial, configuration);
static Measurements measurements; static Measurements measurements(configuration);
static OledDisplay oledDisplay(configuration, measurements, Serial); static OledDisplay oledDisplay(configuration, measurements, Serial);
static StateMachine stateMachine(oledDisplay, Serial, measurements, static StateMachine stateMachine(oledDisplay, Serial, measurements,
configuration); configuration);
@ -124,6 +124,7 @@ void setup() {
apiClient.setAirGradient(&ag); apiClient.setAirGradient(&ag);
openMetrics.setAirGradient(&ag); openMetrics.setAirGradient(&ag);
localServer.setAirGraident(&ag); localServer.setAirGraident(&ag);
measurements.setAirGradient(&ag);
/** Example set custom API root URL */ /** Example set custom API root URL */
// apiClient.setApiRoot("https://example.custom.api"); // apiClient.setApiRoot("https://example.custom.api");
@ -316,7 +317,7 @@ static void mqttHandle(void) {
} }
if (mqttClient.isConnected()) { if (mqttClient.isConnected()) {
String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration); String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
String topic = "airgradient/readings/" + ag.deviceId(); String topic = "airgradient/readings/" + ag.deviceId();
if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) { if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
Serial.println("MQTT sync success"); Serial.println("MQTT sync success");
@ -527,7 +528,7 @@ static void sendDataToServer(void) {
return; return;
} }
String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration); String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
if (apiClient.postToServer(syncData)) { if (apiClient.postToServer(syncData)) {
Serial.println(); Serial.println();
Serial.println( Serial.println(

2
examples/BASIC/LocalServer.cpp
View File

@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
} }
void LocalServer::_GET_measure(void) { void LocalServer::_GET_measure(void) {
String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config); String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
server.send(200, "application/json", toSend); server.send(200, "application/json", toSend);
} }

2
examples/BASIC/OpenMetrics.cpp
View File

@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
pm01 = measure.get(Measurements::PM01); pm01 = measure.get(Measurements::PM01);
float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1); float correctedPm = measure.getCorrectedPM25(false, 1);
pm25 = round(correctedPm); pm25 = round(correctedPm);
pm10 = measure.get(Measurements::PM10); pm10 = measure.get(Measurements::PM10);
pm03PCount = measure.get(Measurements::PM03_PC); pm03PCount = measure.get(Measurements::PM03_PC);

7
examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
View File

@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
static AirGradient ag(DIY_PRO_INDOOR_V3_3); static AirGradient ag(DIY_PRO_INDOOR_V3_3);
static Configuration configuration(Serial); static Configuration configuration(Serial);
static AgApiClient apiClient(Serial, configuration); static AgApiClient apiClient(Serial, configuration);
static Measurements measurements; static Measurements measurements(configuration);
static OledDisplay oledDisplay(configuration, measurements, Serial); static OledDisplay oledDisplay(configuration, measurements, Serial);
static StateMachine stateMachine(oledDisplay, Serial, measurements, static StateMachine stateMachine(oledDisplay, Serial, measurements,
configuration); configuration);
@ -124,6 +124,7 @@ void setup() {
apiClient.setAirGradient(&ag); apiClient.setAirGradient(&ag);
openMetrics.setAirGradient(&ag); openMetrics.setAirGradient(&ag);
localServer.setAirGraident(&ag); localServer.setAirGraident(&ag);
measurements.setAirGradient(&ag);
/** Example set custom API root URL */ /** Example set custom API root URL */
// apiClient.setApiRoot("https://example.custom.api"); // apiClient.setApiRoot("https://example.custom.api");
@ -373,7 +374,7 @@ static void mqttHandle(void) {
} }
if (mqttClient.isConnected()) { if (mqttClient.isConnected()) {
String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration); String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
String topic = "airgradient/readings/" + ag.deviceId(); String topic = "airgradient/readings/" + ag.deviceId();
if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) { if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
Serial.println("MQTT sync success"); Serial.println("MQTT sync success");
@ -579,7 +580,7 @@ static void sendDataToServer(void) {
return; return;
} }
String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration); String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
if (apiClient.postToServer(syncData)) { if (apiClient.postToServer(syncData)) {
Serial.println(); Serial.println();
Serial.println( Serial.println(

2
examples/DiyProIndoorV3_3/LocalServer.cpp
View File

@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
} }
void LocalServer::_GET_measure(void) { void LocalServer::_GET_measure(void) {
String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config); String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
server.send(200, "application/json", toSend); server.send(200, "application/json", toSend);
} }

2
examples/DiyProIndoorV3_3/OpenMetrics.cpp
View File

@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
pm01 = measure.get(Measurements::PM01); pm01 = measure.get(Measurements::PM01);
float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1); float correctedPm = measure.getCorrectedPM25(false, 1);
pm25 = round(correctedPm); pm25 = round(correctedPm);
pm10 = measure.get(Measurements::PM10); pm10 = measure.get(Measurements::PM10);
pm03PCount = measure.get(Measurements::PM03_PC); pm03PCount = measure.get(Measurements::PM03_PC);

7
examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
View File

@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
static AirGradient ag(DIY_PRO_INDOOR_V4_2); static AirGradient ag(DIY_PRO_INDOOR_V4_2);
static Configuration configuration(Serial); static Configuration configuration(Serial);
static AgApiClient apiClient(Serial, configuration); static AgApiClient apiClient(Serial, configuration);
static Measurements measurements; static Measurements measurements(configuration);
static OledDisplay oledDisplay(configuration, measurements, Serial); static OledDisplay oledDisplay(configuration, measurements, Serial);
static StateMachine stateMachine(oledDisplay, Serial, measurements, static StateMachine stateMachine(oledDisplay, Serial, measurements,
configuration); configuration);
@ -125,6 +125,7 @@ void setup() {
apiClient.setAirGradient(&ag); apiClient.setAirGradient(&ag);
openMetrics.setAirGradient(&ag); openMetrics.setAirGradient(&ag);
localServer.setAirGraident(&ag); localServer.setAirGraident(&ag);
measurements.setAirGradient(&ag);
/** Example set custom API root URL */ /** Example set custom API root URL */
// apiClient.setApiRoot("https://example.custom.api"); // apiClient.setApiRoot("https://example.custom.api");
@ -396,7 +397,7 @@ static void mqttHandle(void) {
} }
if (mqttClient.isConnected()) { if (mqttClient.isConnected()) {
String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration); String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
String topic = "airgradient/readings/" + ag.deviceId(); String topic = "airgradient/readings/" + ag.deviceId();
if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) { if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
Serial.println("MQTT sync success"); Serial.println("MQTT sync success");
@ -620,7 +621,7 @@ static void sendDataToServer(void) {
return; return;
} }
String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration); String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
if (apiClient.postToServer(syncData)) { if (apiClient.postToServer(syncData)) {
Serial.println(); Serial.println();
Serial.println( Serial.println(

2
examples/DiyProIndoorV4_2/LocalServer.cpp
View File

@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
} }
void LocalServer::_GET_measure(void) { void LocalServer::_GET_measure(void) {
String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config); String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
server.send(200, "application/json", toSend); server.send(200, "application/json", toSend);
} }

2
examples/DiyProIndoorV4_2/OpenMetrics.cpp
View File

@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
pm01 = measure.get(Measurements::PM01); pm01 = measure.get(Measurements::PM01);
float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1); float correctedPm = measure.getCorrectedPM25(false, 1);
pm25 = round(correctedPm); pm25 = round(correctedPm);
pm10 = measure.get(Measurements::PM10); pm10 = measure.get(Measurements::PM10);
pm03PCount = measure.get(Measurements::PM03_PC); pm03PCount = measure.get(Measurements::PM03_PC);