intermediate commit

Author: hemonu

ext_mod/lcd_bus/common_include/spi_bus.h

@@ -64,6 +64,12 @@
             void *buf1;
             void *buf2;
 
+            /* buffer_flags is not used, but it needs to be here
+            *  otherwise function pointers are no more aligned 
+            *  with the pointer use in _mp_lcd_bus_obj_t
+            */
+            uint32_t buffer_flags;
+
             bool trans_done;
             bool rgb565_byte_swap;
 

ext_mod/lcd_bus/common_src/i80_bus.c

@@ -10,6 +10,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/objarray.h"
+#include "mphalport.h" // for mp_hal_pin_output
 
 //#include "mpconfigport.h"
 //#include "modmachine.h"

ext_mod/lcd_bus/common_src/spi_bus.c

@@ -5,7 +5,8 @@
 // local includes
 #include "lcd_types.h"
 #include "modlcd_bus.h"
-#include "spi_bus.h"
+// compiler doesn't find spi_bus.h without ../common_include/ ??
+#include "../common_include/spi_bus.h"
 #include "../../../micropy_updates/common/mp_spi_common.h"
 
 // micropython includes
@@ -14,6 +15,7 @@
 // #else
 #include "py/obj.h"
 #include "py/runtime.h"
+#include "extmod/modmachine.h" // for mp_machine_p_t
 
 // stdlib includes
 #include <string.h>
@@ -189,23 +191,26 @@
 
         mp_lcd_spi_bus_obj_t *self = MP_OBJ_TO_PTR(obj);
 
-        uint8_t bits;
+        // uint8_t bits; no more used
 
         if (cmd_bits == 16) {
             self->send_cmd = send_cmd_16;
-            bits = 16;
+            // bits = 16;
         } else {
             self->send_cmd = send_cmd_8;
-            bits = 8;
+            // bits = 8;
         }
 
         if (param_bits == 16) {
             self->send_param = send_param_16;
-            bits = 16;
+            // bits = 16;
         } else {
             self->send_param = send_param_8;
         }
 
+        /* constructor above takes a machine_hw_spi_device as argument
+           so we should not create another one
+        
         mp_obj_base_t *spi;
         mp_obj_t spi_args[12];
 
@@ -228,6 +233,10 @@
 
         self->bus_handle = spi;
         self->panel_io_config.spi_transfer = ((mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(spi->type, protocol))->transfer;
+        */
+
+        // we take the transfer pointer from the bus inside the existing device
+        self->panel_io_config.spi_transfer = ((mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, protocol))->transfer;
 
         return LCD_OK;
     }

micropy_updates/common/mp_spi_common.h

@@ -14,55 +14,88 @@
         MP_SPI_STATE_SENDING
     } mp_machine_hw_spi_state_t;
 
-    typedef struct _mp_machine_hw_spi_bus_obj_t mp_machine_hw_spi_bus_obj_t;
-    typedef struct _mp_machine_hw_spi_device_obj_t mp_machine_hw_spi_device_obj_t;
-
-    struct _mp_machine_hw_spi_bus_obj_t {
-        mp_obj_base_t base;
-        uint8_t host;
-        mp_obj_t sck;
-        mp_obj_t data0;
-        mp_obj_t data1;
-        mp_obj_t data2;
-        mp_obj_t data3;
-        mp_obj_t data4;
-        mp_obj_t data5;
-        mp_obj_t data6;
-        mp_obj_t data7;
-        bool dual;
-        bool quad;
-        bool octal;
-        uint8_t device_count;
-        mp_machine_hw_spi_device_obj_t **devices;
-        mp_machine_hw_spi_state_t state;
-        const void *user_data;
-        void (*deinit)(mp_machine_hw_spi_bus_obj_t *bus);
-    };
-
-    struct _mp_machine_hw_spi_device_obj_t {
-        mp_obj_base_t base;
-        uint32_t freq;
-        uint8_t polarity;
-        uint8_t phase;
-        uint8_t bits;
-        uint8_t firstbit;
-        bool dual;
-        bool quad;
-        bool octal;
-        bool active;
-        mp_obj_t cs;
-        mp_machine_hw_spi_bus_obj_t *spi_bus;
-        void *user_data;
-        void (*deinit)(mp_machine_hw_spi_device_obj_t *device);
-    };
-
-    void mp_machine_hw_spi_bus_initilize(mp_machine_hw_spi_bus_obj_t *bus);
-    void mp_machine_hw_spi_bus_add_device(mp_machine_hw_spi_device_obj_t *device);
-    void mp_machine_hw_spi_bus_remove_device(mp_machine_hw_spi_device_obj_t *device);
-
-    extern const mp_obj_type_t mp_machine_hw_spi_device_type;
-    extern const mp_obj_type_t mp_machine_hw_spi_bus_type;
-
-    void mp_machine_hw_spi_bus_deinit_all(void);
+    #ifdef ESP_IDF_VERSION
+        typedef struct _mp_machine_hw_spi_bus_obj_t mp_machine_hw_spi_bus_obj_t;
+        typedef struct _mp_machine_hw_spi_device_obj_t mp_machine_hw_spi_device_obj_t;
 
