Skip to content

Commit e64227a

Browse files
committed
updated
1 parent 6215685 commit e64227a

4 files changed

Lines changed: 37 additions & 42 deletions

File tree

_test.py

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import random
2-
import runpy
32
import time
43
import math
54

@@ -16,30 +15,16 @@ def run_debug():
1615
test.runDebug()
1716

1817
def run_doodle():
19-
runpy.run_path("samples/doodle/main.py")
18+
import samples.doodle.main
2019

2120
def run_graphical():
22-
runpy.run_path("samples/graphical/main.py")
21+
import samples.graphical.main
2322

2423
def run_melody():
25-
runpy.run_path("samples/melody/main.py")
24+
import samples.melody.main
2625

2726

28-
def run_passive_blink_app():
29-
from dumbdisplay_examples.passive_blink.passive_blink_app import PassiveBlinkApp
30-
print(f"*** PassiveBlinkApp ***")
31-
app = PassiveBlinkApp(create_example_wifi_dd())
32-
app.run()
33-
34-
35-
def run_sliding_puzzle_app():
36-
from dumbdisplay_examples.sliding_puzzle.sliding_puzzle_app import SlidingPuzzleApp
37-
print(f"*** SlidingPuzzleApp ***")
38-
suggest_move_from_dir_func = lambda board_manager: random.randint(0, 3)
39-
app = SlidingPuzzleApp(create_example_wifi_dd(), suggest_move_from_dir_func=suggest_move_from_dir_func)
40-
app.run()
41-
42-
def very_simple():
27+
def test_very_simple():
4328
#import time
4429
from dumbdisplay.layer_ledgrid import LayerLedGrid
4530
dd = DumbDisplay(io4Inet())
@@ -83,15 +68,30 @@ def test_margin():
8368
print("... ASSUME disconnected")
8469

8570

71+
def run_passive_blink_app():
72+
from dumbdisplay_examples.passive_blink.passive_blink_app import PassiveBlinkApp
73+
print(f"*** PassiveBlinkApp ***")
74+
app = PassiveBlinkApp(create_example_wifi_dd())
75+
app.run()
76+
77+
78+
def run_sliding_puzzle_app():
79+
from dumbdisplay_examples.sliding_puzzle.sliding_puzzle_app import SlidingPuzzleApp
80+
print(f"*** SlidingPuzzleApp ***")
81+
suggest_move_from_dir_func = lambda board_manager: random.randint(0, 3)
82+
app = SlidingPuzzleApp(create_example_wifi_dd(), suggest_move_from_dir_func=suggest_move_from_dir_func)
83+
app.run()
84+
85+
8686

8787
def test_find_packages():
8888
from setuptools.config.expand import find_packages
8989
packages = find_packages(include=["dumbdisplay*"])
9090
print(f"Found packages: {packages}")
9191

92-
if __name__ == "__main__":
93-
#test_find_packages()
9492

93+
94+
if __name__ == "__main__":
9595
#run_passive_blink_app()
9696
run_sliding_puzzle_app()
9797

@@ -101,5 +101,7 @@ def test_find_packages():
101101
#run_melody()
102102

103103
#test_margin()
104-
#very_simple()
104+
#test_very_simple()
105105
#test_plotter()
106+
107+
test_find_packages()

dumbdisplay_examples/passive_blink/passive_blink_app.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,6 @@
33
import time
44

55

6-
# # create DumbDisplay
7-
# if DumbDisplay.runningWithMicropython():
8-
# # connect using WIFI:
9-
# # assume a _my_secret.py Python script containing
10-
# # WIFI_SSID="SSID"
11-
# # WIFI_PWD="PASSWORD"
12-
# from _my_secret import *
13-
# from dumbdisplay.io_wifi import *
14-
# dd = DumbDisplay(io4Wifi(WIFI_SSID, WIFI_PWD))
15-
# print("***** WIFI *****")
16-
# else:
17-
# # connect using Inet (Python Internet connection)
18-
# from dumbdisplay.io_inet import *
19-
# dd = DumbDisplay(io4Inet())
20-
21-
226
class PassiveBlinkApp():
237
def __init__(self, dd: DumbDisplay):
248
self.dd = dd
@@ -42,3 +26,8 @@ def run(self):
4226
l.toggle()
4327
last_ms = now_ms
4428

29+
30+
if __name__ == "__main__":
31+
from dumbdisplay_examples.utils import create_example_wifi_dd
32+
app = PassiveBlinkApp(create_example_wifi_dd())
33+
app.run()

dumbdisplay_examples/sliding_puzzle/sliding_puzzle_app.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,4 +442,8 @@ def moveAsSuggested(self, suggested_move_from_dir: int) -> bool:
442442
self.dd.log("No suggested move!")
443443
return False
444444

445+
if __name__ == "__main__":
446+
from dumbdisplay_examples.utils import create_example_wifi_dd
447+
app = SlidingPuzzleApp(create_example_wifi_dd())
448+
app.run()
445449

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import setuptools
22
from setuptools.config.expand import find_packages
33

4-
with open("README.md", "r", encoding="utf-8") as fh:
5-
long_description = fh.read()
6-
74
setuptools.setup(
85
name='uDumbDisplayLib',
96
version='0.4.0',
107
author='Trevor Lee',
118
author_email='trevorwslee@gmail.com',
129
description='MicroPython DumbDisplay Library',
13-
long_description=long_description,
10+
long_description='''
11+
DumbDisplay MicroPython Library -- workable with Python 3 -- is a port of the [DumbDisplay Arduino Library](https://github.com/trevorwslee/Arduino-DumbDisplay)
12+
to Micro-Python / Python 3 for the [DumbDisplay Android app](https://play.google.com/store/apps/details?id=nobody.trevorlee.dumbdisplay)
13+
''',
1414
long_description_content_type="text/markdown",
1515
url='https://github.com/trevorwslee/MicroPython-DumbDisplay',
1616
project_urls = {

0 commit comments

Comments
 (0)