From cbfc14de13db323ae6a296246106b172dcbafe6c Mon Sep 17 00:00:00 2001 From: Risto Date: Sat, 21 Aug 2021 10:13:41 +0200 Subject: [PATCH 1/2] Fix uint - int mismatch compiler warning --- radio/src/gui/colorlcd/layouts/layout1x4.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/layouts/layout1x4.cpp b/radio/src/gui/colorlcd/layouts/layout1x4.cpp index c9eec4faa..acf4e097e 100644 --- a/radio/src/gui/colorlcd/layouts/layout1x4.cpp +++ b/radio/src/gui/colorlcd/layouts/layout1x4.cpp @@ -52,7 +52,7 @@ class Layout1x4: public Layout { index = 3; } - return {zone.x, zone.y + zone.h / 4 * index, zone.w, zone.h / 4}; + return {zone.x, zone.y + zone.h / 4 * (int)index, zone.w, zone.h / 4}; return zone; } From 092e11e0c00b9f413b1ec1663227a5a939ce9619 Mon Sep 17 00:00:00 2001 From: Risto Date: Sat, 21 Aug 2021 10:14:40 +0200 Subject: [PATCH 2/2] Fix uninitialized variable usage compiler warning --- radio/src/pulses/pulses.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index a6888270f..9086367ad 100755 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -111,7 +111,7 @@ uint8_t getModuleType(uint8_t module) uint8_t getRequiredProtocol(uint8_t module) { - uint8_t protocol; + uint8_t protocol = PROTOCOL_CHANNELS_UNINITIALIZED; switch (getModuleType(module)) { case MODULE_TYPE_PPM: