sync with ui

Author: Dreagonmon

lib/ui/dialog.py

@@ -2,8 +2,7 @@
 from hal_keypad import parse_key_event, KEY_A, KEY_B, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, EVENT_KEY_PRESS
 from graphic.framebuf_helper import get_white_color
 from buildin_resource.font import get_font_8px
-from ui.utils import PagedText, draw_buttons_at_last_line, draw_label_header
-from machine import lightsleep
+from ui.utils import PagedText, draw_buttons_at_last_line, draw_label_header, sleep_save_power
 from play32hw.cpu import cpu_speed_context, VERY_SLOW, FAST
 
 def dialog(text="", title="", text_yes="OK", text_no="OK"):
@@ -14,7 +13,7 @@ def dialog(text="", title="", text_yes="OK", text_no="OK"):
         for v in dialog_gen(text, title, text_yes, text_no):
             if v != None:
                 return v
-            lightsleep(33) # save power
+            sleep_save_power() # save power
 
 def dialog_gen(text="", title="", text_yes="OK", text_no="OK"):
     WHITE = get_white_color(hal_screen.get_format())

lib/ui/input.py

@@ -2,8 +2,7 @@
 from hal_keypad import parse_key_event, KEY_A, KEY_B, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, EVENT_KEY_PRESS
 from graphic.framebuf_helper import get_white_color
 from buildin_resource.font import get_font_8px
-from ui.utils import draw_buttons_at_last_line, draw_label_header
-from machine import lightsleep
+from ui.utils import draw_buttons_at_last_line, draw_label_header, sleep_save_power
 from play32hw.cpu import cpu_speed_context, VERY_SLOW, FAST
 
 def input_slide(title="", text_yes="OK", text_no="CANCEL", slide_start = 0, slide_size = 100):
@@ -14,7 +13,7 @@ def input_slide(title="", text_yes="OK", text_no="CANCEL", slide_start = 0, slid
         for v in input_slide_gen(title, text_yes, text_no, slide_start, slide_size):
             if v != None:
                 return v
-            lightsleep(33) # save power
+            sleep_save_power() # save power
 
 def input_slide_gen(title="", text_yes="OK", text_no="CANCEL", slide_start = 0, slide_size = 100):
     assert slide_start >= 0

lib/ui/input_text.py

@@ -11,8 +11,7 @@
 from hal_keypad import parse_key_event, KEY_A, KEY_B, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, EVENT_KEY_PRESS
 from graphic.framebuf_helper import get_white_color
 from buildin_resource.font import get_font_8px
-from ui.utils import draw_label_nav, draw_label_header, draw_button, draw_label_invert
-from machine import lightsleep
+from ui.utils import draw_label_nav, draw_label_header, draw_button, draw_label_invert, sleep_save_power
 from play32hw.cpu import cpu_speed_context, VERY_SLOW, FAST
 from ui._input_method import InputMethod
 from ui.select import select_list_gen
@@ -252,7 +251,7 @@ def input_text(text="", title="Edit Text"):
         for v in input_text_gen(text, title):
             if v != None:
                 return v
-            lightsleep(15) # save power
+            sleep_save_power() # save power
 
 def input_text_gen(text="", title="Edit Text"):
     # test

lib/ui/select.py

@@ -2,8 +2,7 @@
 from hal_keypad import parse_key_event, KEY_A, KEY_B, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, EVENT_KEY_PRESS
 from graphic.framebuf_helper import get_white_color
 from buildin_resource.font import get_font_8px
-from ui.utils import PagedText, draw_buttons_at_last_line, draw_label_nav, draw_label_header
-from machine import lightsleep
+from ui.utils import PagedText, draw_buttons_at_last_line, draw_label_nav, draw_label_header, sleep_save_power
 from play32hw.cpu import cpu_speed_context, VERY_SLOW, FAST
 
 def select_menu(text="", title="", options=[], text_yes="OK", text_no="CANCEL"):
@@ -14,7 +13,7 @@ def select_menu(text="", title="", options=[], text_yes="OK", text_no="CANCEL"):
         for v in select_menu_gen(text, title, options, text_yes, text_no):
             if v != None:
                 return v
-            lightsleep(33) # save power
+            sleep_save_power() # save power
 
 def select_menu_gen(text="", title="", options=[], text_yes="OK", text_no="CANCEL"):
     WHITE = get_white_color(hal_screen.get_format())
@@ -80,7 +79,7 @@ def select_list(title="", options=[], text_yes="OK", text_no="CANCEL"):
         for v in select_list_gen(title, options, text_yes, text_no):
             if v != None:
                 return v
-            lightsleep(33) # save power
+            sleep_save_power() # save power
 
 def select_list_gen(title="", options=[], text_yes="OK", text_no="CANCEL"):
     WHITE = get_white_color(hal_screen.get_format())

lib/ui/select_file.py

@@ -1,4 +1,4 @@
-from machine import lightsleep
+from ui.utils import sleep_save_power
 from play32hw.cpu import cpu_speed_context, VERY_SLOW
 import uos
 from play32sys import path
@@ -21,7 +21,7 @@ def select_file(cwd=None, title="Files", text_yes="OK", text_no="CANCEL", f_file
         for v in select_file_gen(cwd, title, text_yes, text_no, f_file, f_dir):
             if v != None:
                 return v
-            lightsleep(33) # save power
+            sleep_save_power() # save power
 
 def select_file_gen(cwd=None, title="Files", text_yes="OK", text_no="CANCEL", f_file=True, f_dir=True):
     if cwd == None:

lib/ui/utils.py

@@ -1,4 +1,7 @@
 from graphic.bmfont import get_text_count
+from machine import lightsleep
+
+sleep_time_ms = 15
 
 class PagedText:
     def __init__(self, text, area_w, area_h, font_w, font_h, scroll_bar=None, style_inline=False):
@@ -159,3 +162,10 @@ def draw_buttons_at_last_line(frame, frame_w, frame_h, font_draw, color_white, t
     else:
         draw_button(frame, 0, base_y, frame_w // 2 - 1, FH, font_draw, color_white, text_no)
         draw_button(frame, frame_w // 2 + 1, base_y, frame_w // 2 - 1, FH, font_draw, color_white, text_yes)
+
+def sleep_save_power():
+    lightsleep(sleep_time_ms)
+
+def set_sleep_time(val_ms):
+    global sleep_time_ms
+    sleep_time_ms = val_ms