Merge pull request #129 from makermelissa/main

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _epaperdisplay.py

diff --git a/displayio/_epaperdisplay.py b/displayio/_epaperdisplay.py
index 0605d648aa48ce145f063b7d9b2c35a0bc7b2573..6ce0664be468bd123db42251e7a76fcf23f52f69 100644 (file)
--- a/displayio/_epaperdisplay.py
+++ b/displayio/_epaperdisplay.py
@@ -222,7 +222,7 @@ class EPaperDisplay:
         self._start_sequence = start_sequence
         self._start_up_time = start_up_time
         self._stop_sequence = stop_sequence
         self._start_sequence = start_sequence
         self._start_up_time = start_up_time
         self._stop_sequence = stop_sequence

-        self._refesh_sequence = refresh_sequence
+        self._refresh_sequence = refresh_sequence

         self._busy = None
         self._two_byte_sequence_length = two_byte_sequence_length
         if busy_pin is not None:
         self._busy = None
         self._two_byte_sequence_length = two_byte_sequence_length
         if busy_pin is not None:


@@ -248,13 +248,22 @@ class EPaperDisplay:
 
     def show(self, group: Group) -> None:
         # pylint: disable=unnecessary-pass
 
     def show(self, group: Group) -> None:
         # pylint: disable=unnecessary-pass

-        """Switches to displaying the given group of layers. When group is None, the default
+        """
+        .. note:: `show()` is deprecated and will be removed when CircuitPython 9.0.0
+          is released. Use ``.root_group = group`` instead.
+
+        Switches to displaying the given group of layers. When group is None, the default

         CircuitPython terminal will be shown (eventually).
         """
         if group is None:
             group = circuitpython_splash
         self._core.set_root_group(group)
 
         CircuitPython terminal will be shown (eventually).
         """
         if group is None:
             group = circuitpython_splash
         self._core.set_root_group(group)
 

+    def _set_root_group(self, root_group: Group) -> None:
+        ok = self._core.set_root_group(root_group)
+        if not ok:
+            raise ValueError("Group already used")
+

     def update_refresh_mode(
         self, start_sequence: ReadableBuffer, seconds_per_frame: float
     ) -> None:
     def update_refresh_mode(
         self, start_sequence: ReadableBuffer, seconds_per_frame: float
     ) -> None:


@@ -298,12 +307,13 @@ class EPaperDisplay:
             self._finish_refresh()
             while self._refreshing:
                 # TODO: Add something here that can change self._refreshing
             self._finish_refresh()
             while self._refreshing:
                 # TODO: Add something here that can change self._refreshing

+                # or add something in _background()

                 pass
 
         self._start_refresh()
         for area in areas_to_refresh:
             self._refresh_area(area)
                 pass
 
         self._start_refresh()
         for area in areas_to_refresh:
             self._refresh_area(area)

-        self._core.finish_refresh()
+        self._finish_refresh()

 
         return True
 
 
         return True
 


@@ -339,10 +349,10 @@ class EPaperDisplay:
                     time.monotonic() * 1000 - self._core.last_refresh
                     > self._refresh_time
                 )
                     time.monotonic() * 1000 - self._core.last_refresh
                     > self._refresh_time
                 )

+

             if refresh_done:
                 self._ticks_disabled = True
                 self._refreshing = False
             if refresh_done:
                 self._ticks_disabled = True
                 self._refreshing = False

-                self._finish_refresh()

                 # Run stop sequence but don't wait for busy because busy is set when sleeping
                 self._send_command_sequence(False, self._stop_sequence)
 
                 # Run stop sequence but don't wait for busy because busy is set when sleeping
                 self._send_command_sequence(False, self._stop_sequence)
 


@@ -371,7 +381,6 @@ class EPaperDisplay:
         # If there is no overlap then we're done.
         if not self._core.clip_area(area, clipped):
             return True
         # If there is no overlap then we're done.
         if not self._core.clip_area(area, clipped):
             return True

-

         subrectangles = 1
         rows_per_buffer = clipped.height()
         pixels_per_word = 32 // self._core.colorspace.depth
         subrectangles = 1
         rows_per_buffer = clipped.height()
         pixels_per_word = 32 // self._core.colorspace.depth


@@ -392,7 +401,7 @@ class EPaperDisplay:
             if pixels_per_buffer % pixels_per_word:
                 buffer_size += 1
 
             if pixels_per_buffer % pixels_per_word:
                 buffer_size += 1
 

