esp32/mphalport: Add FUNC info to check_esp_err().

IhorNehrutsa · IhorNehrutsa · commit 7864cd5e8aa2 · 2023-09-07T08:36:50.000+03:00
esp32/mphalport: Add __FUNCTION__,
 __LINE__, __FILE__ info to check_esp_err().

Signed-off-by: Ihor Nehrutsa &lt;IhorNehrutsa@gmail.com&gt;
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
@@ -34,6 +34,7 @@
 #include "freertos/task.h"
 #include "esp_timer.h"
 
+#include "py/mpprint.h"
 #include "py/obj.h"
 #include "py/objstr.h"
 #include "py/stream.h"
@@ -53,7 +54,11 @@ STATIC uint8_t stdin_ringbuf_array[260];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
-void check_esp_err(esp_err_t code) {
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
+void check_esp_err_(esp_err_t code) {
+#else
+void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file) {
+#endif
     if (code != ESP_OK) {
         // map esp-idf error code to posix error code
         uint32_t pcode = -code;
@@ -78,6 +83,9 @@ void check_esp_err(esp_err_t code) {
         o_str->data = (const byte *)esp_err_to_name(code); // esp_err_to_name ret's ptr to const str
         o_str->len = strlen((char *)o_str->data);
         o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
+        #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_NORMAL
+        mp_printf(MP_PYTHON_PRINTER, "Exception in function '%s' at line %d in file '%s'\n", func, line, file);
+        #endif
         // raise
         mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str)};
         nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
@@ -55,7 +55,13 @@ extern TaskHandle_t mp_main_task_handle;
 extern ringbuf_t stdin_ringbuf;
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
-void check_esp_err(esp_err_t code);
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_NORMAL
+#define check_esp_err(code) check_esp_err_(code)
+void check_esp_err_(esp_err_t code);
+#else
+#define check_esp_err(code) check_esp_err_(code, __FUNCTION__, __LINE__, __FILE__)
+void check_esp_err_(esp_err_t code, const char *func, const int line, const char *file);
+#endif
 
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
