From c55320e9e2a8916e911bcd39ab37b79e3a7d03b2 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Jan 2021 20:43:27 +0100 Subject: New upstream version 3.0.5 --- BatteryMeter.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'BatteryMeter.c') diff --git a/BatteryMeter.c b/BatteryMeter.c index 4836809..2c808c7 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -35,24 +35,21 @@ static void BatteryMeter_updateValues(Meter* this, char* buffer, size_t len) { this->values[0] = percent; - const char *onAcText, *onBatteryText, *unknownText; - - unknownText = "%.1f%%"; - if (this->mode == TEXT_METERMODE) { - onAcText = "%.1f%% (Running on A/C)"; - onBatteryText = "%.1f%% (Running on battery)"; - } else { - onAcText = "%.1f%%(A/C)"; - onBatteryText = "%.1f%%(bat)"; + const char* text; + switch (isOnAC) { + case AC_PRESENT: + text = this->mode == TEXT_METERMODE ? " (Running on A/C)" : "(A/C)"; + break; + case AC_ABSENT: + text = this->mode == TEXT_METERMODE ? " (Running on battery)" : "(bat)"; + break; + case AC_ERROR: + default: + text = ""; + break; } - if (isOnAC == AC_PRESENT) { - xSnprintf(buffer, len, onAcText, percent); - } else if (isOnAC == AC_ABSENT) { - xSnprintf(buffer, len, onBatteryText, percent); - } else { - xSnprintf(buffer, len, unknownText, percent); - } + xSnprintf(buffer, len, "%.1f%%%s", percent, text); } const MeterClass BatteryMeter_class = { -- cgit v1.2.3