From d31165106b0298b261f67c469cf923192e1dd9e1 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 15 Jun 2022 21:29:49 -0400
Subject: [PATCH 1/2] Nuke steplogger entirely

I DONT NEED THIS AT ALL
---
 wasp/boards/manifest_240x240.py | 1 -
 wasp/wasp.py                    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/wasp/boards/manifest_240x240.py b/wasp/boards/manifest_240x240.py
index 1c8a9b5..b6159c4 100644
--- a/wasp/boards/manifest_240x240.py
+++ b/wasp/boards/manifest_240x240.py
@@ -30,6 +30,5 @@ manifest = (
     'fonts/sans28.py',
     'fonts/sans36.py',
     'icons.py',
-    'steplogger.py',
     'widgets.py',
 )
diff --git a/wasp/wasp.py b/wasp/wasp.py
index d3a1a8d..fbb2f4f 100644
--- a/wasp/wasp.py
+++ b/wasp/wasp.py
@@ -17,7 +17,6 @@
 import gc
 import machine
 import micropython
-import steplogger
 import sys
 import watch
 import widgets

From 40c3928ce1824fcb2ce7963cb0767cd000696196 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 15 Jun 2022 21:32:12 -0400
Subject: [PATCH 2/2] Disable debugging by default

Some issues with pointer conversion will be reported (due to a missing
macro call). For now, let's just set -Wno-error for that.
---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

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