mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: Use mp_printf with MICROPY_ERROR_PRINTER for uncaught exceptions.

Browse Source
This commit is contained in:
Damien George 2019-09-23 17:15:07 +10:00
parent 4f78ba3cf4
commit ca8ff99e8c
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm32/extint.c
View File

@ -672,7 +672,7 @@ void Handle_EXTI_Irq(uint32_t line) {
// Uncaught exception; disable the callback so it doesn't run again.
*cb = mp_const_none;
extint_disable(line);
printf("Uncaught exception in ExtInt interrupt handler line %u\n", (unsigned int)line);
mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in ExtInt interrupt handler line %u\n", (unsigned int)line);
mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
}
gc_unlock();

3
ports/stm32/pyb_can.c
View File

@ -24,7 +24,6 @@
* THE SOFTWARE.
*/
#include <stdio.h>
#include <string.h>
#include "py/objarray.h"
@ -875,7 +874,7 @@ void pyb_can_handle_callback(pyb_can_obj_t *self, uint fifo_id, mp_obj_t callbac
} else {
// Uncaught exception; disable the callback so it doesn't run again.
pyb_can_rxcallback(MP_OBJ_FROM_PTR(self), MP_OBJ_NEW_SMALL_INT(fifo_id), mp_const_none);
printf("uncaught exception in CAN(%u) rx interrupt handler\n", self->can_id);
mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in CAN(%u) rx interrupt handler\n", self->can_id);
mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
}
gc_unlock();

7
ports/stm32/timer.c
View File

@ -25,7 +25,6 @@
*/
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include "py/runtime.h"
@ -1548,9 +1547,9 @@ STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_o
tim->callback = mp_const_none;
__HAL_TIM_DISABLE_IT(&tim->tim, irq_mask);
if (channel == 0) {
printf("uncaught exception in Timer(%u) interrupt handler\n", tim->tim_id);
mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in Timer(%u) interrupt handler\n", tim->tim_id);
} else {
printf("uncaught exception in Timer(%u) channel %u interrupt handler\n", tim->tim_id, channel);
mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in Timer(%u) channel %u interrupt handler\n", tim->tim_id, channel);
}
mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
}
@ -1591,7 +1590,7 @@ void timer_irq_handler(uint tim_id) {
if (unhandled != 0) {
__HAL_TIM_DISABLE_IT(&tim->tim, unhandled);
__HAL_TIM_CLEAR_IT(&tim->tim, unhandled);
printf("Unhandled interrupt SR=0x%02x (now disabled)\n", (unsigned int)unhandled);
mp_printf(MICROPY_ERROR_PRINTER, "unhandled interrupt SR=0x%02x (now disabled)\n", (unsigned int)unhandled);
}
}
}