working on display and input drivers

Author: kdschlosser

driver/display/ili9341.py

@@ -2,7 +2,6 @@
 from micropython import const # NOQA
 
 import lvgl as lv # NOQA
-import lcd_bus # NOQA
 import display_driver_framework
 
 

driver/display/sdl_display.py

@@ -1,24 +1,104 @@
 import lvgl as lv # NOQA
 import display_driver_framework
-
-
+from micropython import const
+
+# Window has been shown
+_SDL_WINDOWEVENT_SHOWN = const(1)
+# Window has been hidden
+_SDL_WINDOWEVENT_HIDDEN = const(2)
+# Window has been exposed and should be redrawn
+_SDL_WINDOWEVENT_EXPOSED = const(3)
+# Window has been moved to data1, data2
+_SDL_WINDOWEVENT_MOVED = const(4)
+# Window has been resized to data1xdata2
+_SDL_WINDOWEVENT_RESIZED = const(5)
+# The window size has changed, either as
+# a result of an API call or through the
+# system or user changing the window size.
+_SDL_WINDOWEVENT_SIZE_CHANGED = const(6)
+# Window has been minimized
+_SDL_WINDOWEVENT_MINIMIZED = const(7)
+# Window has been maximized
+_SDL_WINDOWEVENT_MAXIMIZED = const(8)
+# Window has been restored to normal size and position
+_SDL_WINDOWEVENT_RESTORED = const(9)
+# Window has gained mouse focus
+_SDL_WINDOWEVENT_ENTER = const(10)
+# Window has lost mouse focus
+_SDL_WINDOWEVENT_LEAVE = const(11)
+# Window has gained keyboard focus
+_SDL_WINDOWEVENT_FOCUS_GAINED = const(12)
+# Window has lost keyboard focus
+_SDL_WINDOWEVENT_FOCUS_LOST = const(13)
+# The window manager requests that the window be closed
+_SDL_WINDOWEVENT_CLOSE = const(14)
+# Window is being offered a focus (should SetWindowInputFocus()
+# on itself or a subwindow, or ignore)
+_SDL_WINDOWEVENT_TAKE_FOCUS = const(15)
+# Window has been moved to display data1.
+_SDL_WINDOWEVENT_DISPLAY_CHANGED = const(16)
+
+_SDL_PIXELFORMAT_RGB888 = const(0x16161804)
+_SDL_PIXELFORMAT_BGR24 = const(0x17401803)
+_SDL_PIXELFORMAT_RGB565 = const(0x15151002)
+
+
+
+'''
+SDL_WINDOWEVENT = 0x200
+
+SDL_KEYDOWN = 0x300
+SDL_KEYUP = 0x301
+
+
+SDL_MOUSEMOTION = 0x400
+SDL_MOUSEBUTTONDOWN = 0x401
+SDL_MOUSEBUTTONUP = 0x402
+SDL_MOUSEWHEEL = 0x403
+
+
+SDL_JOYAXISMOTION = 0x600
+SDL_JOYBALLMOTION = 0x601
+SDL_JOYHATMOTION = 0x602
+SDL_JOYBUTTONDOWN = 0x603
+SDL_JOYBUTTONUP = 0x604
+ 
+
+ 
+
+ 
+ 
+SDL_RELEASED = 0
+SDL_PRESSED = 1
+
+'''
 class SDL(display_driver_framework.DisplayDriver):
 
  def __init__(
  self,
- display_width=480,
- display_height=320,
+ data_bus,
+ display_width,
+ display_height,
+ frame_buffer1=None,
+ frame_buffer2=None,
+ reset_pin=None,
+ reset_state=display_driver_framework.STATE_HIGH,
+ power_pin=None,
+ power_on_state=display_driver_framework.STATE_HIGH,
+ backlight_pin=None,
+ backlight_on_state=display_driver_framework.STATE_HIGH,
  offset_x=0,
  offset_y=0,
+ color_byte_order=display_driver_framework.BYTE_ORDER_RGB,
  color_space=lv.COLOR_FORMAT.RGB888,
+ rgb565_byte_swap=False
  ):
