moved around the init lock...

Author: kdschlosser

ext_mod/lcd_bus/src/common/modlcd_bus.c

@@ -118,9 +118,7 @@ static mp_obj_t mp_lcd_bus_init(size_t n_args, const mp_obj_t *pos_args, mp_map_
     mp_lcd_lock_init(&self->sw_rot.handles.tx_color_lock);
     mp_lcd_event_init(&self->sw_rot.handles.copy_task_exit);
     mp_lcd_event_init(&self->sw_rot.handles.swap_bufs);
-    mp_lcd_event_set(&self->sw_rot.handles.swap_bufs);
     mp_lcd_lock_init(&self->sw_rot.handles.init_lock);
-    mp_lcd_lock_acquire(&self->sw_rot.handles.init_lock);
     mp_lcd_lock_init(&self->sw_rot.tx_params.lock);
 
     ret = self->panel_io_handle.init(

ext_mod/lcd_bus/src/common/sw_rotate.c

@@ -421,6 +421,8 @@ void rotate_16bpp_swap(uint16_t *src, uint16_t *dst, mp_lcd_sw_rotation_data_t *
             dst_height -= 1;
 
             for (uint32_t y = y_start; y < y_end; y++) {
+                src_line_bytes = (y * src_bytes_per_line) - offset;
+
                 for (uint32_t x = x_start; x < x_end; x++) {
                     i = src_line_bytes + x;
                     j = ((dst_height - x) * dst_width) + y;

ext_mod/lcd_bus/src/common/sw_rotate_task_common.c

@@ -38,6 +38,7 @@ void mp_lcd_sw_rotate_task(void *self_in)
     int cmd;
 
     mp_lcd_lock_acquire(&handles->copy_lock);
+    mp_lcd_event_set(&self->sw_rot.handles.swap_bufs);
 
     init->err = LCD_OK;
     mp_lcd_lock_release(&handles->init_lock);

ext_mod/lcd_bus/src/esp32/spi_bus.c

@@ -300,14 +300,6 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint8_t cmd_bits, uint8_t param_bits)
     self->sw_rot.flush_cb = &spi_flush_cb;
     self->sw_rot.tx_params.cb = &spi_tx_param_cb;
 
-    mp_lcd_lock_init(&self->sw_rot.handles.copy_lock);
-    mp_lcd_lock_init(&self->sw_rot.handles.tx_color_lock);
-    mp_lcd_event_init(&self->sw_rot.handles.copy_task_exit);
-    mp_lcd_event_init(&self->sw_rot.handles.swap_bufs);
-    mp_lcd_event_set(&self->sw_rot.handles.swap_bufs);
-    mp_lcd_lock_init(&self->sw_rot.handles.init_lock);
-    mp_lcd_lock_acquire(&self->sw_rot.handles.init_lock);
-    mp_lcd_lock_init(&self->sw_rot.tx_params.lock);
     self->sw_rot.tx_params.len = 0;
 
     mp_machine_hw_spi_bus_add_device(&self->spi_device);

ext_mod/lcd_bus/src/esp32/sw_rotate_task.c

@@ -117,13 +117,14 @@ bool mp_lcd_start_rotate_task(void *self_in)
 {
     mp_lcd_bus_obj_t *self = (mp_lcd_bus_obj_t *)self_in;
 
+    mp_lcd_lock_acquire(&self->sw_rot.handles.init_lock);
+
     xTaskCreatePinnedToCore(
                 mp_lcd_sw_rotate_task, "rotate_task", LCD_DEFAULT_STACK_SIZE / sizeof(StackType_t),
                 self, ESP_TASK_PRIO_MAX - 1, &self->sw_rot.handles.task_handle, 0);
 
     mp_lcd_lock_acquire(&self->sw_rot.handles.init_lock);
     mp_lcd_lock_release(&self->sw_rot.handles.init_lock);
-    mp_lcd_lock_delete(&self->sw_rot.handles.init_lock);
 
     if (self->sw_rot.init.err != LCD_OK) {
         mp_raise_msg_varg(&mp_type_OSError, self->sw_rot.init.err_msg, self->sw_rot.init.err);

ext_mod/lcd_bus/src/posix/sw_rotate_task.c

@@ -182,7 +182,6 @@ bool mp_lcd_start_rotate_task(void *self_in)
 
     mp_lcd_lock_acquire(&self->sw_rot.handles.init_lock);
     mp_lcd_lock_release(&self->sw_rot.handles.init_lock);
-    mp_lcd_lock_delete(&self->sw_rot.handles.init_lock);
 
     if (self->sw_rot.init.err != LCD_OK) {
         mp_raise_msg_varg(&mp_type_OSError, self->sw_rot.init.err_msg, self->sw_rot.init.err);