port/esp32: Applay TWAI CAN_v2.

IhorNehrutsa · IhorNehrutsa · commit 062ff1251f40 · 2025-10-07T12:25:01.000+03:00
Co-Authored-By: Sveinung Kval Bakken &lt;sveinung.bakken@gmail.com&gt;

Signed-off-by: Ihor Nehrutsa &lt;Ihor.Nehrutsa@gmail.com&gt;
diff --git a/docs/library/machine.CAN.rst b/docs/library/machine.CAN.rst
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
@@ -260,6 +260,7 @@ Classes
    machine.Signal.rst
    machine.ADC.rst
    machine.ADCBlock.rst
+   machine.CAN.rst
    machine.PWM.rst
    machine.UART.rst
    machine.SPI.rst
diff --git a/examples/esp32_can.py b/examples/esp32_can.py
@@ -51,8 +51,8 @@ def send_and_check(can_bus, name, id, expected_result=True, extended=False):
     extframe=True,
     mode=CAN.SILENT_LOOPBACK,
     baudrate=CAN.BAUDRATE_500k,
-    tx_io=18,
-    rx_io=19,
+    tx=18,
+    rx=19,
     auto_restart=False,
 )
 
diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
@@ -1 +1 @@
-Subproject commit 0f3bb6947c2f57233916dccd7bb425d7bf86e5a6
+Subproject commit 85373b548f1fb0119a463582570b44189dfb09ae
diff --git a/lib/libhydrogen b/lib/libhydrogen
@@ -1 +1 @@
-Subproject commit bbca575b62510bfdc6dd927a4bfa7df4a51cb846
+Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2
diff --git a/lib/lwip b/lib/lwip
@@ -1 +1 @@
-Subproject commit 77dcd25a72509eb83f72b033d219b1d40cd8eb95
+Subproject commit 0a0452b2c39bdd91e252aef045c115f88f6ca773
diff --git a/lib/micropython-lib b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 34c4ee1647ac4b177ae40adf0ec514660e433dc0
+Subproject commit e4cf09527bce7569f5db742cf6ae9db68d50c6a9
diff --git a/lib/nxp_driver b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit 91b04b34a59f6d81661cec6f84611afe6330ce92
+Subproject commit fa5a554c7944d2a196626f8d3631e44943f9abcc
diff --git a/lib/pico-sdk b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 9a4113fbbae65ee82d8cd6537963bc3d3b14bcca
+Subproject commit bddd20f928ce76142793bef434d4f75f4af6e433
diff --git a/lib/stm32lib b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 8b2bb4ef44fbfab5075ed9d09e83ddc3754b9257
+Subproject commit 928df866e4d287ebc3c60726151513ebee609128
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
@@ -112,6 +112,7 @@ list(APPEND MICROPY_SOURCE_PORT
     fatfs_port.c
     help.c
     machine_bitstream.c
+    machine_can.c
     machine_timer.c
     machine_pin.c
     machine_touchpad.c
diff --git a/ports/esp32/machine_can.c b/ports/esp32/machine_can.c
diff --git a/ports/esp32/machine_can.h b/ports/esp32/machine_can.h
@@ -23,36 +23,87 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_ESP32_CAN_H
-#define MICROPY_INCLUDED_ESP32_CAN_H
+#ifndef MICROPY_INCLUDED_ESP32_MACHINE_CAN_H
+#define MICROPY_INCLUDED_ESP32_MACHINE_CAN_H
 
-#include "modmachine.h"
-#include "freertos/task.h"
+#if MICROPY_PY_MACHINE_CAN
 
-#include "py/obj.h"
+#define CAN_MODE_SILENT_LOOPBACK (0x10)
 
-#if MICROPY_HW_ENABLE_CAN
+typedef enum {
+    MODE_NORMAL = TWAI_MODE_NORMAL,
+    MODE_SLEEP = -1,
+    MODE_LOOPBACK = -2, // TWAI_MODE_NORMAL | CAN_MODE_SILENT_LOOPBACK,
+    MODE_SILENT = TWAI_MODE_NO_ACK,
+    MODE_SILENT_LOOPBACK = -3,
+    MODE_LISTEN_ONLY = TWAI_MODE_LISTEN_ONLY, // esp32 specific
+} can_mode_t;
 
-#define DEVICE_NAME "CAN"
-
-typedef enum _filter_mode_t {
-    FILTER_RAW_SINGLE = 0,
+typedef enum {
+    FILTER_RAW_SINGLE = 1,
     FILTER_RAW_DUAL,
     FILTER_ADDRESS
 } filter_mode_t;
 
-typedef struct _esp32_can_config_t {
+typedef enum {
+    RX_STATE_FIFO_EMPTY = 1,
+    RX_STATE_MESSAGE_PENDING,
+    RX_STATE_FIFO_FULL,
+    RX_STATE_FIFO_OVERFLOW,
+} rx_state_t;
+
+typedef enum {
+    NOT_INITIATED = TWAI_STATE_STOPPED - 1,
+    STOPPED = TWAI_STATE_STOPPED,
+    RUNNING = TWAI_STATE_RUNNING,
+    BUS_OFF = TWAI_STATE_BUS_OFF,
+    RECOVERING = TWAI_STATE_RECOVERING,
+} state_t;
+
+typedef enum {
+    ERROR = -1,
+    /*
+    ERROR_ACTIVE = TWAI_ERROR_ACTIVE,
+    ERROR_WARNING = TWAI_ERROR_WARNING,
+    ERROR_PASSIVE = TWAI_ERROR_PASSIVE,
+    ERROR_BUS_OFF = TWAI_ERROR_BUS_OFF,
+    */
+} error_state_t;
+
+
+typedef enum {
+    RTR = 1,
+    EXTENDED_ID,
+    FD_F,
+    BRS,
+} message_flags_t;
+
+typedef enum {
+    CRC = 1,
+    FORM,
+    OVERRUN,
+    ESI,
+} recv_errors_t;
+
+typedef enum {
+    ARB = 1,
+    NACK,
+    ERR,
+} send_errors_t;
+
+typedef struct {
     twai_timing_config_t timing;
     twai_filter_config_t filter;
     twai_general_config_t general;
-    uint32_t baudrate; // bit/s
+    uint32_t bitrate; // bit/s
     bool initialized;
 } esp32_can_config_t;
 
-typedef struct _esp32_can_obj_t {
+typedef struct {
     mp_obj_base_t base;
     esp32_can_config_t *config;
-    mp_obj_t rxcallback;
+    mp_obj_t rx_callback;
+    mp_obj_t tx_callback;
     TaskHandle_t irq_handler;
     byte rx_state;
     bool extframe : 1;
@@ -62,17 +113,12 @@ typedef struct _esp32_can_obj_t {
     uint16_t num_error_warning; // FIXME: populate this value somewhere
     uint16_t num_error_passive;
     uint16_t num_bus_off;
+    twai_handle_t handle;
+    twai_status_info_t status;
 } esp32_can_obj_t;
 
-typedef enum _rx_state_t {
-    RX_STATE_FIFO_EMPTY = 0,
-    RX_STATE_MESSAGE_PENDING,
-    RX_STATE_FIFO_FULL,
-    RX_STATE_FIFO_OVERFLOW,
-} rx_state_t;
-
 extern const mp_obj_type_t machine_can_type;
 
-#endif // MICROPY_HW_ENABLE_CAN
+#endif // MICROPY_PY_MACHINE_CAN
 
-#endif // MICROPY_INCLUDED_ESP32_CAN_H
+#endif // MICROPY_INCLUDED_ESP32_MACHINE_CAN_H
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
@@ -35,6 +35,7 @@
 #include "esp_mac.h"
 #include "esp_sleep.h"
 #include "esp_pm.h"
+#include "soc/soc_caps.h"
 
 #include "modmachine.h"
 #include "machine_rtc.h"
@@ -51,13 +52,20 @@
 #define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY
 #endif
 
+#if SOC_TWAI_SUPPORTED
+#define MICROPY_PY_MACHINE_CAN_ENTRY { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&machine_can_type) },
+#else
+#define MICROPY_PY_MACHINE_CAN_ENTRY
+#endif
+
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_obj) }, \
     \
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) }, \
     MICROPY_PY_MACHINE_SDCARD_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, \
     MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY \
+    MICROPY_PY_MACHINE_CAN_ENTRY \
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) }, \
     \
     /* wake abilities */ \
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
@@ -1,6 +1,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODMACHINE_H
 #define MICROPY_INCLUDED_ESP32_MODMACHINE_H
 
+#include "soc/soc_caps.h"
 #include "py/obj.h"
 
 typedef enum {
@@ -12,6 +13,9 @@ typedef enum {
 extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_sdcard_type;
+#if SOC_TWAI_SUPPORTED
+extern const mp_obj_type_t machine_can_type;
+#endif
 
 void machine_init(void);
 void machine_deinit(void);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -158,6 +158,7 @@
 #define MICROPY_PY_MACHINE_UART_INCLUDEFILE "ports/esp32/machine_uart.c"
 #define MICROPY_PY_MACHINE_UART_SENDBREAK   (1)
 #define MICROPY_PY_MACHINE_UART_IRQ         (1)
+#define MICROPY_PY_MACHINE_CAN              (1)
 #define MICROPY_PY_MACHINE_WDT              (1)
 #define MICROPY_PY_MACHINE_WDT_INCLUDEFILE  "ports/esp32/machine_wdt.c"
 #define MICROPY_PY_NETWORK (1)
