agclient keep serial number on initialization

This commit is contained in:
samuelbles07
2025-03-23 21:48:46 +07:00
parent 0297059e91
commit c2a26e78a0
2 changed files with 7 additions and 7 deletions

View File

@ -686,7 +686,7 @@ static void sendDataToAg() {
root["wifi"] = wifiConnector.RSSI(); root["wifi"] = wifiConnector.RSSI();
root["boot"] = measurements.bootCount(); root["boot"] = measurements.bootCount();
std::string payload = JSON.stringify(root).c_str(); std::string payload = JSON.stringify(root).c_str();
if (agClient->httpPostMeasures(ag->getDeviceId(), payload)) { if (agClient->httpPostMeasures(payload)) {
if (ag->isOne()) { if (ag->isOne()) {
stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected); stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected);
} }
@ -940,7 +940,7 @@ void initializeNetwork() {
networkOption = UseWifi; networkOption = UseWifi;
} }
if (!agClient->begin()) { if (!agClient->begin(ag->getDeviceId())) {
oledDisplay.setText("Client", "initialization", "failed"); oledDisplay.setText("Client", "initialization", "failed");
delay(5000); delay(5000);
oledDisplay.showRebooting(); oledDisplay.showRebooting();
@ -984,7 +984,7 @@ void initializeNetwork() {
} }
std::string config = agClient->httpFetchConfig(ag->getDeviceId()); std::string config = agClient->httpFetchConfig();
configSchedule.update(); configSchedule.update();
// Check if fetch configuration failed or fetch succes but parsing failed // Check if fetch configuration failed or fetch succes but parsing failed
if (agClient->isLastFetchConfigSucceed() == false || if (agClient->isLastFetchConfigSucceed() == false ||
@ -1013,7 +1013,7 @@ static void configurationUpdateSchedule(void) {
return; return;
} }
std::string config = agClient->httpFetchConfig(ag->getDeviceId()); std::string config = agClient->httpFetchConfig();
if (agClient->isLastFetchConfigSucceed() && configuration.parse(config.c_str(), false)) { if (agClient->isLastFetchConfigSucceed() && configuration.parse(config.c_str(), false)) {
configUpdateHandle(); configUpdateHandle();
} }
@ -1296,7 +1296,7 @@ void postUsingWifi() {
measurements.setBootCount(bootCount); measurements.setBootCount(bootCount);
String payload = measurements.toString(false, fwMode, wifiConnector.RSSI()); String payload = measurements.toString(false, fwMode, wifiConnector.RSSI());
if (agClient->httpPostMeasures(ag->getDeviceId(), payload.c_str()) == false) { if (agClient->httpPostMeasures(payload.c_str()) == false) {
Serial.println(); Serial.println();
Serial.println("Online mode and isPostToAirGradient = true"); Serial.println("Online mode and isPostToAirGradient = true");
Serial.println(); Serial.println();
@ -1332,7 +1332,7 @@ void postUsingCellular() {
// Attempt to send // Attempt to send
Serial.println(payload); Serial.println(payload);
if (agClient->httpPostMeasures(ag->getDeviceId(), payload.c_str()) == false) { if (agClient->httpPostMeasures(payload.c_str()) == false) {
// Consider network has a problem, retry in next schedule // Consider network has a problem, retry in next schedule
Serial.println("Post measures failed, retry in next schedule"); Serial.println("Post measures failed, retry in next schedule");
return; return;