Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-12-16 09:50:15 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

esp32: Consolidate check_esp_err functions and add IDF error string.

Browse Source 
This commit consolidates a number of check_esp_err functions that check
whether an ESP-IDF return code is OK and raises an exception if not.  The
exception raised is an OSError with the error code as the first argument
(negative if it's ESP-IDF specific) and the ESP-IDF error string as the
second argument.

This commit also fixes esp32.Partition.set_boot to use check_esp_err, and
uses that function for a unit test.
This commit is contained in:
Thorsten von Eicken
2020-03-31 16:03:01 -07:00
committed by Damien George
parent a177831c46
commit 1ae7e0e561
8 changed files with 85 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ports/esp32/esp32_partition.c
View File

@@ -29,6 +29,7 @@
#include "py/runtime.h"
#include "py/mperrno.h"
#include "extmod/vfs.h"
#include "mphalport.h"
#include "modesp32.h"
#include "esp_ota_ops.h"
@@ -47,12 +48,6 @@ typedef struct _esp32_partition_obj_t {
const esp_partition_t *part;
} esp32_partition_obj_t;
static inline void check_esp_err(esp_err_t e) {
if (e != ESP_OK) {
mp_raise_OSError(-e);
}
}
STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part) {
if (part == NULL) {
mp_raise_OSError(MP_ENOENT);
@@ -203,7 +198,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_partition_ioctl_obj, esp32_partition_ioct
STATIC mp_obj_t esp32_partition_set_boot(mp_obj_t self_in) {
esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
esp_ota_set_boot_partition(self->part);
check_esp_err(esp_ota_set_boot_partition(self->part));
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_set_boot_obj, esp32_partition_set_boot);