Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

[Horus] Logical switches UI fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-03-21 18:38:52 +01:00
parent 38e44991e9
commit e6acfc7e88
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
radio/src/gui/horus/menu_model_logical_switches.cpp
View file

@ -2,7 +2,7 @@
* Copyright (C) OpenTX * Copyright (C) OpenTX
* *
* Based on code named * Based on code named
* th9x - http://code.google.com/p/th9x * th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x * er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x * gruvin9x - http://code.google.com/p/gruvin9x
* *
@ -19,7 +19,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "../../opentx.h" #include "opentx.h"
enum LogicalSwitchFields { enum LogicalSwitchFields {
LS_FIELD_FUNCTION, LS_FIELD_FUNCTION,
@ -33,28 +33,25 @@ enum LogicalSwitchFields {
LS_FIELD_LAST = LS_FIELD_COUNT-1 LS_FIELD_LAST = LS_FIELD_COUNT-1
}; };
#define CSW_1ST_COLUMN 42 #define CSW_1ST_COLUMN 50
#define CSW_2ND_COLUMN 90 #define CSW_2ND_COLUMN 120
#define CSW_3RD_COLUMN 140 #define CSW_3RD_COLUMN 200
#define CSW_4TH_COLUMN 200 #define CSW_4TH_COLUMN 280
#define CSW_5TH_COLUMN 245 #define CSW_5TH_COLUMN 340
#define CSW_6TH_COLUMN 300 #define CSW_6TH_COLUMN 390
void putsEdgeDelayParam(coord_t x, coord_t y, LogicalSwitchData *cs, uint8_t lattr, uint8_t rattr) void putsEdgeDelayParam(coord_t x, coord_t y, LogicalSwitchData *cs, uint8_t lattr, uint8_t rattr)
{ {
char s[32]; lcdDrawChar(x, y, '[');
div_t left = div(lswTimerValue(cs->v2), 10); lcdDrawNumber(lcdNextPos+3, y, lswTimerValue(cs->v2), LEFT|PREC1|lattr);
char sleft[10]; lcdDrawChar(lcdNextPos+3, y, ':');
sprintf(sleft, "%d.%d", left.quot, left.rem); if (cs->v3 < 0)
div_t right = div(lswTimerValue(cs->v2+cs->v3), 10); lcdDrawText(lcdNextPos+3, y, "<<", rattr);
char sright[10];
sprintf(sright, "%d.%d", right.quot, right.rem);
sprintf(s, "[%s:%s]", sleft, sright);
lcdDrawText(x-4, y, s);
/* if (cs->v3 < 0)
lcdDrawText(lcdLastPos+3, y, "<<", rattr);
else if (cs->v3 == 0) else if (cs->v3 == 0)
lcdDrawText(lcdLastPos+3, y, "--", rattr); */ lcdDrawText(lcdNextPos+3, y, "--", rattr);
else
lcdDrawNumber(lcdNextPos+3, y, lswTimerValue(cs->v2+cs->v3), LEFT|PREC1|rattr);
lcdDrawChar(lcdNextPos+3, y, ']');
} }
void onLogicalSwitchesMenu(const char *result) void onLogicalSwitchesMenu(const char *result)