**v2023.6.26 (202306260)**

* A bunch of new features and bug fixes * Updated logic * Full changelog [link](v2022.6.4...v2023.6.26)
VR-25 · Jun 26, 2023 · 57d7b71 · 57d7b71
1 parent bdf5efb
commit 57d7b71
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 155 deletions.
diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 # $id Installer/Upgrader
-# Copyright 2019-2022, VR25
+# Copyright 2019-2023, VR25
 # License: GPLv3+
 #
 # devs: triple hashtags (###) mark non-generic code
@@ -39,7 +39,7 @@ trap exxit EXIT
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir
@@ -150,7 +150,7 @@ fi
 
 ###
 echo "$name $version ($versionCode)
-Copyright 2017-2022, $author
+Copyright 2017-2023, $author
 GPLv3+
 
 Installing in $installDir/$id/..."

diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Regardless of whether the system is rooted with Magisk, the installation is alwa
 ---
 ## LICENSE
 
-Copyright 2017-2022, VR25
+Copyright 2017-2023, VR25
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/bin/acc_flashable_uninstaller.zip b/bin/acc_flashable_uninstaller.zip
diff --git a/changelog.md b/changelog.md
@@ -1,132 +1,7 @@
-**v2022.7.30-dev (202207300)**
-* e4159d5 Improve ctrl file write logic
-* f440010 Use usleep for float seconds
-* 305db14 Add configurable idleThreshold, and update idle mode information
-* 31c96ff Update Idle mode support for Sony Xperia devices
-
-**v2022.7.29-dev (202207290)**
-* 30aacc2 Add new switch group for Sony Xperia devices
-* 3575483 Merge pull request #161 from MrCarb0n/scrap (17fd1c4 prep for external editor app support)
-* f93098e --test shall skip missing ctrl files
-* 04bf46f Fix ctrl file write function
-* 3b96bae Rewrite ctrl file write logic
-* b7583e5 Fix & optimize capacity_sync
-* d55cd89 Optimize --force
-* 142d160 Miscellaneous fixes
-* f740feb Fix --parse issues
-* 171ec2f Use 3600mV to stop charging with voltage regulators, and don't mask status as "Idle"
-* 294297c Print "Hang on..." to make "Terminated" messages less obscure
-* a035559 Update documentation
-* d08ad09 Update default config layout and comments
-* 622dd59 [Wizard] change "exit" option from "g" to "z"
-* a8378b0 Additional charging switches
-* 7d5f899 Add adb push helper
-* 1228f3d Undo "disable mi_thermald"
-* 54a8f53 Misc charging control fixes
-* bcfc477 Fix "acc -t file"
-* d2711ef Fix battery info issues
-* d601bce Current and voltage control fixes
-* 18485bf Fix AccSettings
-* 6cf01cd Fix & optimize cooldown
-
-**v2022.7.19-dev (202207190)**
-* Bump version
-* 423fadb Misc charging control fixes and optimizations
-* d74a647 Systemlessly disable mi_thermald
-* deb4736 Add support for cooldown_charge=0 (to be used with cooldown_current)
-* 6286223 Update documentation
-* ded8b86 Rewrite script scheduler
-* 950709b Update BATT_HEATH calculator
-* e778686 Goodbye loopCmd (replaced by one-line scripts)
-* e5110f4 Improve force_off
-
-**v2022.7.10-dev (202207100)**
-* 4240644 Add voltage support to -e and -d options
-* 5a63ada Fix offMid
-* fee795b Each ctrl file gets written to 2x
-* 6c6badb Optimize force_off
-* 4a26458 Bump charging status check timeout
-
-**v2022.7.4-dev (202207040)**
-* 24dcfd7 Update translation info
-* 3b882c1 Merge pull request #156 from Babilinx/dev (French translations)
-* d0b8b42 Merge pull request #160 from cutiness/dev (Turkish translations)
-* 744911d Report status "Idle" as "Not charging" to "fix" AccA
-* 36266da Update readme
-* 873128e Implement current limiting hack (temp_level)
-* 3a72767 Optimize charging control loop
-* bc46b40 Optimize forceOff
-* 8bada33 Half batt status poll rate
-* 426e749 Check config (reset if broken/missing) before loading it
-* 50e19b6 Disable seqDrop timeout
-* f270ad7 Update config reference
-* 21f68d1 Implement forceOff: for keeping stubborn switches off
-* e2edbf7 Add new wireless charging switch
-* 45cd831 Make less invasive ctrl file permission changes
-* fb5cc27 Make each ctrl file read-only after writing to it
-* 9f4a5c5 Improve "unplugged" detection
-* 19fb9e0 Rename BATT_HEALTH -> HEALTH
-* eb0014e Fix: chargingSwitch[@], parameter not set
-
-**v2022.6.28-dev (202206280)**
-* 18c08c4 Improve emulated idle mode feedback (info)
-* 84b82de Fix typos
-* e9188ae Auto-set discharge_polarity
-* 8eba418 Fix acc-p.txt generation
-* fda19e8 Improve battery status detection
-
-**v2022.6.25-dev (202206250)**
-* 6e3ad43 Optimize memory usage
-* de4150c (origin/dev, origin/HEAD) Rewrite discharge polarity handling logic
-* 348e707 Miscellaneous optimizations
-* cf2de3b Remember auto-detected discharge polarity until accd is reinitialized
-* 660132b Fix language selector
-* 7a38b5e Prevent unwanted switch blacklisting
-* ec3b204 Remove re-plug notice
-* ad922cd Fix: daemon stop timeout not honored
-* cf368d3 Exclude additional misleading uevent information
-* 942c251 Show battery health % and power supply info (if interfaces are available)
-* e8171ba Determine discharge polarity only when the battery is actually discharging
-* a725111 Re-enable daemon stop timeout (10 seconds)
-* 3a9aeaa Add Zelle donation info
-* b768746 Fix switch filter
-* bf13dfa Add new charging switches
-* 92687bb Fix: misleading "Idle" status
-* d2db8e3 acc -p: filter out additional files
-* 863e5b1 Fix --parse (acc -p) crash
-* 1db225b Fix voltage based idle mode inconsistencies
-* 88855fd Disable verbose for -l|--log
-* 61961b2 Fix typo
-
-**v2022.6.21-dev (202206210)**
-* 8fc9e92 Update strings
-* 5b791e6 Add re-plug notice
-* 6884e69 If flip=on, wait for charging to resume
-* d22ac4b Update discharge_polarity description
-* 637ca4a Fix read_status()
-* f8a04d9 Fix AccA idle mode support detection
-* 624487c Assume battery is "Discharging" if charging status is unknown/weird
-* 20e20c9 Fix: charging can't be enabled, if it was disabled above pause_capacity
-
-**v2022.6.19-dev (202206190)**
-* b1b02c3 Battery status workaround enhancements
-* 3c988ff Lower ctrl file write frequency and time
-* fcc0e1e Update README & translations
-* 07b620b Add offMid toggle
-
-**v2022.6.12-dev (202206120)**
-- 9110ed8 Always check uevent batt status before comparing current
-- 5746f7e Fix acc -f
-- 1076997 Fix "charging keeps stopping at min < capacity < max"
-- 06fff97 Add Turkish tranlations (Türkçe (tr)) by github.com/cutiness
-- e429770 Enhance current unit and polarity detection
-- ddc8c50 Accelerate accd stop
-- 8df12eb Export log archive to /sdcard/Download/
-- 9c4cce3 Include acc-t_output-${device}.log in log archive
-- 1579304 Save acc -t output to /sdcard/Download/acc-t_output-${device}.log
-- a0846f9 Blacklist /sys/class/qcom-battery/vbus_disable 0 1
-- 12ceb6a --parse: exclude all known switches
-- fc1e98b Fix typo
+**v2023.6.26 (202306260)**
+* A bunch of new features and bug fixes
+* Updated logic
+* Full changelog [link](https://github.com/VR-25/acc/compare/v2022.6.4...v2023.6.26)
 
 **v2022.6.4 (202206040)**
 - `-n|--notif [[string] [user]]`: post Android notification; may not work on all systems;

diff --git a/customize.sh b/customize.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 # $id Installer/Upgrader
-# Copyright 2019-2022, VR25
+# Copyright 2019-2023, VR25
 # License: GPLv3+
 #
 # devs: triple hashtags (###) mark non-generic code
@@ -39,7 +39,7 @@ trap exxit EXIT
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir
@@ -150,7 +150,7 @@ fi
 
 ###
 echo "$name $version ($versionCode)
-Copyright 2017-2022, $author
+Copyright 2017-2023, $author
 GPLv3+
 
 Installing in $installDir/$id/..."

diff --git a/install-online.sh b/install-online.sh
@@ -28,7 +28,7 @@ trap 'e=$?; echo; exit $e' EXIT
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir

diff --git a/install-tarball.sh b/install-tarball.sh
@@ -22,7 +22,7 @@ set -x
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir

diff --git a/install.sh b/install.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 # $id Installer/Upgrader
-# Copyright 2019-2022, VR25
+# Copyright 2019-2023, VR25
 # License: GPLv3+
 #
 # devs: triple hashtags (###) mark non-generic code
@@ -39,7 +39,7 @@ trap exxit EXIT
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir
@@ -150,7 +150,7 @@ fi
 
 ###
 echo "$name $version ($versionCode)
-Copyright 2017-2022, $author
+Copyright 2017-2023, $author
 GPLv3+
 
 Installing in $installDir/$id/..."

diff --git a/install/accd.sh b/install/accd.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 # Advanced Charging Controller Daemon (accd)
-# Copyright 2017-2022, VR25
+# Copyright 2017-2023, VR25
 # License: GPLv3+
 
 
@@ -381,7 +381,7 @@ if ! $init; then
           if [ ${capacity[0]} -le 0 ]; then
             capFactor=$(calc 100 / ${capacity[3]})
           else
-            capFactor=$(calc 100 / (${capacity[3]} - ${capacity[0]}) )
+            capFactor=$(calc "100 / (${capacity[3]} - ${capacity[0]})")
           fi
           local maskedCap=$(calc $battCap \* $capFactor | xargs printf %.f)
           [ $maskedCap -le 100 ] || maskedCap=100

diff --git a/install/batt-interface.sh b/install/batt-interface.sh
@@ -172,6 +172,7 @@ voltNow=$voltNow" > $TMPDIR/.batt-interface.sh
   init=false
 
 else
+  touch $TMPDIR/.batt-interface.sh
   . $TMPDIR/.batt-interface.sh
 fi
 

diff --git a/install/setup-busybox.sh b/install/setup-busybox.sh
@@ -1,13 +1,13 @@
 # Busybox Setup
-# Copyright 2019-2022, VR25
+# Copyright 2019-2023, VR25
 # License: GPLv3+
 #
 # Usage: . $0
 
 
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir

diff --git a/install/translations/tr/README.md b/install/translations/tr/README.md
@@ -68,7 +68,7 @@ Sistem Magisk kullanılarak veya başka bir şekilde rootlanmış fark etmez, ku
 ---
 ## Lisans
 
-Copyright 2017-2022, VR25
+Copyright 2017-2023, VR25
 
 Bu ücretsiz bir yazılımdır: dilerseniz Free Software Foundation tarafından yayımlanan
 GNU General Public License altında değiştirebilir veya yeniden dağıtabilirsiniz.

diff --git a/install/uninstall.sh b/install/uninstall.sh
@@ -1,7 +1,7 @@
 #!/sbin/sh
 # $id uninstaller
 # id is set/corrected by build.sh
-# Copyright 2019-2022, VR25
+# Copyright 2019-2023, VR25
 # License: GPLv3+
 #
 # devs: triple hashtags (###) mark non-generic code
@@ -15,7 +15,7 @@ export TMPDIR=/dev/.$domain/$id
 #BB#
 bin_dir=/data/adb/vr25/bin
 busybox_dir=/dev/.vr25/busybox
-magisk_busybox=/data/adb/magisk/busybox
+magisk_busybox="/data/adb/magisk/busybox /data/adb/ksu/busybox"
 [ -x $busybox_dir/ls ] || {
   mkdir -p $busybox_dir
   chmod 0700 $busybox_dir

diff --git a/module.json b/module.json
@@ -2,9 +2,9 @@
     "busybox": "https://github.com/Magisk-Modules-Repo/busybox-ndk",
     "changelog": "https://raw.githubusercontent.com/VR-25/acc/master/changelog.md",
     "curl": "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/tree/master/curl",
-    "tgz": "https://github.com/VR-25/acc/releases/download/v2022.7.30-dev/acc_v2022.7.30-dev_202207300.tgz",
-    "tgzInstaller": "https://github.com/VR-25/acc/releases/download/v2022.7.30-dev/install-tarball.sh",
-    "version": "v2022.7.30-dev",
-    "versionCode": 202207300,
-    "zipUrl": "https://github.com/VR-25/acc/releases/download/v2022.7.30-dev/acc_v2022.7.30-dev_202207300.zip"
+    "tgz": "https://github.com/VR-25/acc/releases/download/v2023.6.26/acc_v2023.6.26_202306260.tgz",
+    "tgzInstaller": "https://github.com/VR-25/acc/releases/download/v2023.6.26/install-tarball.sh",
+    "version": "v2023.6.26",
+    "versionCode": 202306260,
+    "zipUrl": "https://github.com/VR-25/acc/releases/download/v2023.6.26/acc_v2023.6.26_202306260.zip"
 }
diff --git a/module.prop b/module.prop
@@ -1,8 +1,8 @@
 id=acc
 domain=vr25
 name=Advanced Charging Controller (ACC)
-version=v2022.7.30-dev
-versionCode=202207300
+version=v2023.6.26
+versionCode=202306260
 author=VR25
 description=Mainly intended for extending battery service life on Android devices. In a nutshell, this is achieved through limiting charging current, temperature, and voltage. Any root solution is supported. Regardless of whether the system is rooted with Magisk, the installation is always "systemless".
 updateJson=https://raw.githubusercontent.com/VR-25/acc/master/module.json