Merge pull request #9 from badgeteam/disobey-last-pieces

Disobey badge #2: last pieces

Author: renzenicolai

esp32/Makefile

@@ -20,13 +20,46 @@ MICROPY_NATIVEFS = 1
 MICROPY_PY_BTREE = 1
 
 #FROZEN_DIR = scripts
-FROZEN_MPY_DIR = modules
+
+ifdef CONFIG_SHA_BADGE_V1
+FROZEN_MPY_DIR = modules_sha2017
+endif
+
+ifdef CONFIG_SHA_BADGE_V2
+FROZEN_MPY_DIR = modules_sha2017
+endif
+
+ifdef CONFIG_SHA_BADGE_V3
+FROZEN_MPY_DIR = modules_sha2017
+endif
+
+ifdef CONFIG_SHA_BADGE_V3_LITE
+FROZEN_MPY_DIR = modules_sha2017
+endif
+
+ifdef PROJECT_PATH
+FROZEN_MPY_DIR = modules_disobey2019
+endif
+
+ifdef CONFIG_HACKERHOTEL_BADGE_V1
+FROZEN_MPY_DIR = modules_hackerhotel2019
+endif
+
+ifdef CONFIG_HACKERHOTEL_BADGE_V0
+FROZEN_MPY_DIR = modules_hackerhotel2019
+endif
+
+ifdef CONFIG_SHA_BADGE_NONE
+FROZEN_MPY_DIR = modules_generic
+endif
 
 # include py core make definitions
 include ../py/py.mk
 
 PORT ?= /dev/ttyUSB0
 BAUD ?= 921600
+DISOBEY_PORT ?= /dev/ttyACM0
+DISOBEY_BAUD ?= 115200
 FLASH_MODE ?= dio
 FLASH_FREQ ?= 80m
 FLASH_SIZE ?= 16MB
@@ -166,17 +199,6 @@ SRC_C = \
 	ugfx_styles.c \
 	$(SRC_MOD)
 
-### TODO fix hardcoded images when we can't get image loader to work
-#BADGE_MAIN_SRC_C = $(addprefix ../../main/,\
-#	imgv2_menu.c \
-#	imgv2_nick.c \
-#	imgv2_sha.c \
-#	imgv2_test.c \
-#	imgv2_weather.c \
-#	madison_gurkha.c \
-#	leaseweb.c \
-#	)
-
 EXTMOD_SRC_C = $(addprefix extmod/,\
 	modonewire.c \
 	)
@@ -748,6 +770,19 @@ erase:
 	$(ECHO) "Erasing flash"
 	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) erase_flash
 
+deploy_disobey: $(BUILD)/firmware.bin
+	$(ECHO) "Writing $^ to the board"
+	$(Q)$(ESPTOOL) --before no_reset --after no_reset --chip esp32 --port $(DISOBEY_PORT) --baud $(DISOBEY_BAUD) write_flash -z --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) 0x1000 $^
+
+flash_disobey: $(BUILD)/firmware.bin
+	$(ECHO) "Writing $^ to the board"
+	$(Q)$(ESPTOOL) --before no_reset --after no_reset --port $(DISOBEY_PORT) --baud $(DISOBEY_BAUD) erase_region 0xd000 0x2000
+	$(Q)$(ESPTOOL) --before no_reset --after no_reset --port $(DISOBEY_PORT) --baud $(DISOBEY_BAUD) write_flash 0x10000 build/application.bin
+
+erase_disobey:
+	$(ECHO) "Erasing flash"
+	$(Q)$(ESPTOOL) --before no_reset --after no_reset --chip esp32 --port $(DISOBEY_PORT) --baud $(DISOBEY_BAUD) erase_flash
+
 ################################################################################
 # Declarations to build the application
 

esp32/board_framebuffer.h

@@ -0,0 +1,11 @@
+import badge, gc, uos
+
+badge.mount_root()
+uos.mount(uos.VfsNative(None), '/')
+
+try:
+	uos.mkdir('/lib')
+except:
+	pass
+
+gc.collect()

esp32/modules_disobey2019/_boot.py

