Battery: fix Intel compatibility

`MaxCapacity` on Intel MBP is not 100
This commit is contained in:
Carter Li
2022-09-17 00:34:37 +08:00
parent 9e4a55d285
commit d5500ad4f7
2 changed files with 4 additions and 7 deletions
+3 -3
View File
@@ -26,13 +26,13 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
continue;
}
int intValue;
bool boolValue;
BatteryResult* battery = ffListAdd(results);
ffStrbufInit(&battery->capacity);
if(ffCfDictGetInt(properties, "CurrentCapacity", &intValue))
ffStrbufAppendF(&battery->capacity, "%d", intValue);
int currentCapacity, maxCapacity;
if(ffCfDictGetInt(properties, "CurrentCapacity", &currentCapacity) && ffCfDictGetInt(properties, "MaxCapacity", &maxCapacity))
ffStrbufAppendF(&battery->capacity, "%.0f", currentCapacity * 100.0 / maxCapacity);
ffStrbufInit(&battery->manufacturer);
ffStrbufInit(&battery->modelName);
+1 -4
View File
@@ -78,10 +78,7 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results) {
if(instance->config.batteryDir.length > 0)
{
ffStrbufAppend(&baseDir, &instance->config.batteryDir);
if (!ffStrbufEndsWithC(&baseDir, '/'))
{
ffStrbufAppendC(&baseDir, '/');
}
ffStrbufEnsureEndsWithC(&baseDir, '/');
}
else
{