acamilo
diff --git a/‎ports/esp32/machine_touchpad.c
Lines changed: 6 additions & 0 deletions b/‎ports/esp32/machine_touchpad.c
Lines changed: 6 additions & 0 deletions
diff --git a/‎ports/esp32/modules/gxgde0213b1.py
Lines changed: 5 additions & 2 deletions b/‎ports/esp32/modules/gxgde0213b1.py
Lines changed: 5 additions & 2 deletions
diff --git a/‎ports/esp32/modules/ohsbadge.py
Lines changed: 25 additions & 9 deletions b/‎ports/esp32/modules/ohsbadge.py
Lines changed: 25 additions & 9 deletions
@@ -129,11 +129,17 @@ STATIC mp_obj_t mtp_callback(mp_obj_t self_in, mp_obj_t callback) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mtp_callback_obj, mtp_callback);
 
+STATIC mp_obj_t mtp_wake_reason(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return MP_OBJ_NEW_SMALL_INT(esp_sleep_get_touchpad_wakeup_status());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mtp_wake_reason_obj, 0,  mtp_wake_reason);
+
 STATIC const mp_rom_map_elem_t mtp_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&mtp_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mtp_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&mtp_callback_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wake_reason), MP_ROM_PTR(&mtp_wake_reason_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mtp_locals_dict, mtp_locals_dict_table);
 
@@ -30,6 +30,9 @@ def __init__(self, reset, dc, busy, cs):
 		self.height = EPD_HEIGHT
 		self.rotate = ROTATE_0
 
+	def __del__(self):
+		self.spi.deinit()
+
 	def free(self):
 		self.spi.deinit()
 
@@ -274,17 +277,17 @@ def draw_custom_font_char(self,frame_buffer,x,y,size,char,font,color):
 			xx = 0
 			while (xx<w):
 				#
-				bit += 1
 				if (bit%8 == 0):
-					bo += 1
 					bits = font.Bitmaps[bo]
+					bo += 1
 				if (bits&0x80 == 0x80):
 					if size==1:
 						self.set_pixel(frame_buffer,x+xo+xx,y+yo+yy,color)
 						xp = x + (xo16 + xx) * size
 						yp = y + (yo16 + yy) * size
 						self.draw_filled_rectangle(frame_buffer,xp,yp,size, size, color)
+				bit += 1
 				bits = bits<<1
 				xx += 1
 			yy += 1
 
@@ -9,6 +9,7 @@
 import ubinascii
 import urandom
 import machine
+import time
 from microWebSrv import MicroWebSrv
 
 #initialize the epaper
@@ -105,11 +106,20 @@ def _httpHandlerTestPost(httpClient, httpResponse) :
 	goto_deepsleep()
 
 def goto_deepsleep():
-	#go to deepsleep wait for user to press the send button
-	button = machine.TouchPad(machine.Pin(33))
-	reading = button.read()
-	button.config(int(2/3 * reading))
-	button.callback(lambda t:print("Pressed"))
+	#go to deepsleep wait for user to press one of the buttons
+	button1 = machine.TouchPad(machine.Pin(33))
+	time.sleep_ms(100)
+	reading = button1.read()
+	button1.config(int(2/3 * reading))
+	button1.callback(lambda t:print("Pressed 33"))
+
+	button2 = machine.TouchPad(machine.Pin(32))
+	time.sleep_ms(100)
+	reading = button1.read()
+	reading = button2.read()
+	button2.config(int(2/3 * reading))
+	button2.callback(lambda t:print("Pressed 32"))
+
 	machine.deepsleep()
 
 def start_web_server():
@@ -128,10 +138,16 @@ def start():
 	epd.display_frame(fb)
 
 	if machine.wake_reason() == machine.TOUCHPAD_WAKE:
-		#go into AP mode
-		#TODO add support for detecting which button cause the wakeup
-		start_ap_mode()
-		start_web_server()
+		if machine.TouchPad.wake_reason() == 9:
+			#go into AP mode
+			#TODO add support for detecting which button cause the wakeup
+			start_ap_mode()
+			start_web_server()
+		else:
+			epd.clear_frame(fb)
+			epd.display_string_at(fb, 0, 0, "OHS 2018", font24, gxgde0213b1.COLORED)
+			epd.display_string_at(fb, 0, 24, "Serial REPL Mode", font16, gxgde0213b1.COLORED)
+			epd.display_frame(fb)
 	else:
 		goto_deepsleep()