From 0acbcc415bbc3ab5b80aeee23ce4258052d9ac2e Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Thu, 30 Jan 2020 22:11:31 +0000
Subject: [PATCH] wasp: Reorganise the board support

---
 Makefile                                                 | 2 +-
 manifest/dsd6.py => wasp/boards/dsd6/manifest.py         | 0
 manifest/nitrogen.py => wasp/boards/nitrogen/manifest.py | 0
 manifest/pinetime.py => wasp/boards/pinetime/manifest.py | 4 ++--
 wasp/{pinetime.py => boards/pinetime/watch.py}           | 0
 wasp/boot.py                                             | 4 ++--
 wasp/demo.py                                             | 6 +++---
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename manifest/dsd6.py => wasp/boards/dsd6/manifest.py (100%)
 rename manifest/nitrogen.py => wasp/boards/nitrogen/manifest.py (100%)
 rename manifest/pinetime.py => wasp/boards/pinetime/manifest.py (76%)
 rename wasp/{pinetime.py => boards/pinetime/watch.py} (100%)

diff --git a/Makefile b/Makefile
index 70f65a3..6cc89a3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ micropython:
 	$(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c
 	$(MAKE) -C micropython/ports/nrf \
 		BOARD=$(BOARD) SD=s132 \
-		FROZEN_MANIFEST=$(PWD)/manifest/$(BOARD).py
+		FROZEN_MANIFEST=$(PWD)/wasp/boards/$(BOARD)/manifest.py
 	python3 -m nordicsemi dfu genpkg \
 		--dev-type 0x0052 \
 		--application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \
diff --git a/manifest/dsd6.py b/wasp/boards/dsd6/manifest.py
similarity index 100%
rename from manifest/dsd6.py
rename to wasp/boards/dsd6/manifest.py
diff --git a/manifest/nitrogen.py b/wasp/boards/nitrogen/manifest.py
similarity index 100%
rename from manifest/nitrogen.py
rename to wasp/boards/nitrogen/manifest.py
diff --git a/manifest/pinetime.py b/wasp/boards/pinetime/manifest.py
similarity index 76%
rename from manifest/pinetime.py
rename to wasp/boards/pinetime/manifest.py
index 7175d74..22fd135 100644
--- a/manifest/pinetime.py
+++ b/wasp/boards/pinetime/manifest.py
@@ -1,4 +1,4 @@
-freeze('$(MPY_DIR)/../wasp',
+freeze('../..',
     (
         'boot.py',
         'demo.py',
@@ -6,7 +6,7 @@ freeze('$(MPY_DIR)/../wasp',
         'drivers/signal.py',
         'drivers/st7789.py',
         'logo.py',
-        'pinetime.py'
     ),
     opt=3
 )
+freeze('.', 'watch.py', opt=3)
diff --git a/wasp/pinetime.py b/wasp/boards/pinetime/watch.py
similarity index 100%
rename from wasp/pinetime.py
rename to wasp/boards/pinetime/watch.py
diff --git a/wasp/boot.py b/wasp/boot.py
index 79601e7..08d5c12 100644
--- a/wasp/boot.py
+++ b/wasp/boot.py
@@ -1,6 +1,6 @@
 import logo
-import pinetime
+import watch
 
-pinetime.display.rleblit(logo.pine64, fg=0xffff)
+watch.display.rleblit(logo.pine64, fg=0xffff)
 
 
diff --git a/wasp/demo.py b/wasp/demo.py
index b74d3e6..9da9f5f 100644
--- a/wasp/demo.py
+++ b/wasp/demo.py
@@ -7,7 +7,7 @@
 # len(colors) is not a multiple of 5 ;-) ).
 #
 
-import pinetime, logo, time, gc
+import watch, logo, time, gc
 
 colors = (
         0xffff,
@@ -38,8 +38,8 @@ def run():
                     l = logo.micropython
                 else:
                     l = logo.pine64
-                pinetime.display.fill(0)
+                watch.display.fill(0)
 
-            pinetime.display.rleblit(l, fg=c)
+            watch.display.rleblit(l, fg=c)
             time.sleep(2)
             gc.collect()