-        mask_length = (pixels_per_buffer // 8) + 1  # 1 bit per pixel + 1
+        mask_length = (pixels_per_buffer // 32) + 1  # 1 bit per pixel + 1

 
         passes = 1
         if self._write_color_ram_command != NO_COMMAND:
 
         passes = 1
         if self._write_color_ram_command != NO_COMMAND:


@@ -412,10 +421,10 @@ class EPaperDisplay:
 
             for subrect_index in range(subrectangles):
                 subrectangle = Area(
 
             for subrect_index in range(subrectangles):
                 subrectangle = Area(

-                    clipped.x1,
-                    clipped.y1 + rows_per_buffer * subrect_index,
-                    clipped.x2,
-                    clipped.y1 + rows_per_buffer * (subrect_index + 1),
+                    x1=clipped.x1,
+                    y1=clipped.y1 + rows_per_buffer * subrect_index,
+                    x2=clipped.x2,
+                    y2=clipped.y1 + rows_per_buffer * (subrect_index + 1),

                 )
                 if remaining_rows < rows_per_buffer:
                     subrectangle.y2 = subrectangle.y1 + remaining_rows
                 )
                 if remaining_rows < rows_per_buffer:
                     subrectangle.y2 = subrectangle.y1 + remaining_rows


@@ -425,8 +434,8 @@ class EPaperDisplay:
                     8 // self._core.colorspace.depth
                 )
 
                     8 // self._core.colorspace.depth
                 )
 

-                buffer = memoryview(bytearray([0] * (buffer_size * 4)))
-                mask = memoryview(bytearray([0] * mask_length))
+                buffer = memoryview(bytearray([0] * (buffer_size * 4))).cast("I")
+                mask = memoryview(bytearray([0] * (mask_length * 4))).cast("I")

 
                 if not self._acep:
                     self._core.colorspace.grayscale = True
 
                 if not self._acep:
                     self._core.colorspace.grayscale = True


@@ -447,14 +456,16 @@ class EPaperDisplay:
                 if (pass_index == 1 and self._color_bits_inverted) or (
                     pass_index == 0 and self._black_bits_inverted
                 ):
                 if (pass_index == 1 and self._color_bits_inverted) or (
                     pass_index == 0 and self._black_bits_inverted
                 ):

-                    for i, _ in enumerate(buffer):
+                    for i in range(buffer_size):

                         buffer[i] = ~buffer[i]
 
                 if not self._core.begin_transaction():
                     # Can't acquire display bus; skip the rest of the data. Try next display.
                     return False
                 self._core.send(
                         buffer[i] = ~buffer[i]
 
                 if not self._core.begin_transaction():
                     # Can't acquire display bus; skip the rest of the data. Try next display.
                     return False
                 self._core.send(

-                    DISPLAY_DATA, self._chip_select, buffer[:subrectangle_size_bytes]
+                    DISPLAY_DATA,
+                    self._chip_select,
+                    buffer.tobytes()[:subrectangle_size_bytes],

                 )
                 self._core.end_transaction()
         return True
                 )
                 self._core.end_transaction()
         return True


@@ -506,7 +517,7 @@ class EPaperDisplay:
 
     def _finish_refresh(self) -> None:
         # Actually refresh the display now that all pixel RAM has been updated
 
     def _finish_refresh(self) -> None:
         # Actually refresh the display now that all pixel RAM has been updated

-        self._send_command_sequence(False, self._refesh_sequence)
+        self._send_command_sequence(False, self._refresh_sequence)

         self._ticks_disabled = False
         self._refreshing = True
         self._core.finish_refresh()
         self._ticks_disabled = False
         self._refreshing = True
         self._core.finish_refresh()


@@ -547,6 +558,10 @@ class EPaperDisplay:
         if transposed != will_transposed:
             self._core.width, self._core.height = self._core.height, self._core.width
         self._core.set_rotation(value)
         if transposed != will_transposed:
             self._core.width, self._core.height = self._core.height, self._core.width
         self._core.set_rotation(value)

+        if self._core.current_group is not None:
+            self._core.current_group._update_transform(  # pylint: disable=protected-access
+                self._core.transform
+            )

 
     @property
     def time_to_refresh(self) -> float:
 
     @property
     def time_to_refresh(self) -> float:


@@ -586,8 +601,8 @@ class EPaperDisplay:
         """The root group on the epaper display.
         If the root group is set to ``None``, no output will be shown.
         """
         """The root group on the epaper display.
         If the root group is set to ``None``, no output will be shown.
         """

-        return self._core.root_group
+        return self._core.current_group

 
     @root_group.setter
     def root_group(self, new_group: Group) -> None:
 
     @root_group.setter
     def root_group(self, new_group: Group) -> None:

-        self._core.root_group = new_group
+        self._set_root_group(new_group)