piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into kilrah/antennaselection

Browse Source 
# Conflicts:
#	radio/src/translations/de.h.txt
#	radio/src/translations/it.h.txt
#	radio/src/translations/pt.h.txt
#	radio/src/translations/se.h.txt
This commit is contained in:
Andre Bernet
2016-04-01 19:37:10 +04:00
parent 75977b6b6d 555f6510b2
commit 36316ecf4c
33 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/lcd.cpp
+1 -1
View File
@@ -427,7 +427,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
return dest;
}
void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags flags)
void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags flags)
{
char s[16];
getSourceString(s, idx);
radio/src/gui/horus/lcd.h
+1 -1
View File
@@ -118,7 +118,7 @@ void drawStringWithIndex(coord_t x, coord_t y, const pm_char *str, int idx, LcdF
void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
void putsSwitches(coord_t x, coord_t y, swsrc_t swtch, LcdFlags flags=0);
void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0);
void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
void putsCurveRef(coord_t x, coord_t y, CurveRef &curve, LcdFlags att=0);
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
radio/src/gui/horus/menu_model_logical_switches.cpp
+2 -2
View File
@@ -144,7 +144,7 @@ bool menuModelLogicalSwitches(evt_t event)
}
}
else if (cstate == LS_FAMILY_COMP) {
v1_val = (uint8_t)cs->v1;
v1_val = cs->v1;
putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1);
putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2);
INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE);
@@ -159,7 +159,7 @@ bool menuModelLogicalSwitches(evt_t event)
INCDEC_ENABLE_CHECK(NULL);
}
else {
v1_val = (uint8_t)cs->v1;
v1_val = cs->v1;
putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1);
if (horz == 1) {
INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE);
radio/src/gui/horus/menu_model_telemetry.cpp
+1 -1
View File
@@ -426,7 +426,7 @@ bool menuModelTelemetry(evt_t event)
lcdDrawSizedText(60, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
TelemetryItem & telemetryItem = telemetryItems[index];
if (telemetryItem.isFresh()) {
lcdDrawText(100, y, "*");
lcdDrawText(130, y, "*");
}
if (telemetryItem.isAvailable()) {
LcdFlags color = telemetryItem.isOld() ? ALARM_COLOR : TEXT_COLOR;
radio/src/gui/horus/topbar.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "widgets_container.h"
#define MAX_TOPBAR_ZONES 5
#define MAX_TOPBAR_ZONES 4
#define MAX_TOPBAR_OPTIONS 0
#define TOPBAR_ZONE_WIDTH 70
#define TOPBAR_ZONE_MARGIN 3