michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-27 16:17:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

proper probing of battery path

Browse source 
If battery driver in kernel behaves sane, it can be autodetected.
Every linux desktop manages to do this, so no excuse for
Inkbox. This simplifies addition of new devices.
This commit is contained in:
Andreas Kemnade 2023-10-20 21:19:38 +02:00 committed by Nicolas Mailloux
parent 0ffd09b261
commit 2853fca7cd
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/functions.h
View file

@ -420,6 +420,32 @@ namespace {
} }
return 0; return 0;
} }
QString getPowerSupplyOfType(QString type) {
QDirIterator supplies("/sys/class/power_supply", QDirIterator::NoIteratorFlags);
while(supplies.hasNext()) {
supplies.next();
QString supply = supplies.filePath();
// badly classified device by some ntx kernels, ignore
if ((type == "Battery") &&
(supplies.fileName() == "mc13892_charger")) {
continue;
}
if (readFile(supplies.filePath() + "/type").trimmed() == type) {
return supply;
}
}
return NULL;
}
QString getBatteryFile() {
static QString capacity;
if (capacity.isNull()) {
QString battery = getPowerSupplyOfType("Battery");
if (!battery.isNull()) {
capacity = battery + "/capacity";
}
}
return capacity;
}
void getBatteryLevel() { void getBatteryLevel() {
batteryLevelInt = 100; batteryLevelInt = 100;
batteryLevel = "100%"; batteryLevel = "100%";
@ -430,22 +456,15 @@ namespace {
batteryLevel.append("%"); batteryLevel.append("%");
} }
} }
else if(global::deviceID == "n249\n") {
if(QFile::exists("/sys/class/power_supply/rn5t618-battery/capacity")) {
batteryLevel = readFile("/sys/class/power_supply/rn5t618-battery/capacity").trimmed();
batteryLevelInt = batteryLevel.toInt();
batteryLevel.append("%");
}
}
else { else {
// probably superfluous, catched by default
if(QFile::exists("/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/capacity")) { if(QFile::exists("/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/capacity")) {
batteryLevel = readFile("/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/capacity").trimmed(); batteryLevel = readFile("/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/capacity").trimmed();
batteryLevelInt = batteryLevel.toInt(); batteryLevelInt = batteryLevel.toInt();
batteryLevel.append("%"); batteryLevel.append("%");
} }
else { else {
// It's for the Nia model C - but it's also a more regular/default path, so make it the fallback QString path = getBatteryFile();
QString path = "/sys/class/power_supply/battery/capacity";
if(QFile::exists(path)) { if(QFile::exists(path)) {
batteryLevel = readFile(path).trimmed(); batteryLevel = readFile(path).trimmed();
batteryLevelInt = batteryLevel.toInt(); batteryLevelInt = batteryLevel.toInt();