+        struct _mp_machine_hw_spi_bus_obj_t {
+            mp_obj_base_t base;
+            uint8_t host;
+            mp_obj_t sck;
+            mp_obj_t data0;
+            mp_obj_t data1;
+            mp_obj_t data2;
+            mp_obj_t data3;
+            mp_obj_t data4;
+            mp_obj_t data5;
+            mp_obj_t data6;
+            mp_obj_t data7;
+            bool dual;
+            bool quad;
+            bool octal;
+            uint8_t device_count;
+            mp_machine_hw_spi_device_obj_t **devices;
+            mp_machine_hw_spi_state_t state;
+            const void *user_data;
+            void (*deinit)(mp_machine_hw_spi_bus_obj_t *bus);
+        };
+
+        struct _mp_machine_hw_spi_device_obj_t {
+            mp_obj_base_t base;
+            uint32_t freq;
+            uint8_t polarity;
+            uint8_t phase;
+            uint8_t bits;
+            uint8_t firstbit;
+            bool dual;
+            bool quad;
+            bool octal;
+            bool active;
+            mp_obj_t cs;
+            mp_machine_hw_spi_bus_obj_t *spi_bus;
+            void *user_data;
+            void (*deinit)(mp_machine_hw_spi_device_obj_t *device);
+        };
+
+        void mp_machine_hw_spi_bus_initilize(mp_machine_hw_spi_bus_obj_t *bus);
+        void mp_machine_hw_spi_bus_add_device(mp_machine_hw_spi_device_obj_t *device);
+        void mp_machine_hw_spi_bus_remove_device(mp_machine_hw_spi_device_obj_t *device);
+
+        extern const mp_obj_type_t mp_machine_hw_spi_device_type;
+        extern const mp_obj_type_t mp_machine_hw_spi_bus_type;
+
+        void mp_machine_hw_spi_bus_deinit_all(void);
+
+    #else
+        // definitions in line with use in micropy_updates/machine_spi.c
+        // 
+        typedef struct _mp_machine_hw_spi_bus_obj_t {
+            uint8_t host;
+            mp_obj_t sck;
+            mp_obj_t mosi;
+            mp_obj_t miso;
+            int16_t active_devices;
+            mp_machine_hw_spi_state_t state;
+            const void *user_data;
+        } mp_machine_hw_spi_bus_obj_t;
+
+
+        typedef struct _machine_hw_spi_obj_t {
+            mp_obj_base_t base;
+            uint32_t baudrate;
+            uint8_t polarity;
+            uint8_t phase;
+            uint8_t bits;
+            uint8_t firstbit;
+            bool active; // added as requested in machine_spi_make_new
+            mp_obj_t cs;
+            mp_machine_hw_spi_bus_obj_t *spi_bus;
+            void *user_data;
+        } machine_hw_spi_obj_t;
+
+        // typedef added to align naming in spi_bus with naming in machine_spi
+        typedef struct _machine_hw_spi_obj_t machine_hw_spi_device_obj_t;
+
+
+    #endif /* ESP_IDF_VERSION*/
 #endif /* __MP_SPI_COMMON_H__ */

micropy_updates/rp2/machine_spi.c

@@ -111,7 +111,7 @@ mp_machine_hw_spi_bus_obj_t rp2_machine_spi_bus_obj[] = {
         .miso = MP_OBJ_NULL,
         .active_devices = 0,
         .state = 0,
-        .user_data = (const void *)spi0
+        .user_data = (void *)spi0
     },
     {
         .host = 1,
@@ -120,7 +120,7 @@ mp_machine_hw_spi_bus_obj_t rp2_machine_spi_bus_obj[] = {
         .miso = MP_OBJ_NULL,
         .active_devices = 0,
         .state = 0,
-        .user_data = (const void *)spi1
+        .user_data = (void *)spi1
     }
 };