reverts changes made to RGB bus driver.

Author: kdschlosser

api_drivers/common_api_drivers/display/rgb_display.py

@@ -1,5 +1,4 @@
 import display_driver_framework
-import lvgl as lv
 
 STATE_HIGH = display_driver_framework.STATE_HIGH
 STATE_LOW = display_driver_framework.STATE_LOW
@@ -11,58 +10,6 @@
 
 class RGBDisplay(display_driver_framework.DisplayDriver):
 
-    def __init__(
-        self,
-        data_bus,
-        display_width,
-        display_height,
-        frame_buffer1=None,
-        frame_buffer2=None,
-        reset_pin=None,
-        reset_state=STATE_HIGH,
-        power_pin=None,
-        power_on_state=STATE_HIGH,
-        backlight_pin=None,
-        backlight_on_state=STATE_HIGH,
-        offset_x=0,
-        offset_y=0,
-        color_byte_order=BYTE_ORDER_RGB,
-        color_space=lv.COLOR_FORMAT.RGB888,
-        rgb565_byte_swap=False
-    ):
-
-        super().__init__(
-            data_bus=data_bus,
-            display_width=display_width,
-            display_height=display_height,
-            frame_buffer1=frame_buffer1,
-            frame_buffer2=frame_buffer2,
-            reset_pin=reset_pin,
-            reset_state=reset_state,
-            power_pin=power_pin,
-            power_on_state=power_on_state,
-            backlight_pin=backlight_pin,
-            backlight_on_state=backlight_on_state,
-            offset_x=offset_x,
-            offset_y=offset_y,
-            color_byte_order=color_byte_order,
-            color_space=color_space,
-            rgb565_byte_swap=rgb565_byte_swap
-        )
-
-        self.__flushing_fb_index = None
-
-    def _flush_ready_cb(self, buf_num):
-        if (
-            self.__flushing_fb_index is None or
-            buf_num != self.__flushing_fb_index
-        ):
-            self._disp_drv.flush_ready()
-            self.__flushing_fb_index = buf_num
-            return True
-
-        return False
-
     def _dummy_set_memory_location(self, *_, **__):
         return 0x00
 

ext_mod/lcd_bus/esp32_src/rgb_bus.c

@@ -53,7 +53,7 @@
         uint8_t bb_fb_index;  // Current frame buffer index which used by bounce buffer
     } rgb_panel_t;
 
-    bool callback_from_isr(mp_obj_t cb, uint8_t buf_num)
+    bool callback_from_isr(mp_obj_t cb)
     {
         volatile uint32_t sp = (uint32_t)esp_cpu_get_sp();
         bool ret = false;
@@ -74,11 +74,8 @@
 
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
-            mp_obj_t args[1] = { mp_obj_new_int_from_uint(buf_num) };
-            mp_obj_t ret_val = mp_call_function_n_kw(cb, 1, 0, &args[0]);
-            if ((ret_val != mp_const_none) && mp_obj_is_integer(ret_val) && (mp_obj_get_int_truncated(ret_val) == 1)) {
-                ret = true;
-            }
+            mp_call_function_n_kw(cb,0, 0, NULL);
+            ret = true;
             nlr_pop();
         } else {
             ets_printf("Uncaught exception in IRQ callback handler!\n");
@@ -89,12 +86,11 @@
         mp_sched_unlock();
 
         mp_thread_set_state(old_state);
-        // mp_hal_wake_main_task_from_isr();
+        mp_hal_wake_main_task_from_isr();
 
         return ret;
     }
 
-
     IRAM_ATTR static bool rgb_bus_trans_done_cb(esp_lcd_panel_handle_t panel, const esp_lcd_rgb_panel_event_data_t *edata, void *user_ctx)
     {
         LCD_UNUSED(edata);
@@ -104,7 +100,7 @@
         bool ret = false;
 
         if (self->callback != mp_const_none && mp_obj_is_callable(self->callback)) {
-            ret = callback_from_isr(self->callback, (uint8_t)rgb_panel->cur_fb_index);
+            ret = callback_from_isr(self->callback);
         }
         return ret;
     }