From 590a9ab9df679722d4e86638c493fa20e3a08346 Mon Sep 17 00:00:00 2001 From: IhorNehrutsa Date: Thu, 19 Nov 2020 17:45:10 -0800 Subject: [PATCH 1/5] ESP32: Add EspError exception. --- ports/esp32/Makefile | 1 + ports/esp32/esp_error.c | 137 +++++++++++++++++++++++++++++++++++++ ports/esp32/esp_error.h | 43 ++++++++++++ ports/esp32/mpconfigport.h | 1 + py/obj.h | 1 + 5 files changed, 183 insertions(+) create mode 100755 ports/esp32/esp_error.c create mode 100755 ports/esp32/esp_error.h diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index 756bc8f8940c5..10b409d9f1a9d 100644 --- a/ports/esp32/Makefile +++ b/ports/esp32/Makefile @@ -351,6 +351,7 @@ SRC_C = \ mpthreadport.c \ machine_rtc.c \ machine_sdcard.c \ + esp_error.c \ $(wildcard $(BOARD_DIR)/*.c) \ $(SRC_MOD) diff --git a/ports/esp32/esp_error.c b/ports/esp32/esp_error.c new file mode 100755 index 0000000000000..978d4845849f3 --- /dev/null +++ b/ports/esp32/esp_error.c @@ -0,0 +1,137 @@ +/* + * This file was generated by micropython-extmod-generator https://github.com/prusnak/micropython-extmod-generator + * from Python stab file esp_err.py + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Ihor Nehrutsa + * + * 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. + */ + +/* +Error Codes and Helper Functions +https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/esp_err.html + +Wrapped around +https://github.com/espressif/esp-idf/blob/master/components/esp_common/include/esp_err.h +*/ + +#define MODULE_ESP_ERR_ENABLED (1) +#if MODULE_ESP_ERR_ENABLED + +// Include required definitions first +#include "py/obj.h" +#include "py/objexcept.h" + + +/* +// Example how to raise ESP exception from C code + +#include "esp_error.h" + +ESP_EXCEPTIONS(pcnt_event_disable(self->unit, evt_type)) + +// is equivalent to + +esp_err_t err = pcnt_event_disable(self->unit, evt_type); +if (err != ESP_OK) + raise_esp_error(err); +*/ + +// Defining classes +// class EspError(Exception): +typedef struct _mp_obj_esp_err_EspError_t { + mp_obj_base_t base; +} mp_obj_esp_err_EspError_t; + +const mp_obj_type_t mp_type_EspError; +/* +// Defining EspError methods +// def EspError.__init__(self, error_code: int=0, error_msg: str='') +STATIC mp_obj_t esp_err_EspError_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { + mp_arg_check_num(n_args, n_kw, 0, 2, false); + self->base.type = &mp_type_EspError; + + mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(args[0]); + mp_int_t error_code = mp_obj_get_int(args[1]); + const char* error_msg = mp_obj_str_get_str(args[2]); + + //TODO: Your code here + return MP_OBJ_FROM_PTR(self); +} +*/ +/* +STATIC mp_obj_t esp_err_EspError_print(const mp_print_t *print, mp_obj_t self_obj, mp_print_kind_t kind) { + esp_err_EspError_obj_t *self = MP_OBJ_TO_PTR(self_obj); + mp_printf(print, "EspError()"); + + //TODO: Your code here +} +*/ + +// EspError stuff +// Register class methods +STATIC const mp_rom_map_elem_t esp_err_EspError_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_FLASH_BASE), MP_ROM_INT(ESP_ERR_FLASH_BASE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_ARG), MP_ROM_INT(ESP_ERR_INVALID_ARG) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_CRC), MP_ROM_INT(ESP_ERR_INVALID_CRC) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_MAC), MP_ROM_INT(ESP_ERR_INVALID_MAC) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_RESPONSE), MP_ROM_INT(ESP_ERR_INVALID_RESPONSE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_SIZE), MP_ROM_INT(ESP_ERR_INVALID_SIZE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_STATE), MP_ROM_INT(ESP_ERR_INVALID_STATE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_VERSION), MP_ROM_INT(ESP_ERR_INVALID_VERSION) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_MESH_BASE), MP_ROM_INT(ESP_ERR_MESH_BASE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_NOT_FOUND), MP_ROM_INT(ESP_ERR_NOT_FOUND) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_NOT_SUPPORTED), MP_ROM_INT(ESP_ERR_NOT_SUPPORTED) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_NO_MEM), MP_ROM_INT(ESP_ERR_NO_MEM) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_TIMEOUT), MP_ROM_INT(ESP_ERR_TIMEOUT) }, + { MP_ROM_QSTR(MP_QSTR_ESP_ERR_WIFI_BASE), MP_ROM_INT(ESP_ERR_WIFI_BASE) }, + { MP_ROM_QSTR(MP_QSTR_ESP_FAIL), MP_ROM_INT(ESP_FAIL) }, + { MP_ROM_QSTR(MP_QSTR_ESP_OK), MP_ROM_INT(ESP_OK) }, +}; +STATIC MP_DEFINE_CONST_DICT(esp_err_EspError_locals_dict, esp_err_EspError_locals_dict_table); + +// Create the class-object itself +const mp_obj_type_t mp_type_EspError = { + { &mp_type_type }, + .name = MP_QSTR_EspError, + + //.make_new = esp_err_EspError_make_new, + //.print = esp_err_EspError_print, + .locals_dict = (mp_obj_dict_t*)&esp_err_EspError_locals_dict, + + .print = mp_obj_exception_print, + .make_new = mp_obj_exception_make_new, + .attr = mp_obj_exception_attr, + .parent = &mp_type_Exception, +}; + +/* +// To call from C modules use like: + mp_raise_msg_varg(&mp_type_EspError, MP_ERROR_TEXT("An error message %d"), val); +*/ +/* +// Function to call from C modules +NORETURN void mp_raise_EspError(mp_rom_error_text_t msg) { + mp_raise_msg(&mp_type_EspError, msg); +} +*/ + +#endif // MODULE_ESP_ERR_ENABLED diff --git a/ports/esp32/esp_error.h b/ports/esp32/esp_error.h new file mode 100755 index 0000000000000..feb7540383cf6 --- /dev/null +++ b/ports/esp32/esp_error.h @@ -0,0 +1,43 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Ihor Nehrutsa + * + * 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_ESP_ERROR_H +#define MICROPY_INCLUDED_ESP_ERROR_H + +//#include "py/obj.h" + +//extern const mp_obj_type_t mp_type_EspError; + +#define raise_esp_error(e) mp_raise_msg_varg(&mp_type_EspError, MP_ERROR_TEXT("%d(0x%X) - %s"), e, e, esp_err_to_name(e)); + +static inline void esp_exceptions(esp_err_t e) { + if (e != ESP_OK) { + raise_esp_error(e) + } +} + +#define ESP_EXCEPTIONS(e) do { esp_exceptions(e); } while (0); + +#endif // MICROPY_INCLUDED_ESP_ERROR_H diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index f170d70708b79..2a1dec3a26ae9 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -179,6 +179,7 @@ // extra built in names to add to the global namespace #define MICROPY_PORT_BUILTINS \ + { MP_ROM_QSTR(MP_QSTR_EspError), MP_ROM_PTR(&mp_type_EspError) }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, diff --git a/py/obj.h b/py/obj.h index 6a040b77739c2..347db2eff534e 100644 --- a/py/obj.h +++ b/py/obj.h @@ -666,6 +666,7 @@ extern const mp_obj_type_t mp_type_UnicodeError; extern const mp_obj_type_t mp_type_ValueError; extern const mp_obj_type_t mp_type_ViperTypeError; extern const mp_obj_type_t mp_type_ZeroDivisionError; +extern const mp_obj_type_t mp_type_EspError; // it used in ESP32 port only, not visible in other ports // Constant objects, globally accessible: None, False, True // These should always be accessed via the below macros. From 6aff23ce3ad8dba0c2eaebeb00f0b6f00ddf36fc Mon Sep 17 00:00:00 2001 From: "Ihor.Nehrutsa@gmail.com" Date: Fri, 20 Nov 2020 10:15:07 +0200 Subject: [PATCH 2/5] ESP32/esp_err.c: Add err_to_name() method. --- ports/esp32/esp_error.c | 13 ++++++++++++- py/obj.h | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/esp32/esp_error.c b/ports/esp32/esp_error.c index 978d4845849f3..b5e69ea49b0e8 100755 --- a/ports/esp32/esp_error.c +++ b/ports/esp32/esp_error.c @@ -86,10 +86,20 @@ STATIC mp_obj_t esp_err_EspError_print(const mp_print_t *print, mp_obj_t self_ob } */ +STATIC mp_obj_t esp_err_EspError_esp_err_to_name(mp_obj_t self_obj, mp_obj_t err_obj) { + //mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(self_obj); + mp_int_t err = mp_obj_get_int(err_obj); + + const char *s = esp_err_to_name(err); + + return mp_obj_new_str(s, strlen(s)); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_err_EspError_esp_err_to_name_obj, esp_err_EspError_esp_err_to_name); + // EspError stuff // Register class methods STATIC const mp_rom_map_elem_t esp_err_EspError_locals_dict_table[] = { - { MP_ROM_QSTR(MP_QSTR_ESP_ERR_FLASH_BASE), MP_ROM_INT(ESP_ERR_FLASH_BASE) }, + //{ MP_ROM_QSTR(MP_QSTR_ESP_ERR_FLASH_BASE), MP_ROM_INT(ESP_ERR_FLASH_BASE) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_ARG), MP_ROM_INT(ESP_ERR_INVALID_ARG) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_CRC), MP_ROM_INT(ESP_ERR_INVALID_CRC) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_MAC), MP_ROM_INT(ESP_ERR_INVALID_MAC) }, @@ -105,6 +115,7 @@ STATIC const mp_rom_map_elem_t esp_err_EspError_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ESP_ERR_WIFI_BASE), MP_ROM_INT(ESP_ERR_WIFI_BASE) }, { MP_ROM_QSTR(MP_QSTR_ESP_FAIL), MP_ROM_INT(ESP_FAIL) }, { MP_ROM_QSTR(MP_QSTR_ESP_OK), MP_ROM_INT(ESP_OK) }, + { MP_ROM_QSTR(MP_QSTR_err_to_name), MP_ROM_PTR(&esp_err_EspError_esp_err_to_name_obj) }, \ }; STATIC MP_DEFINE_CONST_DICT(esp_err_EspError_locals_dict, esp_err_EspError_locals_dict_table); diff --git a/py/obj.h b/py/obj.h index 347db2eff534e..8210d5e2bdcf5 100644 --- a/py/obj.h +++ b/py/obj.h @@ -666,7 +666,7 @@ extern const mp_obj_type_t mp_type_UnicodeError; extern const mp_obj_type_t mp_type_ValueError; extern const mp_obj_type_t mp_type_ViperTypeError; extern const mp_obj_type_t mp_type_ZeroDivisionError; -extern const mp_obj_type_t mp_type_EspError; // it used in ESP32 port only, not visible in other ports +extern const mp_obj_type_t mp_type_EspError; // it used in ESP32 port only, not visible in other ports // ESP8266-??? // Constant objects, globally accessible: None, False, True // These should always be accessed via the below macros. From 13ff2bbb0049cf3a10c2ece8eef985a04389b952 Mon Sep 17 00:00:00 2001 From: "Ihor.Nehrutsa@gmail.com" Date: Fri, 20 Nov 2020 11:08:56 +0200 Subject: [PATCH 3/5] ESP32/esp_error.*: Rename raise_esp_error() to mp_raise_EspError() --- ports/esp32/esp_error.c | 2 +- ports/esp32/esp_error.h | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ports/esp32/esp_error.c b/ports/esp32/esp_error.c index b5e69ea49b0e8..d51b827cb34b2 100755 --- a/ports/esp32/esp_error.c +++ b/ports/esp32/esp_error.c @@ -52,7 +52,7 @@ ESP_EXCEPTIONS(pcnt_event_disable(self->unit, evt_type)) esp_err_t err = pcnt_event_disable(self->unit, evt_type); if (err != ESP_OK) - raise_esp_error(err); + mp_raise_EspError(err); */ // Defining classes diff --git a/ports/esp32/esp_error.h b/ports/esp32/esp_error.h index feb7540383cf6..2c5ab985dadb4 100755 --- a/ports/esp32/esp_error.h +++ b/ports/esp32/esp_error.h @@ -26,15 +26,11 @@ #ifndef MICROPY_INCLUDED_ESP_ERROR_H #define MICROPY_INCLUDED_ESP_ERROR_H -//#include "py/obj.h" - -//extern const mp_obj_type_t mp_type_EspError; - -#define raise_esp_error(e) mp_raise_msg_varg(&mp_type_EspError, MP_ERROR_TEXT("%d(0x%X) - %s"), e, e, esp_err_to_name(e)); +#define mp_raise_EspError(e) mp_raise_msg_varg(&mp_type_EspError, MP_ERROR_TEXT("%d(0x%X) - %s"), e, e, esp_err_to_name(e)); static inline void esp_exceptions(esp_err_t e) { if (e != ESP_OK) { - raise_esp_error(e) + mp_raise_EspError(e) } } From ddfcbbfb642508f92612986750ebf6c4d3524760 Mon Sep 17 00:00:00 2001 From: "Ihor.Nehrutsa@gmail.com" Date: Fri, 20 Nov 2020 11:29:34 +0200 Subject: [PATCH 4/5] esp32/esp_error.c: Code formatting. --- ports/esp32/esp_error.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/esp32/esp_error.c b/ports/esp32/esp_error.c index d51b827cb34b2..97a3225fd8892 100755 --- a/ports/esp32/esp_error.c +++ b/ports/esp32/esp_error.c @@ -87,7 +87,7 @@ STATIC mp_obj_t esp_err_EspError_print(const mp_print_t *print, mp_obj_t self_ob */ STATIC mp_obj_t esp_err_EspError_esp_err_to_name(mp_obj_t self_obj, mp_obj_t err_obj) { - //mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(self_obj); + // mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(self_obj); mp_int_t err = mp_obj_get_int(err_obj); const char *s = esp_err_to_name(err); @@ -99,7 +99,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_err_EspError_esp_err_to_name_obj, esp_err_E // EspError stuff // Register class methods STATIC const mp_rom_map_elem_t esp_err_EspError_locals_dict_table[] = { - //{ MP_ROM_QSTR(MP_QSTR_ESP_ERR_FLASH_BASE), MP_ROM_INT(ESP_ERR_FLASH_BASE) }, + // { MP_ROM_QSTR(MP_QSTR_ESP_ERR_FLASH_BASE), MP_ROM_INT(ESP_ERR_FLASH_BASE) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_ARG), MP_ROM_INT(ESP_ERR_INVALID_ARG) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_CRC), MP_ROM_INT(ESP_ERR_INVALID_CRC) }, { MP_ROM_QSTR(MP_QSTR_ESP_ERR_INVALID_MAC), MP_ROM_INT(ESP_ERR_INVALID_MAC) }, @@ -124,8 +124,8 @@ const mp_obj_type_t mp_type_EspError = { { &mp_type_type }, .name = MP_QSTR_EspError, - //.make_new = esp_err_EspError_make_new, - //.print = esp_err_EspError_print, + // .make_new = esp_err_EspError_make_new, + // .print = esp_err_EspError_print, .locals_dict = (mp_obj_dict_t*)&esp_err_EspError_locals_dict, .print = mp_obj_exception_print, From d03eaf18c76df9a3f68a460d324b491401f05191 Mon Sep 17 00:00:00 2001 From: "Ihor.Nehrutsa@gmail.com" Date: Fri, 20 Nov 2020 12:47:55 +0200 Subject: [PATCH 5/5] esp32/esp_error.c: Code formatting. --- ports/esp32/esp_error.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/esp32/esp_error.c b/ports/esp32/esp_error.c index 97a3225fd8892..23a9870628526 100755 --- a/ports/esp32/esp_error.c +++ b/ports/esp32/esp_error.c @@ -87,8 +87,8 @@ STATIC mp_obj_t esp_err_EspError_print(const mp_print_t *print, mp_obj_t self_ob */ STATIC mp_obj_t esp_err_EspError_esp_err_to_name(mp_obj_t self_obj, mp_obj_t err_obj) { - // mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(self_obj); - mp_int_t err = mp_obj_get_int(err_obj); + // mp_obj_esp_err_EspError_t *self = MP_OBJ_TO_PTR(self_obj); + mp_int_t err = mp_obj_get_int(err_obj); const char *s = esp_err_to_name(err); @@ -126,7 +126,7 @@ const mp_obj_type_t mp_type_EspError = { // .make_new = esp_err_EspError_make_new, // .print = esp_err_EspError_print, - .locals_dict = (mp_obj_dict_t*)&esp_err_EspError_locals_dict, + .locals_dict = (mp_obj_dict_t *)&esp_err_EspError_locals_dict, .print = mp_obj_exception_print, .make_new = mp_obj_exception_make_new, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy