esp32/mphalport: Add __FUNCTION__, __LINE__, __FILE__ info to check_esp_err().

IhorNehrutsa · IhorNehrutsa · commit 8de7ffc2e2e8 · 2023-02-28T23:15:31.000+02:00
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
@@ -46,13 +46,17 @@
 #include "usb_serial_jtag.h"
 #include "uart.h"
 
+#include "py/mpprint.h"
+//#define DBG(...)
+#define DBG(...) mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__); mp_printf(&mp_plat_print, "\n");
+
 TaskHandle_t mp_main_task_handle;
 
 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) {
+void check_esp_err_(esp_err_t code, const char* func, const int line, const char *file) {
     if (code != ESP_OK) {
         // map esp-idf error code to posix error code
         uint32_t pcode = -code;
@@ -78,8 +82,14 @@ void check_esp_err(esp_err_t code) {
         o_str->len = strlen((char *)o_str->data);
         o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
         // raise
-        mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str)};
+        #if 0
+        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));
+        #else
+        DBG("Exception from function '%s' at line %d in file '%s'", func, line, file)
+        mp_obj_t args[5] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str), mp_obj_new_str(func, strlen(func)), mp_obj_new_int(line), mp_obj_new_str(file, strlen(file)) };
+        nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 5, 0, args));
+        #endif
     }
 }
 
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
@@ -57,7 +57,8 @@ 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);
+#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);
 
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
