diff --git a/src/micropython b/src/micropython index 93c6af9c0..59b60d5fc 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 93c6af9c0a51d3623986d8ffc4ff51f82b614353 +Subproject commit 59b60d5fc60c4233e94f7f14f865c609e59ea34d diff --git a/src/omv/ports/mimxrt/main.c b/src/omv/ports/mimxrt/main.c index ce121c9b2..2b6ddc0d1 100644 --- a/src/omv/ports/mimxrt/main.c +++ b/src/omv/ports/mimxrt/main.c @@ -95,9 +95,6 @@ soft_reset: #endif // MICROPY_PY_BUZZER imlib_init_all(); readline_init0(); - #if MICROPY_HW_ENABLE_CAN - can_init0(); - #endif fb_alloc_init0(); framebuffer_init0(); sensor_init0(); @@ -105,9 +102,6 @@ soft_reset: #ifdef IMLIB_ENABLE_IMAGE_FILE_IO file_buffer_init0(); #endif - #if MICROPY_HW_ENABLE_SERVO - servo_init(); - #endif usbdbg_init(); machine_adc_init(); #if MICROPY_PY_MACHINE_SDCARD @@ -254,6 +248,9 @@ soft_reset: soft_reset_exit: mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n"); + #if MICROPY_PY_MACHINE_CAN + machine_can_irq_deinit(); + #endif machine_pin_irq_deinit(); machine_rtc_irq_deinit(); #if MICROPY_PY_LWIP diff --git a/src/omv/ports/mimxrt/omv_portconfig.mk b/src/omv/ports/mimxrt/omv_portconfig.mk index d028c6c3d..6f02debd1 100644 --- a/src/omv/ports/mimxrt/omv_portconfig.mk +++ b/src/omv/ports/mimxrt/omv_portconfig.mk @@ -242,6 +242,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\ machine_spi.o \ machine_uart.o \ machine_wdt.o \ + machine_can.o \ mbedtls/mbedtls_port.o \ mimxrt_flash.o \ mimxrt_sdram.o \