esp32 and unix are compiling properly

Author: kdschlosser

api_drivers/common_api_drivers/display/st7789/st7789.py

@@ -13,15 +13,15 @@
 BYTE_ORDER_RGB = display_driver_framework.BYTE_ORDER_RGB
 BYTE_ORDER_BGR = display_driver_framework.BYTE_ORDER_BGR
 
-_MADCTL_MV = const(0x20)  # 0=Normal, 1=Row/column exchange
-_MADCTL_MX = const(0x40)  # 0=Left to Right, 1=Right to Left
-_MADCTL_MY = const(0x80)  # 0=Top to Bottom, 1=Bottom to Top
+_MADCTL_MV = const(0x20)  # X, Y = Y, X
+_MADCTL_MX = const(0x40)  # Mirror X
+_MADCTL_MY = const(0x80)  # Mirror Y
 
 
 class ST7789(display_driver_framework.DisplayDriver):
     _ORIENTATION_TABLE = (
         0x0,
-        _MADCTL_MV | _MADCTL_MX,
-        _MADCTL_MY | _MADCTL_MX,
-        _MADCTL_MV | _MADCTL_MY
+        _MADCTL_MV,
+        _MADCTL_MX | _MADCTL_MY,
+        _MADCTL_MV | _MADCTL_MX | _MADCTL_MY
     )

api_drivers/py_api_drivers/frozen/display/display_driver_framework.py

@@ -46,10 +46,10 @@ class DisplayDriver:
     _INVOFF = 0x20
 
     _ORIENTATION_TABLE = (
-        _MADCTL_MX,
+        0x0,
         _MADCTL_MV,
-        _MADCTL_MY,
-        _MADCTL_MY | _MADCTL_MX | _MADCTL_MV
+        _MADCTL_MX | _MADCTL_MY,
+        _MADCTL_MV | _MADCTL_MX | _MADCTL_MY
     )
 
     _displays = []

builder/unix.py

@@ -396,7 +396,7 @@ def update_mpconfigvariant_common():
         '#define MICROPY_MEM_STATS              (0)'
     )
 
-    data += '\nn#define MICROPY_SCHEDULER_DEPTH              (128)\n'
+    data += '\n#define MICROPY_SCHEDULER_DEPTH              (128)\n'
     data += '\n#define MICROPY_STACK_CHECK              (0)\n'
 
     write_file(MPCONFIGVARIANT_COMMON_PATH, data)

ext_mod/lcd_bus/include/common/lcd_bus_utils.h

@@ -1,8 +1,12 @@
 #ifndef __LCD_BUS_UTILS_H__
     #define __LCD_BUS_UTILS_H__
 
+    #include "lcd_framebuf.h"
+    #include "lcd_common_types.h"
+    #include "lcd_types.h"
+
     mp_lcd_err_t mp_lcd_verify_frame_buffers(mp_lcd_framebuf_t *fb1, mp_lcd_framebuf_t *fb2);
     mp_lcd_err_t mp_lcd_allocate_rotation_buffers(mp_lcd_bus_obj_t *self);
-    void mp_lcd_free_rotation_buffers(mp_lcd_bus_obj_t self);
+    void mp_lcd_free_rotation_buffers(mp_lcd_bus_obj_t *self);
 
 #endif /* __LCD_BUS_UTILS_H__ */

ext_mod/lcd_bus/include/common/lcd_common_types.h

@@ -8,8 +8,20 @@
 #ifndef _COMMON_LCD_TYPES_H_
     #define _COMMON_LCD_TYPES_H_
 
+    typedef enum {
+        LCD_OK = 0,
+        LCD_FAIL = -1,
+        LCD_ERR_NO_MEM = 0x101,
+        LCD_ERR_INVALID_ARG = 0x102,
+        LCD_ERR_INVALID_STATE = 0x103,
+        LCD_ERR_INVALID_SIZE = 0x104,
+        LCD_ERR_NOT_SUPPORTED = 0x106
+    } mp_lcd_err_t;
+
     #include "lcd_framebuf.h"
     #include "lcd_types.h"
+    #include "sw_rotate_task_common.h"
+    #include "sw_rotate.h"
 
     #define LCD_UNUSED(x) ((void)x)
 
@@ -34,21 +46,9 @@
 
     typedef struct _lcd_panel_io_t lcd_panel_io_t;
 
-
-    typedef enum {
-        LCD_OK = 0,
-        LCD_FAIL = -1,
-        LCD_ERR_NO_MEM = 0x101,
-        LCD_ERR_INVALID_ARG = 0x102,
-        LCD_ERR_INVALID_STATE = 0x103,
-        LCD_ERR_INVALID_SIZE = 0x104,
-        LCD_ERR_NOT_SUPPORTED = 0x106
-    } mp_lcd_err_t;
-
-
     typedef struct _mp_lcd_bus_obj_t {
         mp_obj_base_t base;
-        lcd_panel_io_t panel_io_handle;
+        struct _lcd_panel_io_t panel_io_handle;
 
         mp_obj_t callback;
 
@@ -62,7 +62,4 @@
         mp_lcd_sw_rotation_t sw_rot;
     } mp_lcd_bus_obj_t;
 
