pydisplay: Package troubleshooting.

Signed-off-by: Brad Barnett <[email protected]>

Author: bdbarnett

micropython/pydisplay/displaysys/displaysys-pgdisplay/displaysys/pgdisplay.py

@@ -15,7 +15,7 @@
     pass
 
 
-def poll() -> Optional[pg.event.Event | False]:
+def poll():
     """
     Polls for an event and returns the event type and data.
 
@@ -24,22 +24,6 @@ def poll() -> Optional[pg.event.Event | False]:
     """
     return pg.event.poll()
 
-def peek(eventtype: Optional[Union[int, Sequence[int]]] = None, pump: bool = True) -> bool:
-    """
-    Check the event queue for messages.  Returns True if there are any events of the given type waiting on the queue.
-    If a sequence of event types is passed, this will return True if any of those events are on the queue.
-
-    If pump is True (the default), then pygame.event.pump() will be called.
-
-    Args:
-        eventtype (Optional[Union[int, Sequence[int]]]): The event type(s) to check. Defaults to None.
-        pump (bool): Whether to call pygame.event.pump(). Defaults to True.
-
-    Returns:
-        bool: True if there are any events of the given type waiting on the queue.
-    """
-    return pg.event.peek(eventtype, pump)
-
 
 class PGDisplay(DisplayDriver):
     """
@@ -262,7 +246,7 @@ def render(self, renderRect: Optional[pg.Rect] = None) -> None:
                 bfaRect = pg.Rect(0, tfa + vsa, width, bfa)
                 self._window.blit(buffer, bfaRect, bfaRect)
 
-    def show(self) -> None:
+    def show(self, param=None) -> None:
         """
         Show the display.
         """

micropython/pydisplay/displaysys/displaysys-pgdisplay/examples/board_config.py

@@ -2,7 +2,7 @@
 Board configuration for PyGame.
 """
 
-from displaysys.pgdisplay import PGDisplay as DTDisplay, poll, peek
+from displaysys.pgdisplay import PGDisplay as DTDisplay, poll
 from eventsys import devices
 import sys
 
@@ -26,7 +26,6 @@
     type=devices.types.QUEUE,
     read=poll,
     data=display_drv,
-    read2=peek,
     # data2=events.filter,
 )
 

micropython/pydisplay/displaysys/displaysys-sdldisplay/displaysys/sdldisplay/__init__.py

@@ -9,6 +9,7 @@
 from displaysys import DisplayDriver, color_rgb
 from eventsys import events
 from sys import implementation
+from micropython import schedule
 from ._sdl2_lib import (
     SDL_Init,
     SDL_Quit,
@@ -41,8 +42,6 @@
     SDL_INIT_EVERYTHING,
     SDL_Rect,
     SDL_PollEvent,
-    SDL_PeepEvents,
-    SDL_PumpEvents,
     SDL_GetKeyName,
     SDL_Event,
     SDL_QUIT,
@@ -55,9 +54,6 @@
     SDL_MOUSEWHEEL,
     SDL_KEYDOWN,
     SDL_KEYUP,
-    SDL_PEEKEVENT,
-    SDL_FIRSTEVENT,
-    SDL_LASTEVENT,
 )
 
 try:
@@ -72,6 +68,20 @@
 else:
     is_cpython = False
 
+try:
+    from time import ticks_ms, ticks_add
+except ImportError:
+    from adafruit_ticks import ticks_ms, ticks_add
+
+
+def scheduler(param):
+    func, next_run, interval = param
+    if (current_time := ticks_ms()) >= next_run:
+        interval = func(interval)
+        next_run = ticks_add(current_time, interval)
+    if interval > 0:
+        schedule(scheduler, (func, next_run, interval))
+
 
 _event = SDL_Event()
 
@@ -93,33 +103,6 @@ def poll() -> Optional[events]:
                 return _convert(SDL_Event(_event))
     return None
 
-def peek(eventtype: Optional[Union[int, Sequence[int]]] = None, pump: bool = True) -> bool:
-    """
-    Check the event queue for messages.  Returns True if there are any events of the given type waiting on the queue.
-    If a sequence of event types is passed, this will return True if any of those events are on the queue.
-
-    If pump is True (the default), then pygame.event.pump() will be called.
-
-    Args:
-        eventtype (Optional[Union[int, Sequence[int]]]): The event type(s) to check. Defaults to None.
-        pump (bool): Whether to call pygame.event.pump(). Defaults to True.
-
-    Returns:
-        bool: True if there are any events of the given type waiting on the queue.
-    """
-    global _event
-    _event = SDL_Event()
-    if pump:
-        SDL_PumpEvents()
-    num_matching = SDL_PeepEvents(_event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT)
-    if num_matching == 0:
-        return False
-    if eventtype is None:
-        return True
-    if isinstance(eventtype, int):
-        return _event.type == eventtype
-    return _event.type in eventtype
-
 def _convert(e):
     # Convert an SDL event to a Pygame event
     if e.type == SDL_MOUSEMOTION:
@@ -169,7 +152,6 @@ def _convert(e):
         evt = events.Unknown(e.type)
     return evt
 
-
 def retcheck(retvalue):
     # Check the return value of an SDL function and raise an exception if it's not 0
     if retvalue:
@@ -395,6 +377,7 @@ def _rotation_helper(self, value):
             value (int): The new rotation value.
         """
 
+        print("here")
         if (angle := (value % 360) - (self._rotation % 360)) != 0:
             if implementation.name == "cpython":
                 tempBuffer = SDL_CreateTexture(

micropython/pydisplay/displaysys/displaysys-sdldisplay/displaysys/sdldisplay/_sdl2_lib/_constants.py

@@ -79,10 +79,6 @@
 SDL_BUTTON_MMASK = const(1 << 1)  # Middle mouse button
 SDL_BUTTON_RMASK = const(1 << 2)  # Right mouse button
 
-# Event constants
-SDL_PEEKEVENT = const(0x1)
-SDL_FIRSTEVENT = const(0x2)
-SDL_LASTEVENT = const(0x3)
 
 ###############################################################################
 #                          SDL2 Pixel Formats                                 #

micropython/pydisplay/displaysys/displaysys-sdldisplay/displaysys/sdldisplay/_sdl2_lib/_cpython.py

@@ -140,14 +140,6 @@ class Wheel(ctypes.Structure):
 _libSDL2.SDL_PollEvent.restype = ctypes.c_int
 SDL_PollEvent = _libSDL2.SDL_PollEvent
 
-_libSDL2.SDL_PeepEvents.argtypes = [ctypes.POINTER(SDL_CommonEvent), ctypes.c_int, ctypes.c_int, ctypes.c_uint, ctypes.c_uint]
-_libSDL2.SDL_PeepEvents.restype = ctypes.c_int
-SDL_PeepEvents = _libSDL2.SDL_PeepEvents
-
-_libSDL2.SDL_PumpEvents.argtypes = []
-_libSDL2.SDL_PumpEvents.restype = None
-SDL_PumpEvents = _libSDL2.SDL_PumpEvents
-
 # SDL key functions
 _libSDL2.SDL_GetKeyName.argtypes = [ctypes.c_int]
 _libSDL2.SDL_GetKeyName.restype = ctypes.c_char_p

micropython/pydisplay/displaysys/displaysys-sdldisplay/displaysys/sdldisplay/_sdl2_lib/_micropython.py

@@ -120,8 +120,6 @@ def SDL_Point(x=0, y=0):
 SDL_Quit = _libSDL2.func("v", "SDL_Quit", "")
 SDL_GetError = _libSDL2.func("s", "SDL_GetError", "")
 SDL_PollEvent = _libSDL2.func("i", "SDL_PollEvent", "P")
-SDL_PeepEvents = _libSDL2.func("i", "SDL_PeepEvents", "Piiii")
-SDL_PumpEvents = _libSDL2.func("v", "SDL_PumpEvents", "")
 
 # SDL key functions
 SDL_GetKeyName = _libSDL2.func("s", "SDL_GetKeyName", "i")

micropython/pydisplay/displaysys/displaysys-sdldisplay/examples/board_config.py

@@ -2,7 +2,7 @@
 Combination board configuration for desktop, pyscript and jupyter notebook platforms.
 """
 
-from displaysys.sdldisplay import SDLDisplay as DTDisplay, poll, peek
+from displaysys.sdldisplay import SDLDisplay as DTDisplay, poll
 from eventsys import devices
 import sys
 
@@ -25,7 +25,6 @@
     type=devices.types.QUEUE,
     read=poll,
     data=display_drv,
-    read2=peek,
     # data2=events.filter,
 )
 

micropython/pydisplay/displaysys/displaysys/displaysys/__init__.py

@@ -118,15 +118,15 @@ def __init__(self, auto_refresh=False):
             try:
                 from multimer import get_timer
 
-                self._timer = get_timer(self.show)
+                self._timer = get_timer(self.show, period=33)
             except ImportError:
                 raise ImportError("timer is required for auto_refresh")
         else:
             self._timer = None
         self.init()
         gc.collect()
-        print(f"{self.__class__.__name__} initialized.")
-        print(f"{self.__class__.__name__} requires_byteswap = {self.requires_byteswap}")
+        print(f"{self.__class__.__name__}: initialized.")
+        print(f"{self.__class__.__name__}: requires_byteswap = {self.requires_byteswap}")
 
     def __del__(self):
         self.deinit()
@@ -171,6 +171,7 @@ def rotation(self, value) -> None:
 
         print(f"{self.__class__.__name__}.rotation():  Setting rotation to {value}")
         self._rotation_helper(value)
+        print("done setting rotation")
 
         self._rotation = value
 

micropython/pydisplay/eventsys/eventsys/devices.py

@@ -439,7 +439,7 @@ def peek(self) -> bool:
             bool: True if there is an event in the queue that matches the filter in self._data, otherwise False.
                 Note: self._data defaults to events.filter but may be set to a different list.
         """
-        return self._read2(self._data2)
+        raise NotImplementedError("QueueDevice.peek() not implemented")
 
 
 class TouchDevice(Device):