Add safe-mode variable

basvs · basvs · commit 2ad714a23a42 · 2017-08-07T01:15:24.000+02:00
diff --git a/esp32/main.c b/esp32/main.c
@@ -35,6 +35,7 @@
 #include "esp_system.h"
 #include "esp_task.h"
 #include "soc/cpu.h"
+#include "rom/rtc.h"
 
 #include "sha2017_ota.h"
 #include "esprtcmem.h"
@@ -56,6 +57,7 @@
 #include "badge_base.h"
 #include "badge_first_run.h"
 #include <badge_input.h>
+#include <badge_button.h>
 #include <badge.h>
 
 // MicroPython runs as a task under FreeRTOS
@@ -64,11 +66,15 @@
 #define MP_TASK_STACK_LEN       (MP_TASK_STACK_SIZE / sizeof(StackType_t))
 #define MP_TASK_HEAP_SIZE       (88 * 1024)
 
+//define BUTTON_SAFE_MODE ((1 << BADGE_BUTTON_A) || (1 << BADGE_BUTTON_B))
+#define BUTTON_SAFE_MODE ((1 << BADGE_BUTTON_START))
+
 STATIC StaticTask_t mp_task_tcb;
 STATIC StackType_t mp_task_stack[MP_TASK_STACK_LEN] __attribute__((aligned (8)));
 STATIC uint8_t mp_task_heap[MP_TASK_HEAP_SIZE];
 
 extern uint32_t reset_cause;
+extern bool in_safe_mode;
 
 void mp_task(void *pvParameter) {
     volatile uint32_t sp = (uint32_t)get_sp();
@@ -176,6 +182,13 @@ void app_main(void) {
 		}
 
 	} else {
+		uint32_t reset_cause = rtc_get_reset_reason(0);
+		if (reset_cause != DEEPSLEEP_RESET) {
+			badge_init();
+			if ((badge_input_button_state & BUTTON_SAFE_MODE) == BUTTON_SAFE_MODE) {
+				in_safe_mode = true;
+			}
+		}
 		xTaskCreateStaticPinnedToCore(mp_task, "mp_task", MP_TASK_STACK_LEN, NULL, MP_TASK_PRIORITY,
 				&mp_task_stack[0], &mp_task_tcb, 0);
 	}
diff --git a/esp32/modbadge.c b/esp32/modbadge.c
@@ -242,6 +242,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_mpr121_get_touch_info_obj, badge_mpr121_g
 #endif // I2C_MPR121_ADDR
 
 
+bool in_safe_mode = false;
+STATIC mp_obj_t badge_safe_mode() {
+  return mp_obj_new_bool(in_safe_mode);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_safe_mode_obj, badge_safe_mode);
 // E-Ink (badge_eink.h)
 
 STATIC mp_obj_t badge_eink_init_() {
@@ -682,6 +687,8 @@ STATIC const mp_rom_map_elem_t badge_module_globals_table[] = {
     {MP_OBJ_NEW_QSTR(MP_QSTR_unmount_sdcard), (mp_obj_t)&badge_unmount_sdcard_obj},
     {MP_OBJ_NEW_QSTR(MP_QSTR_mount_bpp), (mp_obj_t)&badge_mount_bpp_obj},
 
+    {MP_OBJ_NEW_QSTR(MP_QSTR_safe_mode), (mp_obj_t)&badge_safe_mode_obj},
+
 };
 
 STATIC MP_DEFINE_CONST_DICT(badge_module_globals, badge_module_globals_table);