-
  super().__init__(
  data_bus=None,
  display_width=display_width,
  display_height=display_height,
- frame_buffer1=None,
- frame_buffer2=None,
+ frame_buffer1=frame_buffer1,
+ frame_buffer2=frame_buffer2,
  reset_pin=None,
  reset_state=display_driver_framework.STATE_HIGH,
  power_pin=None,
@@ -32,6 +112,8 @@ def __init__(
  rgb565_byte_swap=False
  )
 
+ self._data_bus = data_bus
+
  try:
  import task_handler # NOQA
 
@@ -40,29 +122,94 @@ def __init__(
  except ImportError:
  self._task_handler = None
 
- self._disp_drv = lv.sdl_window_create(self.display_width, self.display_height)
+ buffer_size = lv.color_format_get_size(color_space)
+ buffer_size *= display_width * display_height
+
+ if frame_buffer1 is None:
+ frame_buffer1 = data_bus.allocate_framebuffer(buffer_size, 0)
+ if frame_buffer2 is None:
+ frame_buffer2 = data_bus.allocate_framebuffer(buffer_size, 0)
 
- buf_size = display_width * display_height
- buf_size *= lv.color_format_get_size(
- self._disp_drv.get_color_format()
+ self._frame_buffer1 = frame_buffer1
+ self._frame_buffer2 = frame_buffer2
+
+ self._disp_drv = lv.display_create(display_width, display_height)
+
+ self._disp_drv.set_color_format(color_space)
+ self._disp_drv.set_driver_data(self)
+
+ data_bus.init(
+ display_width,
+ display_height,
+ lv.color_format_get_size(color_space) * 8,
+ buffer_size,
+ False
  )
 
- buf1 = self._disp_drv.buf_1
- buf2 = self._disp_drv.buf_2
+ self._disp_drv.set_flush_cb(self._flush_cb)
 
- if buf1.data_size > 0:
- buf1 = buf1.data.__dereference__(buf_size)
- else:
- buf1 = None
- if buf2.data_size > 0:
- buf2 = buf2.data.__dereference__(buf_size)
+ self._disp_drv.set_buffers(
+ frame_buffer1,
+ frame_buffer2,
+ len(frame_buffer1),
+ lv.DISPLAY_RENDER_MODE.DIRECT
+ )
+
+ self._ignore_size_chg = False
+
+ data_bus.register_callback(self._flush_ready_cb)
+
+ self._data_bus.register_window_callback(self._windows_event_cb)
+ self._disp_drv.add_event_cb(self._res_chg_event_cb, lv.EVENT.RESOLUTION_CHANGED, None)
+ self._disp_drv.add_event_cb(self._release_disp_cb, lv.EVENT.DELETE)
+
+ def _res_chg_event_cb(self, e):
+ bpp = lv.color_format_get_size(self._disp_drv.get_color_format()) * 8
+ disp = e.get.current_target()
+
+ hor_res = disp.get_horizontal_resolution()
+ ver_res = disp.get_vertical_resolution()
+
+ if bpp == 32:
+ px_format = _SDL_PIXELFORMAT_RGB888
+ elif bpp == 24:
+ px_format = _SDL_PIXELFORMAT_BGR24
+ elif bpp == 16:
+ px_format = _SDL_PIXELFORMAT_RGB565
  else:
- buf2 = None
+ return
+
+ buf_size = int(hor_res * ver_res * bpp / 8)
 
- self._frame_buffer1 = buf1
- self._frame_buffer2 = buf2
+ self._frame_buffer1 = self._data_bus.realloc_buffer(buf_size, 1)
+ self._frame_buffer2 = self._data_bus.realloc_buffer(buf_size, 2)
+
+ disp.set_buffers(
+ self._frame_buffer1,
+ self._frame_buffer2,
+ len(self._frame_buffer1),
+ lv.DISPLAY_RENDER_MODE.DIRECT
+ )
 
- self._disp_drv.set_offset(self._offset_x, self._offset_y)
+ self._data_bus.set_window_size(hor_res, ver_res, px_format, self._ignore_size_chg)
+
+ def _windows_event_cb(self, kwargs):
+ event = kwargs['event']
+
+ if event == _SDL_WINDOWEVENT_RESIZED:
+ width = kwargs['data1']
+ height = kwargs['data2']
+ self._ignore_size_chg = True
+ self._disp_drv.set_resolution(width, height)
+ self._ignore_size_chg = False
+ lv.refr_now(self._disp_drv)
+ elif event in (_SDL_WINDOWEVENT_TAKE_FOCUS, _SDL_WINDOWEVENT_EXPOSED):
+ lv.refr_now(self._disp_drv)
+ elif event == _SDL_WINDOWEVENT_CLOSE:
+ self._disp_drv.delete()
+
+ def _release_disp_cb(self, _):
+ self._data_bus.deinit()
 
  def set_offset(self, x, y):
  rot90 = lv.DISPLAY_ROTATION._90 # NOQA

driver/frozen/indev/button_framework.py

@@ -3,8 +3,6 @@
 
 lv_indev_get_driver_data
 lv_indev_get_user_data
-
-
 lv_indev_
 
 

driver/frozen/indev/keypad_framework.py

@@ -2,13 +2,7 @@
 
 
 class KeypadDriver:
- _instance_counter = 1
-
- def __init__(self, touch_cal=None): # NOQA
- self.__class__._instance_counter += 1
- self.id = self.__class__._instance_counter
- self._cursors = []
-
+ def __init__(self): # NOQA
  if not lv.is_initialized():
  lv.init()
 
@@ -34,14 +28,14 @@ def __init__(self, touch_cal=None): # NOQA
 
  def _get_key(self):
  # this method needs to be overridden.
- # the returned value from this method is going to be a keycode
+ # the returned value from this method is going to be (state, keycode)
  # or None if no key event has occured
  raise NotImplementedError
 
  def _read(self, drv, data): # NOQA
  key = self._get_key()
 
- if key is None: # ignore no touch & multi touch
+ if key is None: # ignore no key
  if self._current_state != lv.INDEV_STATE.RELEASED:
  self._current_state = lv.INDEV_STATE.RELEASED
  res = True
@@ -53,14 +47,23 @@ def _read(self, drv, data): # NOQA
  data.continue_reading = False
  return res
 
+ state, key = key
+
  self._last_key = key
- self._current_state = data.state = lv.INDEV_STATE.PRESSED
+
+ if self._current_state == state == lv.INDEV_STATE.RELEASED:
+ res = False
+ data.continue_reading = False
+ else:
+ res = True
+ data.continue_reading = True
+
+ self._current_state = state
 
  data.key = self._last_key
  data.state = self._current_state
- data.continue_reading = True
 
- return True
+ return res
 
  def get_type(self):
  return self._indev_drv.get_type()

driver/frozen/indev/pointer_framework.py

@@ -8,6 +8,9 @@ def _remap(value, old_min, old_max, new_min, new_max):
 class PointerDriver:
  _instance_counter = 1
 
+ PRESSED = lv.INDEV_STATE.PRESSED
+ RELEASED = lv.INDEV_STATE.RELEASED
+
  def get_width(self):
  return self._width
 
@@ -39,7 +42,7 @@ def __init__(self, touch_cal=None): # NOQA
 
  self._last_x = -1
  self._last_y = -1
- self._current_state = lv.INDEV_STATE.RELEASED
+ self._current_state = self.RELEASED
 
  self._height = height
  self._width = width
@@ -76,16 +79,16 @@ def is_calibrated(self):
 
  def _get_coords(self):
  # this method needs to be overridden.
- # the returned value from this method is going to be a tuple of state, x, y
- # or None if no touch even has occured
+ # the returned value from this method is going to be a tuple
+ # of (state, x, y) or None if no touch even has occured
  raise NotImplementedError
 
  def _read(self, drv, data): # NOQA
  coords = self._get_coords()
 
  if coords is None: # ignore no touch & multi touch
- if self._current_state != lv.INDEV_STATE.RELEASED:
- self._current_state = lv.INDEV_STATE.RELEASED
+ if self._current_state != self.RELEASED:
+ self._current_state = self.RELEASED
  res = True
  else:
  res = False
@@ -100,7 +103,6 @@ def _read(self, drv, data): # NOQA
  state, x, y = coords
 
  if None not in (x, y):
-
  config = self._config
  orientation = self.get_rotation()
  left = config.left
@@ -136,19 +138,27 @@ def _read(self, drv, data): # NOQA
  self._last_y = ypos
 
  if state is not None:
- if state:
- self._current_state = lv.INDEV_STATE.PRESSED
+ if self._current_state == state == self.RELEASED:
+ res = False
+ data.continue_reading = False
  else:
- self._current_state = lv.INDEV_STATE.RELEASED
+ res = True
+ data.continue_reading = True
+
+ self._current_state = state
+
+ elif self._current_state == self.RELEASED:
+ res = False
+ data.continue_reading = False
+ else:
+ data.continue_reading = True
+ res = True
 
  data.state = self._current_state
  data.point.x = self._last_x
  data.point.y = self._last_y
 
- data.continue_reading = True
- # print("raw(x={0}, y={1}) point(x={2} y={3})".format(x, y, data.point.x, data.point.y)) # NOQA
-
- return True
+ return res
 
  def get_type(self):
  return self._indev_drv.get_type()

driver/indev/ft6x36.py

@@ -206,4 +206,4 @@ def _get_coords(self):
  ((buf[3] & _MSB_MASK) << 8) |
  (buf[4] & _LSB_MASK)
  )
- return x, y
+ return self.PRESSED, x, y