Skip to content

Commit 8254893

Browse files
author
okay
committed
[remux] quiet down output when looking for USB charger path
also add new USB path for rm1
1 parent 7fb08f5 commit 8254893

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

src/remux/launcher.cpy

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ DEFAULT_LAUNCH_GESTURES := vector<string> %{
4747
"gesture=swipe; direction=up; zone=0.9 0 1 1",
4848
}
4949

50+
USB_CHARGER_PATHS := %{
51+
"/sys/class/power_supply/max77818-charger/online",
52+
"/sys/class/power_supply/imx_usb_charger/present",
53+
"/sys/class/power_supply/bq27441-0/present"
54+
}
55+
5056

5157
CONFIG := read_remux_config()
5258
class IApp:
@@ -388,12 +394,15 @@ class App: public IApp:
388394

389395
usb_in := false
390396
string usb_str
391-
if version == util::RM_VERSION::RM2:
392-
usb_str = string(exec("cat /sys/class/power_supply/max77818-charger/online"))
393-
else:
394-
usb_str = string(exec("cat /sys/class/power_supply/imx_usb_charger/present"))
395-
str_utils::trim(usb_str)
396-
usb_in = usb_str == string("1")
397+
398+
for auto fname : USB_CHARGER_PATHS:
399+
usb_cmd := "cat " + string(fname) + " 2>/dev/null"
400+
401+
usb_str = string(exec(usb_cmd.c_str()))
402+
str_utils::trim(usb_str)
403+
usb_in = usb_str == string("1")
404+
if usb_in:
405+
break
397406

398407
suspend_m.lock()
399408
if LAST_ACTION == 0 or usb_in:

0 commit comments

Comments
 (0)