diff options
| author | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-03-08 17:37:43 (GMT) |
|---|---|---|
| committer | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-03-08 17:39:39 (GMT) |
| commit | 799a66c9b95a1f95eba8b3412c45b6290ec68a73 (patch) | |
| tree | fb731f2a97acda16c95887a1a1ae52f392abfb48 | |
| parent | b5b96bd7760f76d9bb476eb835f49b3c9586ca5c (diff) | |
wasp: Move the apps into their own directory.
| -rw-r--r-- | docs/wasp.rst | 2 | ||||
| -rw-r--r-- | wasp/apps/clock.py (renamed from wasp/clock.py) | 0 | ||||
| -rw-r--r-- | wasp/apps/flashlight.py (renamed from wasp/flashlight.py) | 0 | ||||
| -rw-r--r-- | wasp/apps/testapp.py (renamed from wasp/testapp.py) | 0 | ||||
| -rw-r--r-- | wasp/boards/pinetime/manifest.py | 6 | ||||
| -rw-r--r-- | wasp/manager.py | 13 |
6 files changed, 11 insertions, 10 deletions
diff --git a/docs/wasp.rst b/docs/wasp.rst index 4c0c0ff..bd6e8a3 100644 --- a/docs/wasp.rst +++ b/docs/wasp.rst @@ -11,7 +11,7 @@ System management Applications ------------ -.. automodule:: clock +.. automodule:: apps.clock :members: :undoc-members: diff --git a/wasp/clock.py b/wasp/apps/clock.py index 5de6271..5de6271 100644 --- a/wasp/clock.py +++ b/wasp/apps/clock.py diff --git a/wasp/flashlight.py b/wasp/apps/flashlight.py index d71342b..d71342b 100644 --- a/wasp/flashlight.py +++ b/wasp/apps/flashlight.py diff --git a/wasp/testapp.py b/wasp/apps/testapp.py index 2cf3431..2cf3431 100644 --- a/wasp/testapp.py +++ b/wasp/apps/testapp.py diff --git a/wasp/boards/pinetime/manifest.py b/wasp/boards/pinetime/manifest.py index b3e2e17..6a19c1a 100644 --- a/wasp/boards/pinetime/manifest.py +++ b/wasp/boards/pinetime/manifest.py @@ -1,8 +1,10 @@ freeze('.', 'watch.py', opt=3) freeze('../..', ( + 'apps/clock.py', + 'apps/testapp.py', + 'apps/flashlight.py', 'boot.py', - 'clock.py', 'demo.py', 'draw565.py', 'drivers/battery.py', @@ -11,14 +13,12 @@ freeze('../..', 'drivers/signal.py', 'drivers/st7789.py', 'drivers/vibrator.py', - 'flashlight.py', 'fonts/clock.py', 'fonts/sans24.py', 'icons.py', 'logo.py', 'manager.py', 'shell.py', - 'testapp.py', 'widgets.py', ), opt=3 diff --git a/wasp/manager.py b/wasp/manager.py index 6e45518..b9fa084 100644 --- a/wasp/manager.py +++ b/wasp/manager.py @@ -1,9 +1,10 @@ -import clock -import flashlight -import testapp import gc import machine +from apps.clock import ClockApp +from apps.flashlight import FlashlightApp +from apps.testapp import TouchTestApp + DOWN = 1 UP = 2 LEFT = 3 @@ -19,9 +20,9 @@ class Manager(object): self.app = None self.applications = [ - clock.ClockApp(), - flashlight.FlashlightApp(), - testapp.TouchTestApp() + ClockApp(), + FlashlightApp(), + TouchTestApp() ] self.watch.display.poweron() |