wasp: Move the apps into their own directory.

5 files changed, 10 insertions, 9 deletions

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()