Merge branch 'master' into dialogs-and-more-emf-porting

annejan · annejan · commit 614bd48384ad · 2017-07-04T10:41:24.000+02:00
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -143,6 +143,7 @@ SRC_C = \
 	machine_rtc.c \
 	machine_hw_spi.c \
 	mpthreadport.c \
+	badge_base.c \
 	badge_eink.c \
 	badge_i2c.c \
 	badge_leds.c \
diff --git a/esp32/badge_base.c b/esp32/badge_base.c
@@ -0,0 +1 @@
+../../components/badge/badge_base.c
diff --git a/esp32/badge_base.h b/esp32/badge_base.h
@@ -0,0 +1 @@
+../../components/badge/badge_base.h
diff --git a/esp32/modbadge.c b/esp32/modbadge.c
@@ -73,6 +73,17 @@ STATIC mp_obj_t badge_display_picture_(mp_obj_t picture_id,
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(badge_display_picture_obj,
                                  badge_display_picture_);
 
+ STATIC mp_obj_t badge_eink_busy_() {
+   return mp_obj_new_bool(badge_eink_dev_is_busy());
+ }
+ STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_eink_busy_obj, badge_eink_busy_);
+
+ STATIC mp_obj_t badge_eink_busy_wait_() {
+   badge_eink_dev_busy_wait();
+   return mp_const_none;
+ }
+ STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_eink_busy_wait_obj, badge_eink_busy_wait_);
+
 // Power
 
 STATIC mp_obj_t badge_power_init_() {
@@ -196,6 +207,9 @@ STATIC const mp_rom_map_elem_t badge_module_globals_table[] = {
     {MP_OBJ_NEW_QSTR(MP_QSTR_vibrator_activate), (mp_obj_t)&badge_vibrator_activate_obj},
 #endif
 
+    {MP_ROM_QSTR(MP_QSTR_eink_busy), MP_ROM_PTR(&badge_eink_busy_obj)},
+    {MP_ROM_QSTR(MP_QSTR_eink_busy_wait), MP_ROM_PTR(&badge_eink_busy_wait_obj)},
+
     {MP_ROM_QSTR(MP_QSTR_display_picture),
      MP_ROM_PTR(&badge_display_picture_obj)},
 
diff --git a/esp32/modbadge.h b/esp32/modbadge.h
@@ -6,6 +6,7 @@
 #include "badge.h"
 #include "badge_pins.h"
 #include "badge_eink.h"
+#include "badge_eink_dev.h"
 #include "badge_power.h"
 #include "badge_leds.h"
 #include "badge_vibrator.h"
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -44,8 +44,8 @@ def run_it(pushed):
 ugfx.input_attach(ugfx.BTN_A, run_it)
 ugfx.input_attach(ugfx.BTN_B, run_it)
 
-ugfx.input_attach(ugfx.JOY_UP, lambda x: ugfx.flush())
-ugfx.input_attach(ugfx.JOY_DOWN, lambda x: ugfx.flush())
+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)
 
 ugfx.flush()
 time.sleep(0.2)
diff --git a/unix/modbadge.c b/unix/modbadge.c
@@ -69,6 +69,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(badge_display_picture_obj,
                                  badge_display_picture_);
 */
 
+STATIC mp_obj_t badge_eink_busy_() {
+  return mp_obj_new_bool(false);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_eink_busy_obj, badge_eink_busy_);
+
+STATIC mp_obj_t badge_eink_busy_wait_() {
+  // badge_eink_dev_busy_wait();
+  return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(badge_eink_busy_wait_obj, badge_eink_busy_wait_);
+
 // Power
 
 STATIC mp_obj_t badge_power_init_() {
@@ -203,6 +214,9 @@ STATIC const mp_rom_map_elem_t mock_badge_module_globals_table[] = {
   {MP_OBJ_NEW_QSTR(MP_QSTR_vibrator_init), (mp_obj_t)&badge_vibrator_init_obj},
   {MP_OBJ_NEW_QSTR(MP_QSTR_vibrator_activate), (mp_obj_t)&badge_vibrator_activate_obj},
 
+  {MP_ROM_QSTR(MP_QSTR_eink_busy), MP_ROM_PTR(&badge_eink_busy_obj)},
+  {MP_ROM_QSTR(MP_QSTR_eink_busy_wait), MP_ROM_PTR(&badge_eink_busy_wait_obj)},
+
   // {MP_ROM_QSTR(MP_QSTR_display_picture),
   //  MP_ROM_PTR(&badge_display_picture_obj)},
 
