From c816d9b88ee9bcc9c524da3f0c478f93eb965dcb Mon Sep 17 00:00:00 2001 From: Samuel Archibald Date: Mon, 2 Nov 2020 23:29:42 -0500 Subject: [PATCH 1/3] Fix to #119 --- src/displayapp/screens/SystemInfo.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 867fdaeb..34359c2c 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -43,10 +43,9 @@ bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) { } std::unique_ptr SystemInfo::CreateScreen1() { - auto batteryPercentF = batteryController.PercentRemaining(); - uint16_t batteryPercent = 0; - if(batteryPercentF > 100.0f) batteryPercent = 100; - else if(batteryPercentF < 0.0f) batteryPercent = 0; + auto batteryPercent = batteryController.PercentRemaining(); + if(batteryPercent > 100.0f) batteryPercent = 100; + else if(batteryPercent < 0.0f) batteryPercent = 0; uint8_t brightness = 0; switch(brightnessController.Level()) { @@ -98,7 +97,7 @@ std::unique_ptr SystemInfo::CreateScreen1() { dateTimeController.Day(), static_cast(dateTimeController.Month()), dateTimeController.Year(), dateTimeController.Hours(), dateTimeController.Minutes(), dateTimeController.Seconds(), uptimeDays, uptimeHours, uptimeMinutes, uptimeSeconds, - batteryPercent, brightness, resetReason); + (int) batteryPercent, brightness, resetReason); return std::unique_ptr(new Screens::Label(app, t1)); } From 600dbb0280aae3cc45f7256ac845780663eaf7f8 Mon Sep 17 00:00:00 2001 From: Samuel Archibald Date: Mon, 16 Nov 2020 09:43:32 -0500 Subject: [PATCH 2/3] Fix for comments on issue #125, bounds check removed --- src/displayapp/screens/SystemInfo.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 34359c2c..81704303 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -43,9 +43,7 @@ bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) { } std::unique_ptr SystemInfo::CreateScreen1() { - auto batteryPercent = batteryController.PercentRemaining(); - if(batteryPercent > 100.0f) batteryPercent = 100; - else if(batteryPercent < 0.0f) batteryPercent = 0; + int8_t batteryPercent = (int)batteryController.PercentRemaining(); uint8_t brightness = 0; switch(brightnessController.Level()) { From 3703611a6013f4f0905ab4f3de9f3157e73f52b5 Mon Sep 17 00:00:00 2001 From: Samuel Archibald Date: Wed, 18 Nov 2020 00:00:33 -0500 Subject: [PATCH 3/3] Fixes #119! Improved based off suggested changes --- src/displayapp/screens/SystemInfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 81704303..83384fbd 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -43,7 +43,7 @@ bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) { } std::unique_ptr SystemInfo::CreateScreen1() { - int8_t batteryPercent = (int)batteryController.PercentRemaining(); + auto batteryPercent = static_cast(batteryController.PercentRemaining()); uint8_t brightness = 0; switch(brightnessController.Level()) { @@ -95,7 +95,7 @@ std::unique_ptr SystemInfo::CreateScreen1() { dateTimeController.Day(), static_cast(dateTimeController.Month()), dateTimeController.Year(), dateTimeController.Hours(), dateTimeController.Minutes(), dateTimeController.Seconds(), uptimeDays, uptimeHours, uptimeMinutes, uptimeSeconds, - (int) batteryPercent, brightness, resetReason); + batteryPercent, brightness, resetReason); return std::unique_ptr(new Screens::Label(app, t1)); }