Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Compilation fix

Browse source
This commit is contained in:
Andre Bernet 2016-05-27 11:04:01 +02:00
parent 79b2015b6e
commit 38cba03556
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/horus/widgets/outputs.cpp
View file

@ -39,7 +39,7 @@ class OutputsWidget: public Widget
char chanString[] = "CH32"; char chanString[] = "CH32";
uint8_t lastChan = firstChan + h / ROW_HEIGHT; 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]); int16_t chanVal = calcRESXto100(channelOutputs[curChan-1]);
strAppend(chanString, "CH"); strAppend(chanString, "CH");
strAppendSigned(&chanString[2], curChan, 2); strAppendSigned(&chanString[2], curChan, 2);
@ -83,9 +83,9 @@ const ZoneOption OutputsWidget::options[] = {
void OutputsWidget::refresh() void OutputsWidget::refresh()
{ {
if (zone.w > 300 and zone.h > 20) if (zone.w > 300 && zone.h > 20)
twoColumns(); twoColumns();
else if (zone.w > 150 and zone.h > 20) else if (zone.w > 150 && zone.h > 20)
oneColumn(); oneColumn();
}; };