IS-Matrix-Forge 1.0.0.dev6__tar.gz → 1.0.0.dev8__tar.gz

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: IS-Matrix-Forge
-Version: 1.0.0.dev6
+Version: 1.0.0.dev8
 Summary: 
 License: MIT
 Keywords: led,matrix,framework,hardware

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/is_matrix_forge/designer_gui/main_window/__init__.py

@@ -46,7 +46,7 @@ class PixelGrid:
         self.preferred_device = None
 
         layout = PixelGridLayout(self.width, self.height).build()
-        self.window = sg.Window('Pixel Grid', layout, finalize=True)
+        self.window = sg.Window('Pixel Grid', layout, finalize=True, resizable=True)
         self._init_button_colors()
         self._update_frame_indicator()
 

is_matrix_forge-1.0.0.dev8/is_matrix_forge/led_matrix/Scripts/pixel_grid.py

@@ -0,0 +1,27 @@
+"""
+Author: 
+    Inspyre Softworks
+
+Project:
+    IS-Matrix-Forge
+
+File: 
+    is_matrix_forge/led_matrix/Scripts/pixel_grid.py
+ 
+
+Description:
+   Entry point for the pixel grid designer GUI.
+"""
+from is_matrix_forge.designer_gui.main_window import PixelGrid
+
+
+def main():
+    """
+    Entry point for the pixel grid designer GUI.
+    """
+    PixelGrid().run()
+
+
+if __name__ == "__main__":
+    main()
+

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/is_matrix_forge/led_matrix/controller/controller.py

@@ -21,6 +21,8 @@ import threading
 from time import sleep
 from typing import Optional, Dict, Any, Union, List
 
+from is_matrix_forge.log_engine import ROOT_LOGGER, Loggable
+
 from inspyre_toolbox.syntactic_sweets.classes import validate_type
 from inspyre_toolbox.syntactic_sweets.classes.decorators.aliases import add_aliases, method_alias
 from serial.tools.list_ports_common import ListPortInfo
@@ -38,8 +40,10 @@ from is_matrix_forge.led_matrix.display.text import show_string
 
 COMMANDS = CommandVals
 
+MOD_LOGGER = ROOT_LOGGER.get_child('led_matrix.controller.controller')
+
 
-class LEDMatrixController(metaclass=AliasMeta):
+class LEDMatrixController(Loggable, metaclass=AliasMeta):
     """
     Controller class for LED Matrix devices.
 
@@ -237,10 +241,13 @@ class LEDMatrixController(metaclass=AliasMeta):
             return
         else:
             self._thread_safe = True
+            self._cmd_lock = threading.RLock()
 
             return
 
+
     @property
+    @alias('is_animating')
     def animating(self) -> bool:
         """
         Check if the device is currently animating.
@@ -248,7 +255,12 @@ class LEDMatrixController(metaclass=AliasMeta):
         Returns:
             bool: True if the device is animating, False otherwise.
         """
-        return bool(send_command(self.device, COMMANDS.Animate, with_response=True)[0])
+        log = self.method_logger
+        try:
+            return bool(send_command(self.device, COMMANDS.Animate, with_response=True)[0])
+        except TypeError as e:
+            log.error('Received null response')
+
 
     @property
     def breather(self) -> Breather:
@@ -356,8 +368,8 @@ class LEDMatrixController(metaclass=AliasMeta):
         """
         return self.__keep_image
 
-    @validate_type(bool)
     @keep_image.setter
+    @validate_type(bool)
     def keep_image(self, new):
         self.__keep_image = new
 
@@ -384,6 +396,7 @@ class LEDMatrixController(metaclass=AliasMeta):
         return self.location['abbrev']
 
     @property
+    @alias('serial_port', 'port_name')
     def name(self) -> str:
         if self.__name is None:
             self.__name = self.device.name
@@ -468,8 +481,8 @@ class LEDMatrixController(metaclass=AliasMeta):
         # The animate function also sets the status to 'animate' when enabled
         animate(self.device, enable)
 
+    @alias('clear')
     @synchronized
-    @method_alias('clear')
     def clear_matrix(self) -> None:
         """
         Clear the LED matrix display.
@@ -502,8 +515,8 @@ class LEDMatrixController(metaclass=AliasMeta):
             grid = Grid(init_grid=grid)
         render_matrix(self.device, grid.grid)
 
-    @synchronized
     @alias('pattern', 'show_pattern')
+    @synchronized
     def draw_pattern(self, pattern: str) -> None:
         """
         Draw a pattern on the LED matrix.