@@ -0,0 +1,52 @@
+import ugfx, appglue, term, sys,time, version, easydraw
+
+names = [
+	"Niek Blankers", "Sebastian Oort", "Bas van Sisseren",
+	"Jeroen Domburg", "Christel Sanders", "Markus Bechtold",
+	"Thomas Roos", "Anne Jan Brouwer", "Renze Nicolai",
+	"Aram Verstegen", "Arnout Engelen", "Alexandre Dulaunoy",
+	"Eric Poulsen", "Damien P. George", "Heikki Juva",
+	"Teemu Hakala", "Kliment", "Windytan",
+	"Purkkaviritys", "Otto Raila", "Jaga",
+	"uGFX", "EMF Badge Team", "",
+	"", "Press back or start", "to quit!"]
+
+def action_exit(pushed):
+    if (pushed):
+        appglue.home()
+
+def show_names():
+	global names
+	c = False
+	y = 10
+	nos = 0
+	ugfx.clear()
+	
+	term.header(True, "About")
+	print("Developers:")
+	for n in range(0, len(names)):
+		if (names[n]==""):
+			break
+		print(" - "+names[n])
+	
+	nos = 9999
+	
+	for n in range(0, len(names)):
+		if (nos > 3):
+			if (nos < 900):
+				time.sleep(2)
+			nos = 0
+			easydraw.msg("", "Thank you!", True)
+		easydraw.msg(names[n])
+		nos += 1
+
+def main():
+    ugfx.input_init()
+    ugfx.input_attach(ugfx.BTN_B, action_exit)
+    ugfx.input_attach(ugfx.BTN_START, action_exit)
+    show_names()
+    sys.stdin.read(1) #Wait for any key
+    action_exit(True)
+    
+
+main()

esp32/modules_disobey2019/about.py

@@ -0,0 +1,24 @@
+import ugfx, esp, badge, deepsleep, term, easydraw
+
+def start_app(app, display = True):
+	if display:
+		easydraw.msg(app, "Loading...", True)
+		term.header(True, "Loading application "+app+"...")
+	esp.rtcmem_write_string(app)
+	deepsleep.reboot()
+
+def home():
+	start_app("")
+
+def start_ota():
+	term.header(True, "Starting OTA...")
+	esp.rtcmem_write(0,1)
+	esp.rtcmem_write(1,254)
+	deepsleep.reboot()
+
+#def start_bpp(duration):
+#	term.header(True, "Starting BPP...")
+#	print("[BPP] Duration = "+str(duration))
+#	esp.rtcmem_write(0,2)
+#	esp.rtcmem_write(1,253)
+#	deepsleep.reboot()

esp32/modules_disobey2019/appglue.py

