updated

Author: trevorwslee

README.md

@@ -176,9 +176,10 @@ MIT
 
 # Change History
 
-v0.4.0
+v0.5.0
 - ported "level options" for LayerGraphical 
 - ported LayerSelection
+- added dumbdisplay_examples package
 - bug fixes
 
 v0.3.1

_test.py

@@ -69,22 +69,22 @@ def test_margin():
 def run_passive_blink_app():
     from dumbdisplay_examples.passive_blink.passive_blink_app import PassiveBlinkApp
     print(f"*** PassiveBlinkApp ***")
-    app = PassiveBlinkApp(create_example_wifi_dd())
+    app = PassiveBlinkApp()
     app.run()
 
 
 def run_sliding_puzzle_app():
     from dumbdisplay_examples.sliding_puzzle.sliding_puzzle_app import SlidingPuzzleApp
     print(f"*** SlidingPuzzleApp ***")
     suggest_move_from_dir_func = lambda board_manager: random.randint(0, 3)
-    app = SlidingPuzzleApp(create_example_wifi_dd(), suggest_move_from_dir_func=suggest_move_from_dir_func)
+    app = SlidingPuzzleApp(dd=create_example_wifi_dd(), suggest_move_from_dir_func=suggest_move_from_dir_func)
     app.run()
 
 def run_mnist_app():
     from dumbdisplay_examples.mnist.mnist_app import MnistApp
     print(f"*** MnistApp ***")
-    inference_func = lambda board_manager: random.randint(0, 10)
-    app = MnistApp(create_example_wifi_dd(), inference_func=inference_func)
+    inference_func = lambda board_manager: random.randint(0, 9)
+    app = MnistApp(dd=create_example_wifi_dd(), inference_func=inference_func)
     app.run()
 
 
@@ -103,9 +103,9 @@ def test_find_packages():
 
 
 if __name__ == "__main__":
-    #run_passive_blink_app()
+    run_passive_blink_app()
     #run_sliding_puzzle_app()
-    run_mnist_app()
+    #run_mnist_app()
 
     #run_debug()
     #run_doodle()

dumbdisplay/ddlayer.py

@@ -144,10 +144,8 @@ def enableFeedback(self, auto_feedback_method: str = "", feedback_handler = None
     . layer -- layer involved
     . type -- "click"
     . x, y -- the "area" on the layer where was clicked
+    . *args -- for future-proofing
     '''
-    # if simple_feedback_handler is not None:
-    #   # simple_feedback_handler deprecated
-    #   feedback_handler = lambda layer, type, x, y, text: simple_feedback_handler(layer, type, x, y)
     self._feedback_handler = feedback_handler
     self._feedbacks = []
     self.dd._sendCommand(self.layer_id, "feedback", _DD_BOOL_ARG(True), auto_feedback_method, allowed_feedback_types)

dumbdisplay_examples/mnist/mnist_app.py

@@ -6,13 +6,13 @@
 from dumbdisplay.ddlayer_graphical import DDLayerGraphical
 from dumbdisplay.ddlayer_lcd import DDLayerLcd
 from dumbdisplay.ddlayer_7segrow import DDLayer7SegmentRow
-
+from dumbdisplay_examples.utils import create_example_wifi_dd
 
 THICKER_LINE_SHADE = 223  # 0 to disable; other values can be 191 / 255
 
 
 class MnistApp():
-  def __init__(self, dd: DumbDisplay, inference_func = None):
+  def __init__(self, dd: DumbDisplay = create_example_wifi_dd(), inference_func = None):
     self.dd = dd
     self.inference_func = inference_func
     self.draw_layer: DDLayerGraphical = None

dumbdisplay_examples/passive_blink/passive_blink_app.py

@@ -1,10 +1,11 @@
 from dumbdisplay.core import *
 from dumbdisplay.layer_ledgrid import *
+from dumbdisplay_examples.utils import create_example_wifi_dd
 import time
 
 
 class PassiveBlinkApp():
-    def __init__(self, dd: DumbDisplay):
+    def __init__(self, dd: DumbDisplay = create_example_wifi_dd()):
         self.dd = dd
     def run(self):
         l: LayerLedGrid = None

dumbdisplay_examples/sliding_puzzle/sliding_puzzle_app.py

@@ -4,6 +4,7 @@
 from dumbdisplay.layer_graphical import LayerGraphical
 from dumbdisplay.layer_lcd import LayerLcd
 from dumbdisplay.layer_selection import LayerSelection
+from dumbdisplay_examples.utils import create_example_wifi_dd
 
 BOARD_SIZE = 400
 DEF_TILE_COUNT = 4  # the default sliding puzzle is 4x4; i.e. 16 tiles
@@ -13,7 +14,7 @@
 
 
 class SlidingPuzzleApp:
-    def __init__(self, dd: DumbDisplay, tile_count: int = DEF_TILE_COUNT, suggest_move_from_dir_func = None):
+    def __init__(self, dd: DumbDisplay = create_example_wifi_dd(), tile_count: int = DEF_TILE_COUNT, suggest_move_from_dir_func = None):
         '''
         :param suggest_move_from_dir_func: if not None, a function that access BoardManager and returns the next move (0 / 1 / 2 / 3)
         '''