-
-    void mp_lcd_flush_ready_cb(mp_obj_t cb);
-
 #endif /* _COMMON_LCD_TYPES_H_ */

ext_mod/lcd_bus/include/common/lcd_framebuf.h

@@ -17,8 +17,6 @@
     } mp_lcd_framebuf_t;
 
 
-
-
     extern const mp_obj_type_t mp_lcd_framebuf_type;
 
 #endif /* __LCD_FRAMEBUF_H__ */

ext_mod/lcd_bus/include/common/modlcd_bus.h

@@ -5,18 +5,7 @@
 #ifndef _MODLCD_BUS_H_
     #define _MODLCD_BUS_H_
 
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_init_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_get_lane_count_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_tx_param_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_tx_color_obj;
-    extern const mp_obj_fun_builtin_fixed_t mp_lcd_bus_deinit_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_rx_param_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_register_callback_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_free_framebuffer_obj;
-    extern const mp_obj_fun_builtin_var_t mp_lcd_bus_allocate_framebuffer_obj;
-
     extern const mp_obj_dict_t mp_lcd_bus_locals_dict;
-
     void mp_lcd_bus_shutdown(void);
 
 #endif /* _MODLCD_BUS_H_ */

ext_mod/lcd_bus/include/common/sw_rotate.h

@@ -1,6 +1,9 @@
 
 #include "sw_rotate_task_common.h"
 #include "sw_rotate_task.h"
+#include "lcd_common_types.h"
+
+#include "py/misc.h"
 
 
 #ifndef __SW_ROTATE_H__
@@ -12,6 +15,9 @@
     #define LCD_ROTATION_180  (2)
     #define LCD_ROTATION_270  (3)
 
+    #define LCD_MIN(v1, v2)   v1 <= v2 ? v1 : v2
+
+
     typedef struct _mp_lcd_sw_rotation_data_t {
         uint32_t x_start: 16;
         uint32_t y_start: 16;
@@ -59,11 +65,11 @@
         mp_lcd_sw_rotate_tx_param_t *params;
         uint8_t len;
         mp_lcd_lock_t lock;
-        mp_lcd_tx_param_cb_t tx_param_cb;
+        mp_lcd_tx_param_cb_t cb;
     } mp_lcd_sw_rotate_tx_params_t;
 
 
-    typedef bool (*mp_lcd_sw_rotation_init_cb_t)(void *self_in)
+    typedef bool (*mp_lcd_sw_rotation_init_cb_t)(void *self_in);
 
     typedef struct _mp_lcd_sw_rotation_init_t {
          mp_lcd_err_t err;
@@ -72,7 +78,7 @@
     } mp_lcd_sw_rotation_init_t;
 
 
-    typedef void (*mp_lcd_sw_rotate_flush_cb_t)(void *self_in, uint8_t last_update, uint8_t *idle_fb);
+    typedef void (*mp_lcd_sw_rotate_flush_cb_t)(void *self_in, int cmd, uint8_t last_update, uint8_t *idle_fb);
 
 
     typedef struct _mp_lcd_sw_rotation_t {
@@ -85,6 +91,6 @@
     } mp_lcd_sw_rotation_t;
 
 
-    static void mp_lcd_sw_rotation(void *dst, void *src, mp_lcd_sw_rotation_data_t *data);
+    void mp_lcd_sw_rotate(void *dst, void *src, mp_lcd_sw_rotation_data_t *copy_data);
 
 #endif /* __SW_ROTATE_H__ */

ext_mod/lcd_bus/include/common/sw_rotate_task_common.h

@@ -1,5 +1,8 @@
 #include "sw_rotate_task.h"
 
+#include "py/obj.h"
+
+
 #ifndef __SW_ROTATE_TASK_COMMON_H__
     #define __SW_ROTATE_TASK_COMMON_H__
 
@@ -26,6 +29,7 @@
 
 
     bool mp_lcd_start_rotate_task(void *self_in);
-    void mp_lcd_sw_rotate_task(void *self_in)
+    void mp_lcd_sw_rotate_task(void *self_in);
+    void mp_lcd_flush_ready_cb(mp_obj_t callback, bool wake);
 
 #endif /* __SW_ROTATE_TASK_COMMON_H__ */

ext_mod/lcd_bus/include/esp32/i2c_bus.h

@@ -11,10 +11,25 @@
     #include "driver/i2c.h"
 
     #include "common/lcd_common_types.h"
+    #include "common/sw_rotate_task_common.h"
+    #include "common/sw_rotate.h"
+    #include "lcd_types.h"
 
 
     struct _mp_lcd_i2c_bus_obj_t {
-        struct _mp_lcd_bus_obj_t;
+        mp_obj_base_t base;
+        lcd_panel_io_t panel_io_handle;
+
+        mp_obj_t callback;
+
+        mp_lcd_framebuf_t *fb1;
+        mp_lcd_framebuf_t *fb2;
+
+        uint8_t trans_done: 1;
+        uint8_t sw_rotate: 1;
+        uint8_t lanes: 5;
+
+        mp_lcd_sw_rotation_t sw_rot;
 
         esp_lcd_panel_io_i2c_config_t *panel_io_config;
         i2c_config_t *bus_config;