update to MH 0.7

Author: echo-lalia

ports/esp32/boards/MICROHYDRA/launcher/launcher.py

@@ -14,10 +14,13 @@
 
 """
 
-VERSION: 0.6
+VERSION: 0.7
 
 CHANGES:
-    Improved Settings app UI
+    Adjusted battery level detection, improved launcher sort method,
+    added apps folders to import path,
+    added ability to jump to alphabetical location in apps list,
+    added new fbuf-based display driver to lib
 
 This program is designed to be used in conjunction with the "apploader.py" program, to select and launch MPy apps for the Cardputer.
 
@@ -168,8 +171,8 @@ def scan_apps(sd):
                 app_names.append( this_name )
             app_paths[f"{this_name}"] = f"/sd/apps/{entry}"
 
-    
-    app_names.sort()
+    #sort alphabetically without uppercase/lowercase discrimination:
+    app_names.sort(key=lambda element: element.lower())
 
     #add an appname to refresh the app list
     app_names.append("Reload Apps")
@@ -246,19 +249,27 @@ def read_battery_level(adc):
     read approx battery level on the adc and return as int range 0 (low) to 3 (high)
     """
     raw_value = adc.read_uv() # vbat has a voltage divider of 1/2
-
-    if raw_value < 525000: # 1.05v
+    
+    # more real-world data is needed to dial in battery level.
+    # the original values were low, so they will be adjusted based on feedback.
+    
+    #originally 525000 (1.05v)
+    if raw_value < 1575000: #3.15v
         return 0
-    if raw_value < 1050000: # 2.1v
+    #originally 1050000 (2.1v)
+    if raw_value < 1750000: #3.5v
         return 1
-    if raw_value < 1575000: # 3.15v
+    #originally 1575000 (3.15v)
+    if raw_value < 1925000: #3.85v
         return 2
+    # 2100000 (4.2v)
     return 3 # 4.2v or higher
 
 
 
 
 
+
 #--------------------------------------------------------------------------------------------------
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Main Loop: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -492,8 +503,27 @@ def main_loop():
                         beep.play(('C4','B4','C5','C5'),100,volume)
 
                     launch_app(app_paths[app_names[app_selector_index]])
-                
-                
+
+            else: # keyboard shortcuts!
+                for key in pressed_keys:
+                    # jump to letter:
+                    if key not in prev_pressed_keys and len(key) == 1: # filter special keys and repeated presses
+                        if key in 'abcdefghijklmnopqrstuvwxyz1234567890':
+                            #search for that letter in the app list
+                            for idx, name in enumerate(app_names):
+                                if name.lower().startswith(key):
+                                    #animation:
+                                    if app_selector_index > idx:
+                                        scroll_direction = -1
+                                    elif app_selector_index < idx:
+                                        scroll_direction = 1
+                                    current_vscsad = target_vscsad
+                                    # go there!
+                                    app_selector_index = idx
+                                    if ui_sound:
+                                        beep.play(("G3"), 100, volume)
+                                    found_key = True
+                                    break
 
             # once we parse the keypresses for this loop, we need to store them for next loop
             prev_pressed_keys = pressed_keys
@@ -676,3 +706,4 @@ def main_loop():
 
 
 
+

ports/esp32/boards/MICROHYDRA/lib/microhydra.py

@@ -178,7 +178,58 @@ def mix_color565(color1, color2, mix_factor=0.5):
     blue = math.floor(blue * 31)
 
     return combine_color565(red,green,blue)
+
+
+
+def darker_color565(color,mix_factor=0.5):
+    """
+    Get the darker version of a 565 color.
+    """
+    #separate to components
+    r,g,b = separate_color565(color)
+    #convert to float 0.0 to 1.0
+    r /= 31; g /= 63; b /= 31
+    #convert to hsv 0.0 to 1.0
+    h,s,v = rgb_to_hsv(r,g,b)
+    
+    #higher sat value is percieved as darker
+    s *= 1 + mix_factor
+    v *= 1 - mix_factor
 
+    #convert back to rgb floats
+    r,g,b = hsv_to_rgb(h,s,v)
+    #convert back to 565 range
+    r = math.floor(r * 31)
+    g = math.floor(g * 63)
+    b = math.floor(b * 31)
+    
+    return combine_color565(r,g,b)
+
+
+def lighter_color565(color,mix_factor=0.5):
+    """
+    Get the lighter version of a 565 color.
+    """
+    #separate to components
+    r,g,b = separate_color565(color)
+    #convert to float 0.0 to 1.0
+    r /= 31; g /= 63; b /= 31
+    #convert to hsv 0.0 to 1.0
+    h,s,v = rgb_to_hsv(r,g,b)
+    
+    #higher sat value is percieved as darker
+    s *= 1 - mix_factor
+    v *= 1 + mix_factor
+    
+    #convert back to rgb floats
+    r,g,b = hsv_to_rgb(h,s,v)
+    #convert back to 565 range
+    r = math.floor(r * 31)
+    g = math.floor(g * 63)
+    b = math.floor(b * 31)
+    
+    return combine_color565(r,g,b)
+
 
 def color565_shiftred(color, mix_factor=0.5):
     """
@@ -202,4 +253,4 @@ def color565_shiftgreen(color, mix_factor=0.5):
 if __name__ == "__main__":
     # just for testing
 
-    print('output:', mix_color565(4421, 53243, 0.5))
+    print('output:', mix_color565(4421, 53243, 0.5))