Compare commits

..

No commits in common. "40c3928ce1824fcb2ce7963cb0767cd000696196" and "04380f9362b816245def86184060b7363b6b319d" have entirely different histories.

3 changed files with 2 additions and 5 deletions

View file

@ -3,10 +3,6 @@ export PYTHONPATH := $(PWD)/tools/nrfutil:$(PWD)/tools/intelhex:$(PYTHONPATH)
PYTHON ?= python3 PYTHON ?= python3
PYTEST ?= pytest-3 PYTEST ?= pytest-3
# Disable debugging to save some space
DEBUG ?= 0
CFLAGS_EXTRA ?= -Wno-error=incompatible-pointer-types
all : bootloader reloader micropython all : bootloader reloader micropython
# If BOARD is undefined then set it up so that expanding it issues an # If BOARD is undefined then set it up so that expanding it issues an
@ -71,7 +67,6 @@ micropython: build-$(BOARD_SAFE) wasp/boards/$(BOARD_SAFE)/watch.py micropython/
BOARD=$(BOARD) SD=s132 \ BOARD=$(BOARD) SD=s132 \
MICROPY_VFS_LFS2=1 \ MICROPY_VFS_LFS2=1 \
FROZEN_MANIFEST=$(PWD)/wasp/boards/$(BOARD)/manifest.py \ FROZEN_MANIFEST=$(PWD)/wasp/boards/$(BOARD)/manifest.py \
DEBUG=$(DEBUG) CFLAGS_EXTRA=$(CFLAGS_EXTRA) \
USER_C_MODULES=$(PWD)/wasp/modules USER_C_MODULES=$(PWD)/wasp/modules
$(PYTHON) -m nordicsemi dfu genpkg \ $(PYTHON) -m nordicsemi dfu genpkg \
--dev-type 0x0052 \ --dev-type 0x0052 \

View file

@ -30,5 +30,6 @@ manifest = (
'fonts/sans28.py', 'fonts/sans28.py',
'fonts/sans36.py', 'fonts/sans36.py',
'icons.py', 'icons.py',
'steplogger.py',
'widgets.py', 'widgets.py',
) )

View file

@ -17,6 +17,7 @@
import gc import gc
import machine import machine
import micropython import micropython
import steplogger
import sys import sys
import watch import watch
import widgets import widgets