mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-14 07:21:30 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
#include "BleOta.h"
|
|
#include "Arduino.h"
|
|
#include <esp_ota_ops.h>
|
|
|
|
static const String MESHTASTIC_OTA_APP_PROJECT_NAME("Meshtastic-OTA");
|
|
|
|
const esp_partition_t *BleOta::findEspOtaAppPartition()
|
|
{
|
|
const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
|
|
|
|
esp_app_desc_t app_desc;
|
|
esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
|
|
|
|
if (ret != ESP_OK || MESHTASTIC_OTA_APP_PROJECT_NAME != app_desc.project_name) {
|
|
part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, nullptr);
|
|
ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
|
|
}
|
|
|
|
if (ret == ESP_OK && MESHTASTIC_OTA_APP_PROJECT_NAME == app_desc.project_name) {
|
|
return part;
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
String BleOta::getOtaAppVersion()
|
|
{
|
|
const esp_partition_t *part = findEspOtaAppPartition();
|
|
esp_app_desc_t app_desc;
|
|
esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
|
|
String version;
|
|
if (ret == ESP_OK) {
|
|
version = app_desc.version;
|
|
}
|
|
return version;
|
|
}
|
|
|
|
bool BleOta::switchToOtaApp()
|
|
{
|
|
bool success = false;
|
|
const esp_partition_t *part = findEspOtaAppPartition();
|
|
if (part) {
|
|
success = (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_set_boot_partition(part)) == ESP_OK);
|
|
}
|
|
return success;
|
|
} |