Merge branch 'master' of github.com:SHA2017-badge/micropython-esp32

Author: chca42

esp32/modugfx.c

@@ -62,6 +62,7 @@ uint8_t target_lut;
 
 typedef struct _ugfx_obj_t { mp_obj_base_t base; } ugfx_obj_t;
 
+extern bool ugfx_screen_flipped;
 static orientation_t get_orientation(int a){
 	if (a == 90)
 		return GDISP_ROTATE_90;
@@ -146,11 +147,19 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(ugfx_get_lut_obj, ugfx_get_lut);
 STATIC mp_obj_t ugfx_set_orientation(mp_uint_t n_args, const mp_obj_t *args) {
 	if (n_args > 0){
 		int a = mp_obj_get_int(args[0]);
+		a %= 360;
+		if (a >= 180) {
+			ugfx_screen_flipped = true;
+			a -= 180;
+		}
 		gdispSetOrientation(get_orientation(a));
-
 	}
 
-    return mp_obj_new_int(gdispGetOrientation());
+	int a = gdispGetOrientation();
+	if (ugfx_screen_flipped)
+		a += 180;
+	a %= 360;
+    return mp_obj_new_int(a);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ugfx_set_orientation_obj, 0, 1, ugfx_set_orientation);
 

esp32/modules/badge_event_reminder.py

@@ -11,7 +11,7 @@ def exit(p):
 ugfx.string(0, 25+13*2, "some nice numbers and an overview of what all", "Roboto_Regular12", ugfx.BLACK)
 ugfx.string(0, 25+13*3, "of you are doing with it.", "Roboto_Regular12", ugfx.BLACK)
 
-ugfx.string(0, 25+13*5, "The events starts now, in room 'No'!", "Roboto_Regular12", ugfx.BLACK)
+ugfx.string(0, 25+13*5, "The events starts now, in room 'Pa'!", "Roboto_Regular12", ugfx.BLACK)
 ugfx.string(0, ugfx.height()-13, "Press any key to close reminder.", "Roboto_Regular12", ugfx.BLACK)
 ugfx.set_lut(ugfx.LUT_FULL)
 ugfx.flush()

esp32/modules/easydraw.py

@@ -39,15 +39,15 @@ def nickname(y = 25, font = "PermanentMarker36", color = ugfx.BLACK):
     nick = badge.nvs_get_str("owner", "name", 'Henk de Vries')
     ugfx.string_box(0,y,296,38, nick, font, color, ugfx.justifyCenter)
 
-def battery(vUsb, vBatt, charging):
+def battery(on_usb, vBatt, charging):
     vMin = badge.nvs_get_u16('batt', 'vmin', 3500) # mV
     vMax = badge.nvs_get_u16('batt', 'vmax', 4100) # mV
-    if charging and vUsb>4000:
+    if charging and on_usb:
         try:
             badge.eink_png(0,0,'/lib/resources/chrg.png')
         except:
             ugfx.string(0, 0, "CHRG",'Roboto_Regular12',ugfx.BLACK)
-    elif vUsb>4000:
+    elif on_usb:
         try:
             badge.eink_png(0,0,'/lib/resources/usb.png')
         except:

esp32/modules/splash.py

@@ -50,12 +50,12 @@ def disp_string_right(y, s):
 
         easydraw.nickname()
 
-        vUsb = badge.usb_volt_sense()
+        on_usb = pm.usb_attached()
         vBatt = badge.battery_volt_sense()
         vBatt += vDrop
         charging = badge.battery_charge_status()
 
-        easydraw.battery(vUsb, vBatt, charging)
+        easydraw.battery(on_usb, vBatt, charging)
 
         if vBatt>500:
             ugfx.string(52, 0, str(round(vBatt/1000, 1)) + 'v','Roboto_Regular12',ugfx.BLACK)
@@ -123,7 +123,7 @@ def onSleep(idleTime):
 ### PROGRAM
 
 # Calibrate battery voltage drop
-if badge.battery_charge_status() == False and badge.usb_volt_sense() > 4500 and badge.battery_volt_sense() > 2500:
+if badge.battery_charge_status() == False and pm.usb_attached() and badge.battery_volt_sense() > 2500:
     badge.nvs_set_u16('splash', 'bat.volt.drop', 5200 - badge.battery_volt_sense()) # mV
     print('Set vDrop to: ' + str(4200 - badge.battery_volt_sense()))
 vDrop = badge.nvs_get_u16('splash', 'bat.volt.drop', 1000) - 1000 # mV
@@ -174,7 +174,6 @@ def onSleep(idleTime):
 easywifi.disable()
 gc.collect()
 
-virtualtimers.debug(True)
 virtualtimers.activate(25)
 pm.callback(onSleep)
 pm.feed()

esp32/modules/tasks/badgeeventreminder.py

@@ -6,7 +6,8 @@
 
 import virtualtimers, time, appglue, badge
 
-whenToTrigger = 1502196900 - 600
+# Tue Aug  8 13:30:00 2017 (CEST)
+whenToTrigger = 1502191800 - 600
 
 def ber_task():
     global whenToTrigger

esp32/modules/tasks/powermanagement.py

@@ -11,14 +11,17 @@
 
 userResponseTime = badge.nvs_get_u16('splash', 'urt', 5000)
 
+def usb_attached():
+    return badge.usb_volt_sense() > 4500
+
 def pm_task():
     ''' The power management task [internal function] '''
     global requestedStandbyTime
 
     idleTime = virtualtimers.idle_time()
-    print("[Power management] Next task wants to run in "+str(idleTime)+" ms.")
-        
-    if idleTime>30000 and not badge.safe_mode():
+    #print("[Power management] Next task wants to run in "+str(idleTime)+" ms.")
+
+    if idleTime > 30000 and not badge.safe_mode() and not ( usb_attached() and badge.nvs_get_u8('badge', 'usb_stay_awake', 0) != 0 ):
         global onSleepCallback
         if not onSleepCallback==None:
             print("[Power management] Running onSleepCallback...")

unix/modbadge.c

@@ -235,3 +235,5 @@ const mp_obj_module_t mock_badge_module = {
     .base = {&mp_type_module},
     .globals = (mp_obj_dict_t *)&mock_badge_module_globals,
 };
+
+bool ugfx_screen_flipped = false;