From 38cba03556d68e86965bbb47c4f9261cb87b959b Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 27 May 2016 11:04:01 +0200 Subject: [PATCH] Compilation fix --- radio/src/gui/horus/widgets/outputs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/horus/widgets/outputs.cpp b/radio/src/gui/horus/widgets/outputs.cpp index 049182532..bf0c690a6 100644 --- a/radio/src/gui/horus/widgets/outputs.cpp +++ b/radio/src/gui/horus/widgets/outputs.cpp @@ -39,7 +39,7 @@ class OutputsWidget: public Widget char chanString[] = "CH32"; uint8_t lastChan = firstChan + h / ROW_HEIGHT; - for (uint8_t curChan = firstChan; curChan <= lastChan and curChan < 33; curChan++) { + for (uint8_t curChan = firstChan; curChan <= lastChan && curChan < 33; curChan++) { int16_t chanVal = calcRESXto100(channelOutputs[curChan-1]); strAppend(chanString, "CH"); strAppendSigned(&chanString[2], curChan, 2); @@ -83,9 +83,9 @@ const ZoneOption OutputsWidget::options[] = { void OutputsWidget::refresh() { - if (zone.w > 300 and zone.h > 20) + if (zone.w > 300 && zone.h > 20) twoColumns(); - else if (zone.w > 150 and zone.h > 20) + else if (zone.w > 150 && zone.h > 20) oneColumn(); };