wasp: Reorganise the board support

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 \

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)

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)
 
 

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