Support more devices with unconventional battery interfaces

Author: VR-25

install/batt-info.sh

@@ -29,35 +29,36 @@ batt_info() {
 
   # raw battery info from the kernel's battery interface
   info="$(
-    { cat $batt/uevent; printf STATUS=; cat $battStatus; } \
+    { grep . $batt/* 2>/dev/null || :; printf status=; cat $battStatus; } \
       | sort -u \
-      | sed -E -e '/^POWER_SUPPLY_STATUS=/d' \
-        -e 's/^POWER_SUPPLY_//' \
-        -e 's/^BATT_VOL=/VOLTAGE_NOW=/' \
-        -e 's/^BATT_TEMP=/TEMP=/' \
-        -e '/^(CHARGE_TYPE|NAME)=/d'\
-        -e "/^CAPACITY=/s/=.*/=$(cat $battCapacity)/"
+      | sed -E "s|$batt/||;
+        /^uevent:/d;
+        s/^batt_vol=/voltage_now=/;
+        s/^batt_temp=/temp=/;
+        /^(charge_type|name)=/d;
+        /^capacity=/s/=.*/=$(cat $battCapacity)/;
+        s/:/=/"
   )"
 
 
   # determine the correct charging status
   not_charging || :
-  info="$(echo "$info" | sed "/^STATUS=/s/=.*/=$_status/")"
+  info="$(echo "$info" | sed "/^status=/s/=.*/=$_status/")"
 
 
   # because MediaTek is weird
   [ ! -d /proc/mtk_battery_cmd ] || {
-    echo "$info" | grep '^CURRENT_NOW=' > /dev/null \
-      || info="${info/BATTERYAVERAGECURRENT=/CURRENT_NOW=}"
+    echo "$info" | grep '^current_now=' > /dev/null \
+      || info="${info/batteryaveragecurrent=/current_now=}"
   }
 
 
   # ensure temperature value is correct
-  info="$(echo "$info" | sed "/^TEMP=/s/=.*/=$(cat $temp)/g" | sort -u)"
+  info="$(echo "$info" | sed "/^temp=/s/=.*/=$(cat $temp)/g" | sort -u)"
 
 
   # parse CURRENT_NOW & convert to Amps
-  currNow=$(echo "$info" | sed -n "s/^CURRENT_NOW=//p" | head -n1)
+  currNow=$(echo "$info" | sed -n "s/^current_now=//p" | head -n1)
   dtr_conv_factor ${currNow#-} ${ampFactor:-$ampFactor_}
   currNow=$(calc2 ${currNow:-0} / $factor)
 
@@ -78,7 +79,7 @@ batt_info() {
 
 
   # parse VOLTAGE_NOW & convert to Volts
-  voltNow=$(echo "$info" | sed -n "s/^VOLTAGE_NOW=//p" | head -n1)
+  voltNow=$(echo "$info" | sed -n "s/^voltage_now=//p" | head -n1)
   dtr_conv_factor $voltNow ${voltFactor-}
   voltNow=$(calc2 ${voltNow:-0} / $factor)
 
@@ -91,35 +92,35 @@ batt_info() {
     # print raw battery info
     ${verbose:-true} \
       && echo "$info" \
-      || echo "$info" | grep -Ev '^(CURRENT|VOLTAGE)_NOW='
+      || echo "$info" | grep -Ev '^(current|voltage)_now='
 
     # print CURRENT_NOW, VOLTAGE_NOW and POWER_NOW
     echo "
-CURRENT_NOW=$currNow$(print_A 2>/dev/null || :)
-VOLTAGE_NOW=$voltNow$(print_V 2>/dev/null || :)
-POWER_NOW=$powerNow$(print_W 2>/dev/null || :)"
+current_now=$currNow$(print_a 2>/dev/null || :)
+voltage_now=$voltNow$(print_v 2>/dev/null || :)
+power_now=$powerNow$(print_W 2>/dev/null || :)"
 
 
   # power supply info
   for i in $(online_f); do
     if [ -f $i ] && [ $(cat $i) -eq 1 ]; then
       i=${i%/*}
-      POWER_SUPPLY_TYPE=$(cat $i/real_type 2>/dev/null || echo $i | tr [a-z] [A-Z])
+      power_supply_type=$(cat $i/real_type 2>/dev/null || echo $i)
 
       echo "
-CHARGE_TYPE=$POWER_SUPPLY_TYPE"
+charge_type=$power_supply_type"
 
-      POWER_SUPPLY_AMPS=$(dtr_conv_factor $(cat $i/*current_now | tail -n 1) ${ampFactor:-$ampFactor_})
+      power_supply_amps=$(dtr_conv_factor $(cat $i/*current_now | tail -n 1) ${ampFactor:-$ampFactor_})
 
-      if [ 0${POWER_SUPPLY_AMPS%.*} -gt 0 ]; then
-        POWER_SUPPLY_VOLTS=$(dtr_conv_factor $(cat $i/voltage_now) ${voltFactor-})
-        POWER_SUPPLY_WATTS=$(calc2 $POWER_SUPPLY_AMPS \* $POWER_SUPPLY_VOLTS)
-        CONSUMED_WATTS=$(calc2 $POWER_SUPPLY_WATTS - $powerNow)
+      if [ 0${power_supply_amps%.*} -gt 0 ]; then
+        power_supply_volts=$(dtr_conv_factor $(cat $i/voltage_now) ${voltFactor-})
+        power_supply_watts=$(calc2 $power_supply_amps \* $power_supply_volts)
+        consumed_watts=$(calc2 $power_supply_watts - $powernow)
 
-        echo "POWER_SUPPLY_AMPS=$POWER_SUPPLY_AMPS
-POWER_SUPPLY_VOLTS=$POWER_SUPPLY_VOLTS
-POWER_SUPPLY_WATTS=$POWER_SUPPLY_WATTS
-CONSUMED_WATTS=$CONSUMED_WATTS"
+        echo "power_supply_amps=$power_supply_amps
+power_supply_volts=$power_supply_volts
+power_supply_watts=$power_supply_watts
+consumed_watts=$consumed_watts"
       fi
 
       break

install/batt-interface.sh

@@ -114,21 +114,19 @@ status() {
       _status=$(set -eu; eval '$battStatusOverride') || :
     fi
   elif $battStatusWorkaround; then
-    if [ $_status != Idle ]; then
-      if [ "$switch" = off ] && { [ -n "${exitCode_-}" ] || ${cyclingSw:-false}; }; then
-        for i in $(seq $iti); do
-          curNow=$(cat $currFile)
-          idle_discharging
-          if [ $_status = Idle ]; then
-            [ $i -eq $iti ] || sleep 1
-          else
-            [ $sti -eq 0 ] || return1=true
-            break
-          fi
-        done
-      else
+    if [ "$switch" = off ] && { [ -n "${exitCode_-}" ] || ${cyclingSw:-false}; }; then
+      for i in $(seq $iti); do
+        curNow=$(cat $currFile)
         idle_discharging
-      fi
+        if [ $_status = Idle ]; then
+          [ $i -eq $iti ] || sleep 1
+        else
+          [ $sti -eq 0 ] || return1=true
+          break
+        fi
+      done
+    else
+      idle_discharging
     fi
   fi
 
@@ -160,7 +158,7 @@ if ${init:-false}; then
     batt=${f2%/*}
   else
     for batt in maxfg/capacity */capacity; do
-      if [ -f ${batt%/*}/status ] && [ -n "$(cat ${batt%/*}/uevent 2>/dev/null || :)" ]; then
+      if [ -f ${batt%/*}/status ]; then
         batt=${batt%/*}
         break
       fi
@@ -187,7 +185,7 @@ if ${init:-false}; then
 
   echo 0 > $TMPDIR/.dummy-curr
 
-  for currFile in $batt/current_now bms/current_now battery/?attery?verage?urrent \
+  for currFile in battery/current_now $batt/current_now bms/current_now battery/?attery?verage?urrent \
     /sys/devices/platform/battery/power_supply/battery/?attery?verage?urrent \
     ${battStatus%/*}/current_now $TMPDIR/.dummy-curr
   do

module.prop

@@ -1,8 +1,8 @@
 id=acc
 domain=vr25
 name=Advanced Charging Controller (ACC)
-version=v2024.4.17-rc
-versionCode=202404170
+version=v2024.4.26-rc
+versionCode=202404260
 author=VR25
 description=Extend your battery's service life by controlling charging current, temperature, and voltage. Any root solution is supported. The installation is always "systemless". Works on Android and KaiOS.
 updateJson=https://raw.githubusercontent.com/VR-25/acc/master/module.json