|
|
@ -151,27 +151,29 @@ float BatteryStats::getPower(int batt_num) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool BatteryStats::isCharging() {
|
|
|
|
bool BatteryStats::isCharging() {
|
|
|
|
for(int i =0; i < 2; i++) {
|
|
|
|
if (numBattery() > 0) {
|
|
|
|
string syspath = battPath[i];
|
|
|
|
for(int i =0; i < 2; i++) {
|
|
|
|
string status = syspath + "/status";
|
|
|
|
string syspath = battPath[i];
|
|
|
|
std::ifstream input(status);
|
|
|
|
string status = syspath + "/status";
|
|
|
|
std::string line;
|
|
|
|
std::ifstream input(status);
|
|
|
|
|
|
|
|
std::string line;
|
|
|
|
if(std::getline(input,line)) {
|
|
|
|
|
|
|
|
current_status= line;
|
|
|
|
if(std::getline(input,line)) {
|
|
|
|
state[i]=current_status;
|
|
|
|
current_status= line;
|
|
|
|
|
|
|
|
state[i]=current_status;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(int i =0; i < 2; i++) {
|
|
|
|
for(int i =0; i < 2; i++) {
|
|
|
|
if (state[i] == "Charging") {
|
|
|
|
if (state[i] == "Charging") {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool BatteryStats::fullCharge(){
|
|
|
|
bool BatteryStats::fullCharge(){
|
|
|
|
//check if both batteries are fully charged
|
|
|
|
//check if both batteries are fully charged
|
|
|
|
int charged =0;
|
|
|
|
int charged =0;
|
|
|
|