Merge pull request SHA2017-badge#1 from SHA2017-badge/master

renzenicolai · web-flow · commit 8cf2e4e3cd85 · 2017-07-15T19:42:56.000+02:00
Ignore this...
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -31,7 +31,7 @@ ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 BADGE = $(IDF_PATH)/..
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := c9c8840c88f966e4c25e29051936abb46fac8bb3
+ESPIDF_SUPHASH := 4c62fb9c3f52bd3e753aed06208d14aef4d48a0b
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -96,6 +96,8 @@ INC += -I$(ESPCOMP)/freertos/include/freertos
 INC += -I$(ESPCOMP)/app_update/include
 INC += -I$(ESPCOMP)/bootloader_support/include_priv
 INC += -I$(ESPCOMP)/sdmmc/include
+INC += -I$(ESPCOMP)/heap/include
+INC += -I$(ESPCOMP)/soc/include
 
 CFLAGS = -std=gnu99 -Os -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM  $(INC)
 CFLAGS += -DIDF_VER=\"$(IDF_VER)\"
@@ -252,7 +254,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	gdbstub.o \
 	crosscore_int.o \
 	deep_sleep.o \
-	heap_alloc_caps.o \
 	ipc.o \
 	int_wdt.o \
 	event_loop.o \
@@ -265,16 +266,23 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	phy_init.o \
 	intr_alloc.o \
 	dport_access.o \
+	brownout.o \
+	)
+
+ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
+	heap_caps.o \
+	heap_caps_init.o \
+	multi_heap.o \
 	)
 
 ESPIDF_SOC_O = $(addprefix $(ESPCOMP)/soc/,\
-	esp32/brownout.o \
 	esp32/cpu_util.o \
 	esp32/rtc_clk.o \
 	esp32/rtc_init.o \
 	esp32/rtc_pm.o \
 	esp32/rtc_sleep.o \
 	esp32/rtc_time.o \
+	esp32/soc_memory_layout.o \
 	)
 
 ESPIDF_CXX_O = $(addprefix $(ESPCOMP)/cxx/,\
@@ -324,8 +332,6 @@ ESPIDF_FREERTOS_O = $(addprefix $(ESPCOMP)/freertos/,\
 	croutine.o \
 	event_groups.o \
 	FreeRTOS-openocd.o \
-	heap_regions_debug.o \
-	heap_regions.o \
 	list.o \
 	portasm.o \
 	port.o \
@@ -621,6 +627,7 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_WPA_SUPPLICANT_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_APP_UPDATE_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_BOOTLOADER_O))
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_SDMMC_O))
+OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_HEAP_O))
 
 ####################
 # Badge magic
diff --git a/esp32/modules/dialogs.py b/esp32/modules/dialogs.py
@@ -3,7 +3,7 @@
 ### Description: Some basic UGFX powered dialogs
 ### License: MIT
 
-import ugfx, badge, utime as time
+import ugfx, utime as time
 
 wait_for_interrupt = True
 button_pushed = ''
diff --git a/esp32/modules/inisetup.py b/esp32/modules/inisetup.py
@@ -46,7 +46,7 @@ def setup():
     print("wake from sleep")
     load_me = esp.rtcmem_read_string()
     if load_me != "":
-        print("starting %s", load_me)
+        print("starting %s" % load_me)
         esp.rtcmem_write_string("")
         __import__(load_me)
     else:
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -18,18 +18,23 @@
 ugfx.string(170,75,"Anyway","Roboto_BlackItalic24",ugfx.BLACK)
 ugfx.string(155,105,"MOTD: NVS","Roboto_Regular18",ugfx.BLACK)
 
-options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
+options = None
+install_path = None
 
-try:
-    apps = os.listdir('lib')
-except OSError:
-    apps = []
+def populate_it():
+    global options
+    options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
 
-options.add_item('installer')
-options.add_item('ota_update')
+    try:
+        apps = os.listdir('lib')
+    except OSError:
+        apps = []
 
-for app in apps:
-    options.add_item(app)
+    options.add_item('installer')
+    options.add_item('ota_update')
+
+    for app in apps:
+        options.add_item(app)
 
 def run_it(pushed):
     if (pushed):
@@ -43,8 +48,51 @@ def run_it(pushed):
         badge.eink_busy_wait()
         appglue.start_app(selected)
 
+def expandhome(s):
+    if "~/" in s:
+        h = os.getenv("HOME")
+        s = s.replace("~/", h + "/")
+    return s
+
+def get_install_path():
+    global install_path
+    if install_path is None:
+        # sys.path[0] is current module's path
+        install_path = sys.path[1]
+    install_path = expandhome(install_path)
+    return install_path
+
+
+def uninstall_it(pushed):
+    if (pushed):
+        selected = options.selected_text()
+        if selected == 'installer':
+            return
+        if selected == 'ota_update':
+            return
+        options.destroy()
+        import dialogs
+        print(selected)
+        uninstall = dialogs.prompt_boolean('Are you sure you want to remove %s?' % selected)
+        print(uninstall)
+        if uninstall:
+            ugfx.clear(ugfx.BLACK)
+            ugfx.string(40,25,"Uninstalling:","Roboto_BlackItalic24",ugfx.WHITE)
+            ugfx.string(100,75, selected,"PermanentMarker22",ugfx.WHITE)
+            ugfx.flush()
+            install_path = get_install_path()
+            for rm_file in os.listdir("%s/%s" % (install_path, selected)):
+                os.remove("%s/%s/%s" % (install_path, selected, rm_file))
+            os.rmdir("%s/%s" % (install_path, selected))
+        badge.eink_busy_wait()
+        esp.rtcmem_write_string('launcher')
+        esp.start_sleeping(1)
+
+
+populate_it()
+
 ugfx.input_attach(ugfx.BTN_A, run_it)
-ugfx.input_attach(ugfx.BTN_B, run_it)
+ugfx.input_attach(ugfx.BTN_B, uninstall_it)
 
 ugfx.input_attach(ugfx.JOY_UP, lambda pushed: ugfx.flush() if pushed else 0)
 ugfx.input_attach(ugfx.JOY_DOWN, lambda pushed: ugfx.flush() if pushed else 0)
