diff options
| author | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-01-30 22:11:31 (GMT) |
|---|---|---|
| committer | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-01-30 22:11:31 (GMT) |
| commit | 0acbcc415bbc3ab5b80aeee23ce4258052d9ac2e (patch) | |
| tree | ca05741b92067b158965a49288b5c1920a1a9979 | |
| parent | a34d65d7fdfbbaaa3e6484dfebe914378f478ca2 (diff) | |
wasp: Reorganise the board support
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | wasp/boards/dsd6/manifest.py (renamed from manifest/nitrogen.py) | 0 | ||||
| -rw-r--r-- | wasp/boards/nitrogen/manifest.py (renamed from manifest/dsd6.py) | 0 | ||||
| -rw-r--r-- | wasp/boards/pinetime/manifest.py (renamed from manifest/pinetime.py) | 4 | ||||
| -rw-r--r-- | wasp/boards/pinetime/watch.py (renamed from wasp/pinetime.py) | 0 | ||||
| -rw-r--r-- | wasp/boot.py | 4 | ||||
| -rw-r--r-- | wasp/demo.py | 6 |
7 files changed, 8 insertions, 8 deletions
@@ -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/nitrogen.py b/wasp/boards/dsd6/manifest.py index e69de29..e69de29 100644 --- a/manifest/nitrogen.py +++ b/wasp/boards/dsd6/manifest.py diff --git a/manifest/dsd6.py b/wasp/boards/nitrogen/manifest.py index e69de29..e69de29 100644 --- a/manifest/dsd6.py +++ b/wasp/boards/nitrogen/manifest.py diff --git a/manifest/pinetime.py b/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 index 730eebc..730eebc 100644 --- a/wasp/pinetime.py +++ b/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() |