@@ -519,6 +532,7 @@ class LEDMatrixController(metaclass=AliasMeta):
         pattern_pen = BuiltInPatterns(self)
         pattern_pen.render(pattern)
 
+    @alias('display_percentage', 'show_percentage')
     @synchronized
     def draw_percentage(self, percentage: int, clear_first: bool = False):
         from is_matrix_forge.led_matrix.hardware import percentage as _show_percentage_raw
@@ -617,9 +631,6 @@ class LEDMatrixController(metaclass=AliasMeta):
         if not skip_clear:
             self.clear()
 
-    @property
-    def is_animating(self):
-        return self.animating
 
     def jump_to_bootloader(self):
         """
@@ -632,7 +643,7 @@ class LEDMatrixController(metaclass=AliasMeta):
         bootloader_jump(self.device)
 
     def list_patterns(self):
-        print
+        print(', '.join(self.get_built_in_pattern_names()))
 
     @synchronized
     def set_brightness(self, brightness: Union[int, float], __from_setter=False) -> None:

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/is_matrix_forge/led_matrix/display/animations/animation.py

@@ -415,7 +415,6 @@ class Animation:
             print('Received keyboard interrupt!')
             return
 
-
     def resume(self) -> None:
         """Resumes playback from paused state."""
         if not self.is_thread_safe:

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/is_matrix_forge/led_matrix/display/helpers/columns.py

@@ -17,13 +17,19 @@ Description:
 """
 from is_matrix_forge.led_matrix.commands.map import CommandVals
 from is_matrix_forge.led_matrix.constants import FWK_MAGIC
-from is_matrix_forge.led_matrix.hardware import send_serial
+from is_matrix_forge.led_matrix.hardware import send_serial, send_command
+from is_matrix_forge.log_engine import ROOT_LOGGER
 
 
-def send_col(dev, s, x, vals):
+MOD_LOGGER = ROOT_LOGGER.get_child('led_matrix.display.helpers.columns')
+
+
+def send_col(dev, x, vals):
+    log = MOD_LOGGER.get_child('send_col')
     """Stage greyscale values for a single column. Must be committed with commit_cols()"""
     command = FWK_MAGIC + [CommandVals.StageGreyCol, x] + vals
-    send_serial(dev, s, command)
+    log.debug(f'Sending command: {command}')
+    send_command(dev, *command)
 
 
 def commit_cols(dev, s):

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/is_matrix_forge/led_matrix/display/patterns/built_in/__init__.py

@@ -1,7 +1,7 @@
 import difflib
 from typing import Any
 
-from .stencils.res import PATTERN_MAP
+from is_matrix_forge.led_matrix.display.patterns.built_in.stencils.res import PATTERN_MAP
 
 
 class BuiltInPatterns:

is_matrix_forge-1.0.0.dev8/is_matrix_forge/led_matrix/display/patterns/built_in/stencils/__init__.py

