Merge pull request SHA2017-badge#63 from rnplus/master

annejan · web-flow · commit 00df83d91e18 · 2017-07-15T20:01:36.000+02:00
Remove esp.start_sleeping (use machine.deepsleep instead). Add services to splash.py.
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -155,7 +155,6 @@ SRC_C = \
 	machine_hw_spi.c \
 	mpthreadport.c \
 	esprtcmem.c \
-	espdeepsleep.c \
 	ugfx_containers.c \
 	ugfx_widgets.c \
 	ugfx_styles.c \
diff --git a/esp32/espdeepsleep.c b/esp32/espdeepsleep.c
diff --git a/esp32/espdeepsleep.h b/esp32/espdeepsleep.h
diff --git a/esp32/modesp.c b/esp32/modesp.c
@@ -167,12 +167,6 @@ STATIC mp_obj_t esp_rtc_get_reset_reason_(mp_obj_t cpu) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_rtc_get_reset_reason_obj,
                                  esp_rtc_get_reset_reason_);
 
-STATIC mp_obj_t esp_start_sleeping_(mp_obj_t time) {
-  esp_start_sleeping(mp_obj_get_int(time));
-  return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_start_sleeping_obj, esp_start_sleeping_);
-
 #if MICROPY_SDMMC_USE_DRIVER
 
 // ======== SD Card support ===========================================================================
@@ -356,8 +350,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_rtc_get_reset_reason),
      MP_ROM_PTR(&esp_rtc_get_reset_reason_obj)},
 
-    {MP_ROM_QSTR(MP_QSTR_start_sleeping), MP_ROM_PTR(&esp_start_sleeping_obj)},
-
     {MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj)},
 
     #if MICROPY_SDMMC_USE_DRIVER
diff --git a/esp32/modesp.h b/esp32/modesp.h
@@ -1,3 +1,2 @@
 #include "esprtcmem.h"
-#include "espdeepsleep.h"
 #include "esp_spi_flash.h"
diff --git a/esp32/modules/appglue.py b/esp32/modules/appglue.py
@@ -0,0 +1,9 @@
+import ugfx, esp, badge, deepsleep
+
+def start_app(app):
+    ugfx.clear(ugfx.WHITE)
+    ugfx.string(0,  0, "Starting "+app+"...","Roboto_Regular12",ugfx.BLACK)
+    ugfx.flush()
+    esp.rtcmem_write_string(app)
+    badge.eink_busy_wait()
+    deepsleep.reboot()
diff --git a/esp32/modules/deepsleep.py b/esp32/modules/deepsleep.py
@@ -1,14 +1,11 @@
-# RTC memory driver for MicroPython on ESP32
-# MIT license; Copyright (c) 2017 Renze Nicolai
-
 import machine as m
 
 p = m.Pin(25)
 r = m.RTC()
 r.wake_on_ext0(pin = p, level = 0)
 
-def start_sleeping(self, time=0):
+def start_sleeping(time=0):
     m.deepsleep(time)
 
-def reboot(self):
+def reboot():
     m.deepsleep(1)
diff --git a/esp32/modules/installer.py b/esp32/modules/installer.py
@@ -5,6 +5,7 @@
 import network, wifi
 import machine, esp, time
 import urequests as requests
+import appglue
 
 wifi.init()
 
@@ -50,9 +51,7 @@ def start_app(pushed):
         ugfx.string(100,75, packages[options.selected_index()]["name"],"PermanentMarker22",ugfx.WHITE)
         ugfx.flush()
         selected = packages[options.selected_index()]["slug"]
-        esp.rtcmem_write_string(selected)
-        badge.eink_busy_wait()
-        esp.start_sleeping(1)
+        appglue.start_app(selected)
 
 ugfx.input_init()
 
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -4,6 +4,7 @@
 import ujson as json
 import time
 import esp
+import appglue
 
 ugfx.init()
 ugfx.input_init()
@@ -45,8 +46,7 @@ def run_it(pushed):
         ugfx.string(100,75, selected,"PermanentMarker22",ugfx.WHITE)
         ugfx.flush()
         badge.eink_busy_wait()
-        esp.rtcmem_write_string(selected)
-        esp.start_sleeping(1)
+        appglue.start_app(selected)
 
 def expandhome(s):
     if "~/" in s:
diff --git a/esp32/modules/ota_update.py b/esp32/modules/ota_update.py
@@ -1,5 +1,5 @@
-import esp
+import esp, deepsleep
 
 esp.rtcmem_write(0,1)
 esp.rtcmem_write(1,~1)
-esp.start_sleeping(1)
+deepsleep.reboot()
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`#include "esprtcmem.h"`
`2`		`-#include "espdeepsleep.h"`
`3`	`2`	`#include "esp_spi_flash.h"`