@@ -0,0 +1,65 @@
+# This file is executed on every boot (including wake-boot from deepsleep)
+import badge, machine, esp, ugfx, sys, time
+badge.init()
+ugfx.init()
+ugfx.input_init()
+
+esp.rtcmem_write(0,0)
+esp.rtcmem_write(1,0)
+
+# setup timezone
+timezone = badge.nvs_get_str('system', 'timezone', 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00')
+time.settimezone(timezone)
+
+if badge.safe_mode():
+	splash = 'splash'
+else:
+	splash = badge.nvs_get_str('boot','splash','splash')
+
+if machine.reset_cause() != machine.DEEPSLEEP_RESET:
+	print('[BOOT] Cold boot')
+else:
+	print("[BOOT] Wake from sleep")
+	load_me = esp.rtcmem_read_string()
+	if load_me:
+		splash = load_me
+		print("starting %s" % load_me)
+		esp.rtcmem_write_string("")
+
+try:
+	if not splash=="shell":
+		if splash.startswith('bpp '):
+			splash = splash[4:len(splash)]
+			badge.mount_bpp()
+		elif splash.startswith('remfs '):
+			splash = splash[6:len(splash)]
+			badge.mount_remfs()
+		elif splash.startswith('sdcard '):
+			splash = splash[7:len(splash)]
+			badge.mount_sdcard()
+		
+		def back_button_default_action(pressed):
+			if pressed:
+				esp.rtcmem_write_string("")
+				machine.deepsleep(1)
+		ugfx.input_attach(ugfx.BTN_B, back_button_default_action)
+		
+		__import__(splash)
+	else:
+		ugfx.clear(ugfx.WHITE)
+		ugfx.flush(ugfx.LUT_FULL)
+except BaseException as e:
+	sys.print_exception(e)
+	import easydraw
+	easydraw.msg("","Fatal exception", True)
+
+	# if we started the splash screen and it is not the default splash screen,
+	# then revert to original splash screen.
+	if splash == badge.nvs_get_str('boot', 'splash', 'splash') and splash != 'splash':
+		print(">> Restored default splashscreen! <<")
+		badge.nvs_erase_key('boot', 'splash')
+	easydraw.msg(str(e))
+	import time
+	time.sleep(5)
+	import appglue
+	appglue.home()

esp32/modules_disobey2019/boot.py

@@ -0,0 +1,80 @@
+import tasks.otacheck as otacheck, easydraw, term, appglue, time, version, easywifi, badge, ugfx
+
+term.header(True, "Update check")
+print("Checking for updates...")
+print("")
+print("Currently installed:",version.name,"(Build "+str(version.build)+")")
+
+easydraw.msg("Current version:", "Update check", True)
+easydraw.msg_nosplit(str(version.build)+") "+version.name)
+time.sleep(3)
+available = 0
+
+badge.nvs_set_u8('badge','OTA.ready',0)
+
+def start(pressed):
+	if pressed:
+		appglue.start_ota()
+
+if not easywifi.status():
+	if not easywifi.enable():
+		easydraw.msg("Error: could not connect to WiFi!")
+
+title = "Update check"
+message = "?? Unknown state ??"
+		
+if easywifi.status():
+	info = otacheck.download_info()
+	if info:
+			print("Server has: ",info['name']," (Build "+str(info['build'])+")")
+			if info["build"] > version.build:
+				badge.nvs_set_u8('badge','OTA.ready',0)
+				print("Update available!")
+				badge.nvs_set_u8('badge','OTA.ready',1)
+				easydraw.msg("Update available!")
+				easydraw.msg_nosplit(str(info["build"])+") "+info["name"])
+				easydraw.msg("Update now?")
+				title = "Firmware update available"
+				message  = "A new firmware version is available. Update?\n"
+				message += "Currently installed: "+version.name+" (Build "+str(version.build)+")\n"
+				message += "Available          : "+info["name"]+" (Build "+str(info["build"])+")"
+			elif info["build"] < version.build:
+				badge.nvs_set_u8('badge','OTA.ready',0)
+				print("Server has an older version.")
+				badge.nvs_set_u8('badge','OTA.ready',1)
+				easydraw.msg("Downgrade available!")
+				easydraw.msg_nosplit(str(info["build"])+") "+info["name"])
+				easydraw.msg("Downgrade now?")
+				title = "Firmware downgrade available"
+				message  = "An older firmware version is available. Update?\n"
+				message += "Currently installed: "+version.name+" (Build "+str(version.build)+")\n"
+				message += "Available          : "+info["name"]+" (Build "+str(info["build"])+")"
+			else:
+				print("You are up-to-date!")
+				easydraw.msg("Up-to-date!")
+				easydraw.msg_nosplit(str(version.build)+") "+version.name)
+				easydraw.msg("Update anyway?")
+				title = "Up-to-date"
+				message = "You are up-to-date.\n"
+				message += "Currently installed: "+version.name+" (Build "+str(version.build)+")\n"
+				message += "Available          : "+info["name"]+" (Build "+str(info["build"])+")"
+	else:
+		print("An error occured!")
+		easydraw.msg("Check failed.")
+		easydraw.msg_nosplit(str(version.build)+") "+version.name)
+		easydraw.msg("Update anyway?")
+		title = "Update check"
+		message = "An error occured while fetching information. You can still choose to start the OTA procedure."
+else:
+	easydraw.msg("No WiFi!")
+	easydraw.msg_nosplit(str(version.build)+") "+version.name)
+	easydraw.msg("Update anyway?")
+	title = "Update check"
+	message = "Could not connect to the WiFi network. You can still choose to start the OTA procedure."
+
+ugfx.input_attach(ugfx.BTN_START, start)
+
+
+items = ["Cancel", "Start OTA update"]
+callbacks = [appglue.home, appglue.start_ota]
+callbacks[term.menu(title, items, 0, message)]()

esp32/modules_disobey2019/checkforupdates.py

@@ -0,0 +1,20 @@
+import machine, badge, term, time
+
+pin = machine.Pin(25)
+rtc = machine.RTC()
+rtc.wake_on_ext0(pin = pin, level = 0)
+
+def start_sleeping(sleepTime=0):
+	badge.off()
+	term.header(True, "Going to sleep...")
+	if (sleepTime >= 86400000): #One day
+		sleepTime = 0
+	if (sleepTime < 1):
+		print("Sleeping until touchbutton is pressed...")
+	else:
+		print("Sleeping for "+str(sleepTime)+"ms...")
+	time.sleep(0.1)
+	machine.deepsleep(sleepTime)
+
+def reboot():
+    machine.deepsleep(1)