djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ability to flash in continuous chunks

This commit is contained in:
microDev 2020-12-10 14:36:49 +05:30
parent dee86a014b
commit ed5add37f6
No known key found for this signature in database
GPG Key ID: 2C0867BE60967730
2 changed files with 97 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
ports/esp32s2/common-hal/ota/__init__.c
View File

@ -31,11 +31,18 @@
#include "esp_log.h" #include "esp_log.h"
#include "esp_ota_ops.h" #include "esp_ota_ops.h"
esp_ota_handle_t update_handle = 0 ; static const esp_partition_t *update_partition = NULL;
const esp_partition_t *update_partition = NULL; static esp_ota_handle_t update_handle = 0;
static bool ota_inited = false;
static const char *TAG = "OTA"; static const char *TAG = "OTA";
static void ota_reset(void) {
update_handle = 0;
update_partition = NULL;
ota_inited = false;
}
static void __attribute__((noreturn)) task_fatal_error(void) { static void __attribute__((noreturn)) task_fatal_error(void) {
ESP_LOGE(TAG, "Exiting task due to fatal error..."); ESP_LOGE(TAG, "Exiting task due to fatal error...");
mp_raise_RuntimeError(translate("OTA Update Failed")); mp_raise_RuntimeError(translate("OTA Update Failed"));
@ -44,56 +51,61 @@ static void __attribute__((noreturn)) task_fatal_error(void) {
void common_hal_ota_flash(const void *buf, const size_t len) { void common_hal_ota_flash(const void *buf, const size_t len) {
esp_err_t err; esp_err_t err;
update_partition = esp_ota_get_next_update_partition(NULL);
const esp_partition_t *running = esp_ota_get_running_partition(); const esp_partition_t *running = esp_ota_get_running_partition();
const esp_partition_t *last_invalid = esp_ota_get_last_invalid_partition(); const esp_partition_t *last_invalid = esp_ota_get_last_invalid_partition();
ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08x)", if (update_partition == NULL) {
running->type, running->subtype, running->address); update_partition = esp_ota_get_next_update_partition(NULL);
ESP_LOGI(TAG, "Writing partition type %d subtype %d (offset 0x%08x)\n", ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08x)",
update_partition->type, update_partition->subtype, update_partition->address); running->type, running->subtype, running->address);
assert(update_partition != NULL); ESP_LOGI(TAG, "Writing partition type %d subtype %d (offset 0x%08x)\n",
update_partition->type, update_partition->subtype, update_partition->address);
if (len > sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t)) { assert(update_partition != NULL);
esp_app_desc_t new_app_info; }
memcpy(&new_app_info, &((char *)buf)[sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t)], sizeof(esp_app_desc_t));
ESP_LOGI(TAG, "New firmware version: %s", new_app_info.version);
esp_app_desc_t running_app_info; if (!ota_inited) {
if (esp_ota_get_partition_description(running, &running_app_info) == ESP_OK) { if (len > sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t)) {
ESP_LOGI(TAG, "Running firmware version: %s", running_app_info.version); esp_app_desc_t new_app_info;
} memcpy(&new_app_info, &((char *)buf)[sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t)], sizeof(esp_app_desc_t));
ESP_LOGI(TAG, "New firmware version: %s", new_app_info.version);
esp_app_desc_t invalid_app_info; esp_app_desc_t running_app_info;
if (esp_ota_get_partition_description(last_invalid, &invalid_app_info) == ESP_OK) { if (esp_ota_get_partition_description(running, &running_app_info) == ESP_OK) {
ESP_LOGI(TAG, "Last invalid firmware version: %s", invalid_app_info.version); ESP_LOGI(TAG, "Running firmware version: %s", running_app_info.version);
} }
// check new version with running version esp_app_desc_t invalid_app_info;
if (memcmp(new_app_info.version, running_app_info.version, sizeof(new_app_info.version)) == 0) { if (esp_ota_get_partition_description(last_invalid, &invalid_app_info) == ESP_OK) {
ESP_LOGW(TAG, "New version is the same as running version."); ESP_LOGI(TAG, "Last invalid firmware version: %s", invalid_app_info.version);
task_fatal_error(); }
}
// check new version with last invalid partition // check new version with running version
if (last_invalid != NULL) { if (memcmp(new_app_info.version, running_app_info.version, sizeof(new_app_info.version)) == 0) {
if (memcmp(new_app_info.version, invalid_app_info.version, sizeof(new_app_info.version)) == 0) { ESP_LOGW(TAG, "New version is the same as running version.");
ESP_LOGW(TAG, "New version is the same as invalid version.");
task_fatal_error(); task_fatal_error();
} }
}
err = esp_ota_begin(update_partition, OTA_WITH_SEQUENTIAL_WRITES, &update_handle); // check new version with last invalid partition
if (err != ESP_OK) { if (last_invalid != NULL) {
ESP_LOGE(TAG, "esp_ota_begin failed (%s)", esp_err_to_name(err)); if (memcmp(new_app_info.version, invalid_app_info.version, sizeof(new_app_info.version)) == 0) {
ESP_LOGW(TAG, "New version is the same as invalid version.");
task_fatal_error();
}
}
err = esp_ota_begin(update_partition, OTA_WITH_SEQUENTIAL_WRITES, &update_handle);
if (err != ESP_OK) {
ESP_LOGE(TAG, "esp_ota_begin failed (%s)", esp_err_to_name(err));
task_fatal_error();
}
ota_inited = true;
} else {
ESP_LOGE(TAG, "received package is not fit len");
task_fatal_error(); task_fatal_error();
} }
} else {
ESP_LOGE(TAG, "received package is not fit len");
task_fatal_error();
} }
err = esp_ota_write( update_handle, buf, len); err = esp_ota_write( update_handle, buf, len);
@ -104,20 +116,24 @@ void common_hal_ota_flash(const void *buf, const size_t len) {
} }
void common_hal_ota_finish(void) { void common_hal_ota_finish(void) {
esp_err_t err; if (ota_inited) {
esp_err_t err;
err = esp_ota_end(update_handle); err = esp_ota_end(update_handle);
if (err != ESP_OK) { if (err != ESP_OK) {
if (err == ESP_ERR_OTA_VALIDATE_FAILED) { if (err == ESP_ERR_OTA_VALIDATE_FAILED) {
ESP_LOGE(TAG, "Image validation failed, image is corrupted"); ESP_LOGE(TAG, "Image validation failed, image is corrupted");
}
ESP_LOGE(TAG, "esp_ota_end failed (%s)!", esp_err_to_name(err));
task_fatal_error();
} }
ESP_LOGE(TAG, "esp_ota_end failed (%s)!", esp_err_to_name(err));
task_fatal_error();
}
err = esp_ota_set_boot_partition(update_partition); err = esp_ota_set_boot_partition(update_partition);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err)); ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err));
task_fatal_error(); task_fatal_error();
}
ota_reset();
} }
} }

32
ports/esp32s2/common-hal/ota/__init__.h Normal file
View File

@ -0,0 +1,32 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2020 microDev
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_OTA__INIT__H
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_OTA__INIT__H
extern void ota_reset(void);
#endif //MICROPY_INCLUDED_ESP32S2_COMMON_HAL_OTA__INIT__H