Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple Battery Support #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multiple Battery Support #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ const Config = imports.misc.config;
/** Settings
*/

const BAT_STATUS = "/sys/class/power_supply/BAT0/status";
const POWER_NOW = "/sys/class/power_supply/BAT0/power_now";
const BAT0_STATUS = "/sys/class/power_supply/BAT0/status";
const BAT1_STATUS = "/sys/class/power_supply/BAT1/status";
const BAT0_POWER_NOW = "/sys/class/power_supply/BAT0/power_now";
const BAT1_POWER_NOW = "/sys/class/power_supply/BAT1/power_now";


/** Indicator
Expand All @@ -36,15 +38,23 @@ var TPIndicator = GObject.registerClass(
_getBatteryStatus() {
const pct = this._proxy.Percentage.toFixed(0);
const power = this.last_value.toFixed(1);
const status = this._read_file(BAT_STATUS, '???');
const status0 = this._read_file(BAT0_STATUS, '???');
const status1 = this._read_file(BAT1_STATUS, '???');

let sign = ' ';
if (status == 'Charging') {
if (status0 == 'Charging') {
sign = '+';
} else if (status == 'Discharging') {
} else if (status0 == 'Discharging') {
sign = '-';
}

else if (status1 == 'Charging') {
sign = '+';
}
else if (status1 == 'Discharging') {
sign = '-';
}


return _("%s%% %s%sW").format(pct, sign, power);
}

Expand All @@ -64,7 +74,7 @@ var TPIndicator = GObject.registerClass(
}

_measure() {
const power = parseFloat(this._read_file(POWER_NOW), 0) / 1000000;
const power = parseFloat(this._read_file(BAT0_POWER_NOW) + this._read_file(BAT1_POWER_NOW)) / 1000000;
this.readings.push(power)

const avg_of = this.settings.get_int('avg-of');
Expand Down