@@ -0,0 +1,69 @@
+"""
+
+
+Author: 
+    Inspyre Softworks
+
+Project:
+    led-matrix-battery
+
+File: 
+    ${DIR_PATH}/${FILE_NAME}
+ 
+
+Description:
+    $DESCRIPTION
+
+"""
+import serial
+
+from is_matrix_forge.led_matrix.constants import WIDTH, HEIGHT
+from is_matrix_forge.led_matrix.display.helpers.columns import send_col, commit_cols
+from is_matrix_forge.led_matrix.hardware import send_command
+from is_matrix_forge.led_matrix.hardware import CommandVals
+
+
+def all_brightnesses(dev):
+    """Increase the brightness with each pixel.
+    Only 0-255 available, so it can't fill all 306 LEDs"""
+    with serial.Serial(dev.device, 115200) as s:
+        for x in range(0, WIDTH):
+            vals = [0 for _ in range(HEIGHT)]
+
+            for y in range(HEIGHT):
+                brightness = x + WIDTH * y
+                if brightness > 255:
+                    vals[y] = 0
+                else:
+                    vals[y] = brightness
+
+            send_col(dev, s, x, vals)
+        commit_cols(dev, s)
+
+
+
+def every_nth_row(dev, n):
+    for x in range(0, WIDTH):
+        vals = [(0xFF if y % n == 0 else 0) for y in range(HEIGHT)]
+
+        send_command(dev, CommandVals.StageGreyCol, [x] + vals)
+    send_command(dev, CommandVals.DrawGreyColBuffer, [])
+
+
+def every_nth_col(dev, n):
+    for x in range(0, WIDTH):
+        vals = [(0xFF if x % n == 0 else 0) for _ in range(HEIGHT)]
+
+        send_command(dev, CommandVals.StageGreyCol, [x] + vals)
+    send_command(dev, CommandVals.DrawGreyColBuffer, [])
+
+
+def checkerboard(dev, n):
+    for x in range(WIDTH):
+        vals = (([0xFF] * n) + ([0x00] * n)) * (HEIGHT // (2 * n))
+        if x % (2 * n) < n:
+            vals = vals[n:] + vals[:n]
+        # Build and send frame command via helper
+        send_command(dev, CommandVals.StageGreyCol, [x] + vals)
+    # After loop:
+    send_command(dev, CommandVals.DrawGreyColBuffer, [])

{is_matrix_forge-1.0.0.dev6 → is_matrix_forge-1.0.0.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "IS-Matrix-Forge"
-version = "1.0.0-dev.6"
+version = "1.0.0-dev.8"
 description = ""
 authors = ["Taylor B. <t.blackstone@inspyre.tech>"]
 readme = "README.md"
@@ -47,7 +47,7 @@ ipyboost = { version = "1.0.0.a3", source = "testpypi" }
 python-path = "Scripts.python_path:main"
 led-matrix-identify = "is_matrix_forge.led_matrix.Scripts.identify_matrices:main"
 install-presets = "is_matrix_forge.led_matrix.Scripts.install_presets.main:main"
-pixel-grid = "is_matrix_forge.designer_gui.main_window:main"
+pixel-grid = "is_matrix_forge.led_matrix.Scripts.pixel_grid:main"
 
 [[tool.poetry.include]]
 path = "presets/**"

is_matrix_forge-1.0.0.dev6/is_matrix_forge/led_matrix/display/patterns/built_in/stencils/__init__.py

@@ -1,70 +0,0 @@
-"""
-
-
-Author: 
-    Inspyre Softworks
-
-Project:
-    led-matrix-battery
-
-File: 
-    ${DIR_PATH}/${FILE_NAME}
- 
-
-Description:
-    $DESCRIPTION
-
-"""
-import serial
-
-from is_matrix_forge.led_matrix.constants import WIDTH, HEIGHT
-from is_matrix_forge.led_matrix.display.helpers.columns import send_col, commit_cols
-
-
-def all_brightnesses(dev):
-    """Increase the brightness with each pixel.
-    Only 0-255 available, so it can't fill all 306 LEDs"""
-    with serial.Serial(dev.device, 115200) as s:
-        for x in range(0, WIDTH):
-            vals = [0 for _ in range(HEIGHT)]
-
-            for y in range(HEIGHT):
-                brightness = x + WIDTH * y
-                if brightness > 255:
-                    vals[y] = 0
-                else:
-                    vals[y] = brightness
-
-            send_col(dev, s, x, vals)
-        commit_cols(dev, s)
-
-
-
-def every_nth_row(dev, n):
-    with serial.Serial(dev.device, 115200) as s:
-        for x in range(0, WIDTH):
-            vals = [(0xFF if y % n == 0 else 0) for y in range(HEIGHT)]
-
-            send_col(dev, s, x, vals)
-        commit_cols(dev, s)
-
-
-def every_nth_col(dev, n):
-    with serial.Serial(dev.device, 115200) as s:
-        for x in range(0, WIDTH):
-            vals = [(0xFF if x % n == 0 else 0) for _ in range(HEIGHT)]
-
-            send_col(dev, s, x, vals)
-        commit_cols(dev, s)
-
-
-def checkerboard(dev, n):
-    with serial.Serial(dev.device, 115200) as s:
-        for x in range(0, WIDTH):
-            vals = (([0xFF] * n) + ([0x00] * n)) * int(HEIGHT / 2)
-            if x % (n * 2) < n:
-                # Rotate once
-                vals = vals[n:] + vals[:n]
-
-            send_col(dev, s, x, vals)
-        commit_cols(dev, s)