mirror of
https://github.com/airgradienthq/arduino.git
synced 2025-07-03 11:26:29 +02:00
fix: source code formating
This commit is contained in:
@ -1,10 +1,10 @@
|
|||||||
#ifndef _OTA_HANDLER_H_
|
#ifndef _OTA_HANDLER_H_
|
||||||
#define _OTA_HANDLER_H_
|
#define _OTA_HANDLER_H_
|
||||||
|
|
||||||
#include <esp_ota_ops.h>
|
|
||||||
#include <esp_http_client.h>
|
|
||||||
#include <esp_err.h>
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
#include <esp_err.h>
|
||||||
|
#include <esp_http_client.h>
|
||||||
|
#include <esp_ota_ops.h>
|
||||||
|
|
||||||
#define OTA_BUF_SIZE 512
|
#define OTA_BUF_SIZE 512
|
||||||
#define URL_BUF_SIZE 256
|
#define URL_BUF_SIZE 256
|
||||||
@ -16,13 +16,12 @@ enum OtaUpdateOutcome {
|
|||||||
UDPATE_SKIPPED
|
UDPATE_SKIPPED
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class OtaHandler {
|
class OtaHandler {
|
||||||
public:
|
public:
|
||||||
void updateFirmwareIfOutdated(String deviceId) {
|
void updateFirmwareIfOutdated(String deviceId) {
|
||||||
|
|
||||||
String url = "http://hw.airgradient.com/sensors/airgradient:"
|
String url = "http://hw.airgradient.com/sensors/airgradient:" + deviceId +
|
||||||
+ deviceId + "/generic/os/firmware.bin";
|
"/generic/os/firmware.bin";
|
||||||
url += "?current_firmware=";
|
url += "?current_firmware=";
|
||||||
url += GIT_VERSION;
|
url += GIT_VERSION;
|
||||||
char urlAsChar[URL_BUF_SIZE];
|
char urlAsChar[URL_BUF_SIZE];
|
||||||
@ -40,7 +39,6 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
OtaUpdateOutcome attemptToPerformOta(const esp_http_client_config_t *config) {
|
OtaUpdateOutcome attemptToPerformOta(const esp_http_client_config_t *config) {
|
||||||
esp_http_client_handle_t client = esp_http_client_init(config);
|
esp_http_client_handle_t client = esp_http_client_init(config);
|
||||||
if (client == NULL) {
|
if (client == NULL) {
|
||||||
@ -51,7 +49,8 @@ private:
|
|||||||
esp_err_t err = esp_http_client_open(client, 0);
|
esp_err_t err = esp_http_client_open(client, 0);
|
||||||
if (err != ESP_OK) {
|
if (err != ESP_OK) {
|
||||||
esp_http_client_cleanup(client);
|
esp_http_client_cleanup(client);
|
||||||
Serial.printf("Failed to open HTTP connection: %s\n", esp_err_to_name(err));
|
Serial.printf("Failed to open HTTP connection: %s\n",
|
||||||
|
esp_err_to_name(err));
|
||||||
return OtaUpdateOutcome::UPDATE_FAILED;
|
return OtaUpdateOutcome::UPDATE_FAILED;
|
||||||
}
|
}
|
||||||
esp_http_client_fetch_headers(client);
|
esp_http_client_fetch_headers(client);
|
||||||
@ -62,7 +61,8 @@ private:
|
|||||||
cleanupHttp(client);
|
cleanupHttp(client);
|
||||||
return OtaUpdateOutcome::ALREADY_UP_TO_DATE;
|
return OtaUpdateOutcome::ALREADY_UP_TO_DATE;
|
||||||
} else if (httpStatusCode != 200) {
|
} else if (httpStatusCode != 200) {
|
||||||
Serial.printf("Firmware update skipped, the server returned %d\n", httpStatusCode);
|
Serial.printf("Firmware update skipped, the server returned %d\n",
|
||||||
|
httpStatusCode);
|
||||||
cleanupHttp(client);
|
cleanupHttp(client);
|
||||||
return OtaUpdateOutcome::UDPATE_SKIPPED;
|
return OtaUpdateOutcome::UDPATE_SKIPPED;
|
||||||
}
|
}
|
||||||
@ -95,7 +95,8 @@ private:
|
|||||||
|
|
||||||
int binary_file_len = 0;
|
int binary_file_len = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
int data_read = esp_http_client_read(client, upgrade_data_buf, OTA_BUF_SIZE);
|
int data_read =
|
||||||
|
esp_http_client_read(client, upgrade_data_buf, OTA_BUF_SIZE);
|
||||||
if (data_read == 0) {
|
if (data_read == 0) {
|
||||||
Serial.println("Connection closed, all data received");
|
Serial.println("Connection closed, all data received");
|
||||||
break;
|
break;
|
||||||
@ -105,7 +106,8 @@ private:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (data_read > 0) {
|
if (data_read > 0) {
|
||||||
ota_write_err = esp_ota_write( update_handle, (const void *)upgrade_data_buf, data_read);
|
ota_write_err = esp_ota_write(
|
||||||
|
update_handle, (const void *)upgrade_data_buf, data_read);
|
||||||
if (ota_write_err != ESP_OK) {
|
if (ota_write_err != ESP_OK) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -122,7 +124,8 @@ private:
|
|||||||
Serial.printf("Error: esp_ota_write failed! err=0x%d\n", err);
|
Serial.printf("Error: esp_ota_write failed! err=0x%d\n", err);
|
||||||
return OtaUpdateOutcome::UPDATE_FAILED;
|
return OtaUpdateOutcome::UPDATE_FAILED;
|
||||||
} else if (ota_end_err != ESP_OK) {
|
} else if (ota_end_err != ESP_OK) {
|
||||||
Serial.printf("Error: esp_ota_end failed! err=0x%d. Image is invalid", ota_end_err);
|
Serial.printf("Error: esp_ota_end failed! err=0x%d. Image is invalid",
|
||||||
|
ota_end_err);
|
||||||
return OtaUpdateOutcome::UPDATE_FAILED;
|
return OtaUpdateOutcome::UPDATE_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,7 +141,6 @@ private:
|
|||||||
esp_http_client_close(client);
|
esp_http_client_close(client);
|
||||||
esp_http_client_cleanup(client);
|
esp_http_client_cleanup(client);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user