m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

UI: Don't show battery icon if not present

Browse Source
This commit is contained in:
Thomas Farstrike
2026-02-10 21:34:44 +01:00
parent bc62096fbd
commit 1971e1c1ec
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/lib/mpos/board/matouch_esp32_s3_2_8.py
+1 -1
View File
@@ -212,7 +212,7 @@ def apply_cam_settings(cam_obj, prefs):
# MaTouch ESP32-S3 has OV3660 camera (3MP, up to 2048x1536)
# Camera pins are available but initialization is handled by the camera driver
CameraManager.add_camera(CameraManager.Camera(
lens_facing=CameraManager.CameraCharacteristics.LENS_FACING_BACK,
lens_facing=CameraManager.CameraCharacteristics.LENS_FACING_FRONT,
name="OV3660",
vendor="OmniVision",
init=init_cam,
internal_filesystem/lib/mpos/ui/topmenu.py
+39 -35
View File
@@ -106,22 +106,49 @@ def create_notification_bar():
#notif_icon = lv.label(notification_bar)
#notif_icon.set_text(lv.SYMBOL.BELL)
#notif_icon.align_to(time_label, lv.ALIGN.OUT_RIGHT_MID, PADDING_TINY, 0)
# Battery percentage
#battery_label = lv.label(notification_bar)
#battery_label.set_text("100%")
#battery_label.align(lv.ALIGN.RIGHT_MID, 0, 0)
#battery_label.add_flag(lv.obj.FLAG.HIDDEN)
# Battery icon
battery_icon = lv.label(notification_bar)
battery_icon.set_text(lv.SYMBOL.BATTERY_FULL)
#battery_icon.align_to(battery_label, lv.ALIGN.OUT_LEFT_MID, 0, 0)
battery_icon.align(lv.ALIGN.RIGHT_MID, -DisplayMetrics.pct_of_width(10), 0)
battery_icon.add_flag(lv.obj.FLAG.HIDDEN) # keep it hidden until it has a correct value
# WiFi icon
wifi_icon = lv.label(notification_bar)
wifi_icon.set_text(lv.SYMBOL.WIFI)
wifi_icon.align_to(battery_icon, lv.ALIGN.OUT_LEFT_MID, -DisplayMetrics.pct_of_width(1), 0)
wifi_icon.add_flag(lv.obj.FLAG.HIDDEN)
wifi_icon.align(lv.ALIGN.RIGHT_MID, -DisplayMetrics.pct_of_width(10), 0)
# Battery percentage
if BatteryManager.has_battery():
#battery_label = lv.label(notification_bar)
#battery_label.set_text("100%")
#battery_label.align(lv.ALIGN.RIGHT_MID, 0, 0)
#battery_label.add_flag(lv.obj.FLAG.HIDDEN)
# Battery icon
battery_icon = lv.label(notification_bar)
battery_icon.set_text(lv.SYMBOL.BATTERY_FULL)
#battery_icon.align_to(battery_label, lv.ALIGN.OUT_LEFT_MID, 0, 0)
battery_icon.align(lv.ALIGN.RIGHT_MID, -DisplayMetrics.pct_of_width(10), 0)
wifi_icon.align_to(battery_icon, lv.ALIGN.OUT_LEFT_MID, -DisplayMetrics.pct_of_width(1), 0)
battery_icon.add_flag(lv.obj.FLAG.HIDDEN) # keep it hidden until it has a correct value
def update_battery_icon(timer=None):
try:
percent = BatteryManager.get_battery_percentage()
except Exception as e:
print(f"BatteryManager.get_battery_percentage got exception, not updating battery_icon: {e}")
return
if percent > 80:
battery_icon.set_text(lv.SYMBOL.BATTERY_FULL)
elif percent > 60:
battery_icon.set_text(lv.SYMBOL.BATTERY_3)
elif percent > 40:
battery_icon.set_text(lv.SYMBOL.BATTERY_2)
elif percent > 20:
battery_icon.set_text(lv.SYMBOL.BATTERY_1)
else:
battery_icon.set_text(lv.SYMBOL.BATTERY_EMPTY)
battery_icon.remove_flag(lv.obj.FLAG.HIDDEN)
# Percentage is not shown for now:
#battery_label.set_text(f"{round(percent)}%")
#battery_label.remove_flag(lv.obj.FLAG.HIDDEN)
update_battery_icon() # run it immediately instead of waiting for the timer
lv.timer_create(update_battery_icon, BATTERY_ICON_UPDATE_INTERVAL, None)
# Update time
def update_time(timer):
hours = mpos.time.localtime()[3]
@@ -136,28 +163,6 @@ def create_notification_bar():
except Exception as e:
print("Warning: could not check WLAN status:", str(e))
def update_battery_icon(timer=None):
try:
percent = BatteryManager.get_battery_percentage()
except Exception as e:
print(f"BatteryManager.get_battery_percentage got exception, not updating battery_icon: {e}")
return
if percent > 80:
battery_icon.set_text(lv.SYMBOL.BATTERY_FULL)
elif percent > 60:
battery_icon.set_text(lv.SYMBOL.BATTERY_3)
elif percent > 40:
battery_icon.set_text(lv.SYMBOL.BATTERY_2)
elif percent > 20:
battery_icon.set_text(lv.SYMBOL.BATTERY_1)
else:
battery_icon.set_text(lv.SYMBOL.BATTERY_EMPTY)
battery_icon.remove_flag(lv.obj.FLAG.HIDDEN)
# Percentage is not shown for now:
#battery_label.set_text(f"{round(percent)}%")
#battery_label.remove_flag(lv.obj.FLAG.HIDDEN)
update_battery_icon() # run it immediately instead of waiting for the timer
def update_wifi_icon(timer):
from mpos import WifiService
if WifiService.is_connected():
@@ -197,7 +202,6 @@ def create_notification_bar():
lv.timer_create(update_temperature, TEMPERATURE_UPDATE_INTERVAL, None)
#lv.timer_create(update_memfree, MEMFREE_UPDATE_INTERVAL, None)
lv.timer_create(update_wifi_icon, WIFI_ICON_UPDATE_INTERVAL, None)
lv.timer_create(update_battery_icon, BATTERY_ICON_UPDATE_INTERVAL, None)
# hide bar animation
global hide_bar_animation