bpp changes by @Spritetm

annejan · annejan · commit dcd6b3eaba75 · 2017-07-17T00:20:15.000+02:00
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -54,6 +54,10 @@ INC += -I../../components/badge
 INC += -I../../components/ugfx
 INC += -I../../components/graph
 INC += -I../../components/sha2017
+INC += -I../../components/bpp-recv
+INC += -I../../components/bpp-if
+INC += -I../../components/ed25519/include
+INC += -I../../components/redundancy
 INC += -I../../main
 INC += -I../../ugfx/src/gdisp/mcufont
 INC += -I../../ugfx
@@ -155,6 +159,7 @@ SRC_C = \
 	machine_hw_spi.c \
 	mpthreadport.c \
 	esprtcmem.c \
+	espdeepsleep.c \
 	ugfx_containers.c \
 	ugfx_widgets.c \
 	ugfx_styles.c \
@@ -661,6 +666,15 @@ BADGE_COMPONENTS_O = $(addprefix $(BADGE)/components/,\
 	sha2017/sha2017_ota.o \
 	)
 
+#Re-use libraries built while building non-micro-python project. Because kindly
+#fuck off with your ignore-all-esp-idf-and-make-me-state-every-single-thing-again-conventions
+#micropython makefile crap. Yes, I'm salty about that.
+BADGE_LIBS += ../../build/ed25519/libed25519.a
+BADGE_LIBS += ../../build/bpp-if/libbpp-if.a
+BADGE_LIBS += ../../build/bpp-recv/libbpp-recv.a
+BADGE_LIBS += ../../build/redundancy/libredundancy.a
+
+
 OBJ_ESPIDF += $(addprefix $(BUILD)/, $(BADGE_COMPONENTS_O))
 
 ################################################################################
@@ -698,6 +712,7 @@ APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libc.a
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libm.a
 APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
+APP_LD_ARGS += $(BADGE_LIBS)
 APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist
 APP_LD_ARGS += $(OBJ)
 APP_LD_ARGS += --end-group
diff --git a/esp32/main.c b/esp32/main.c
@@ -51,6 +51,10 @@
 #include "uart.h"
 #include "modmachine.h"
 #include "mpthreadport.h"
+#include "badge_portexp.h"
+#include "badge_pins.h"
+#include "bpp_init.h"
+#include "driver/gpio.h"
 
 // MicroPython runs as a task under FreeRTOS
 #define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
@@ -121,10 +125,38 @@ void mp_task(void *pvParameter) {
     goto soft_reset;
 }
 
+void do_bpp_bgnd() {
+	//Kick off bpp
+	bpp_init();
+	printf("Bpp inited.\n");
+	//immediately abort and reboot when touchpad detects something
+	while(gpio_get_level(PIN_NUM_MPR121_INT)==1) {
+		vTaskDelay(10);
+	}
+	printf("Touch detected. Exiting bpp, rebooting.\n");
+    esp_restart();
+}
+
 void app_main(void) {
     uint8_t magic = esp_rtcmem_read(0);
     uint8_t inv_magic = esp_rtcmem_read(1);
 
+	//Grab level of int pin of touchpad. If high, this was a
+	//scheduled wakeup because of a deep sleep timeout. If low,
+	//the user used the touchpad.
+	//yes, this is v1 specific. Please add v0.x support yourself.
+	gpio_config_t io_conf = {
+		.mode         = GPIO_MODE_INPUT,
+		.pin_bit_mask = 1LL << PIN_NUM_MPR121_INT,
+		.pull_down_en = 0,
+		.pull_up_en   = 1,
+	};
+	gpio_config(&io_conf);
+	if (gpio_get_level(PIN_NUM_MPR121_INT)==1) {
+		printf("Touch int is high. Starting bpp.\n");
+		do_bpp_bgnd();
+	}
+
     if (magic == (uint8_t)~inv_magic) {
       printf("Magic checked out!\n");
         switch (magic) {
