diff --git a/Module.cs b/Module.cs index cb02413148e7d6b54faa545c4acebbb05e84a2f6..82b646067d2dee857751a5a698286981fe502c5f 100644 --- a/Module.cs +++ b/Module.cs @@ -563,7 +563,7 @@ class ModuleBattery: Module { string instance = section.Optional("instance")?.AsString() ?? "BAT1"; path = section.Optional("path")?.AsPath() ?? $"/sys/class/power_supply/{instance}/uevent"; - format = section.Optional("format")?.AsString() ?? "{status} {derivation} {percent} {reaming}"; + format = section.Optional("format")?.AsString() ?? "{status} {derivation} {percent} {remaining}"; timeWindow_ms = section.Optional("time_window")?.AsMs() ?? 60000; shortFormat = section.Optional("short_format")?.AsString(); } @@ -584,7 +584,7 @@ class ModuleBattery: Module long? timeDelta_ms = null; int? energyDelta = null; double? percentPerHour = null; - long? reamingTime_s = null; + long? remainingTime_s = null; if(lastStatus != status) history.Clear(); @@ -597,9 +597,9 @@ class ModuleBattery: Module var derivationEnergy = energyDelta/(double)timeDelta_ms; percentPerHour = derivationEnergy * 1000 * 60 * 60 / energyDesign * 100; if(derivationEnergy > 0) - reamingTime_s = (long)((energyFull-energyNow)/derivationEnergy/1000); + remainingTime_s = (long)((energyFull-energyNow)/derivationEnergy/1000); if(derivationEnergy < 0) - reamingTime_s = (long)((energyNow)/-derivationEnergy/1000); + remainingTime_s = (long)((energyNow)/-derivationEnergy/1000); } history.Enqueue(new HistoryElement(t, energyNow)); @@ -613,7 +613,7 @@ class ModuleBattery: Module if(x == "status") return (status.Length > 3 ? status[0..3] : status); if(x == "percent") return percent.ToString("N2"); if(x == "derivation") return percentPerHour?.ToString("N2") ?? ""; - if(x == "reaming") return reamingTime_s == null ?"": TimeShow.Show(reamingTime_s.Value); + if(x == "remaining") return remainingTime_s == null ?"": TimeShow.Show(remainingTime_s.Value); return "UNDEF"; }).Trim(); }