Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-10-06 04:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consider capacity for battery sensor

Browse source
This commit is contained in:
scorpion-26 2023-05-10 13:08:17 +02:00
parent 80ade2b06e
commit c51fadbc79
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/System.cpp
View file

@ -92,17 +92,27 @@ namespace System
{
std::ifstream fullChargeFile(Config::Get().batteryFolder + "/charge_full");
std::ifstream currentChargeFile(Config::Get().batteryFolder + "/charge_now");
if (!fullChargeFile.is_open() || !currentChargeFile.is_open())
if (fullChargeFile.is_open() && currentChargeFile.is_open())
{
return -1.f;
std::string fullChargeStr;
std::string currentChargeStr;
std::getline(fullChargeFile, fullChargeStr);
std::getline(currentChargeFile, currentChargeStr);
uint32_t intFullCharge = atoi(fullChargeStr.c_str());
uint32_t intCurrentCharge = atoi(currentChargeStr.c_str());
return ((double)intCurrentCharge / (double)intFullCharge);
}
std::string fullChargeStr;
std::string currentChargeStr;
std::getline(fullChargeFile, fullChargeStr);
std::getline(currentChargeFile, currentChargeStr);
uint32_t intFullCharge = atoi(fullChargeStr.c_str());
uint32_t intCurrentCharge = atoi(currentChargeStr.c_str());
return ((double)intCurrentCharge / (double)intFullCharge);
// Try capacity
std::ifstream capacityFile(Config::Get().batteryFolder + "/capacity");
if (capacityFile.is_open())
{
std::string capacityStr;
std::getline(capacityFile, capacityStr);
uint32_t intCapacity = atoi(capacityStr.c_str());
return (double)intCapacity / 100.0;
}
return -1;
}
RAMInfo GetRAMInfo()