Skip to content

Commit c77fb71

Browse files
committed
Battery (NetBSD): report remaining time
1 parent 48dd597 commit c77fb71

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/detection/battery/battery_nbsd.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
7070
critical = true;
7171
}
7272
else if (ffStrEquals(desc, "discharge rate"))
73-
{
7473
prop_dictionary_get_uint(dict, "cur-value", &dischargeRate);
75-
}
7674
}
7775

7876
if (max > 0)
@@ -92,16 +90,22 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
9290
if (charging)
9391
ffStrbufAppendS(&battery->status, "Charging, ");
9492
else if (dischargeRate)
93+
{
9594
ffStrbufAppendS(&battery->status, "Discharging, ");
95+
battery->timeRemaining = (int32_t)((double)curr / dischargeRate * 3600)
96+
}
9697
if (critical)
9798
ffStrbufAppendS(&battery->status, "Critical, ");
9899
if (acConnected)
99100
ffStrbufAppendS(&battery->status, "AC Connected");
100101
ffStrbufTrimRight(&battery->status, ' ');
101102
ffStrbufTrimRight(&battery->status, ',');
102103
}
104+
105+
prop_object_iterator_release(iter);
103106
}
104107
prop_object_iterator_release(itKey);
108+
prop_object_release(root);
105109

106110
return NULL;
107111
}

0 commit comments

Comments
 (0)