summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvamander <avamander@gmail.com>2021-06-22 21:31:31 +0300
committerGitHub <noreply@github.com>2021-06-22 20:31:31 +0200
commit572be3e857f86047926f7ccae5a4197958580f98 (patch)
tree9f3878abd52e143da401250ff0be6b19379288d3 /src
parent20a24f8cf56551eae1202f8dc5733bd0cf61adbf (diff)
Removed an illogical comparison from SystemInfo and St7789 driver (#449)
* Removed an illogical comparison
Diffstat (limited to 'src')
-rw-r--r--src/displayapp/screens/SystemInfo.cpp3
-rw-r--r--src/drivers/St7789.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 0b16d633..1cf895c7 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -141,9 +141,6 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen2() {
uptimeSeconds = uptimeSeconds % secondsInAMinute;
// TODO handle more than 100 days of uptime
- if (batteryPercent == -1)
- batteryPercent = 0;
-
// hack to not use the flot functions from printf
uint8_t batteryVoltageBytes[2];
batteryVoltageBytes[1] = static_cast<uint8_t>(batteryVoltage); // truncate whole numbers
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index 39218e77..0f1dc02e 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -140,8 +140,9 @@ void St7789::Uninit() {
}
void St7789::DrawPixel(uint16_t x, uint16_t y, uint32_t color) {
- if ((x < 0) || (x >= Width) || (y < 0) || (y >= Height))
+ if (x >= Width || y >= Height) {
return;
+ }
SetAddrWindow(x, y, x + 1, y + 1);