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

[Taranis] New gauge in Mixers/Expos screen was not right when there was

Browse Source 
no line associated to the Mix/Input channel. Now the gauge is not
displayed in such case. Needs tests again, thanks!
This commit is contained in:
bsongis
2015-07-18 12:38:13 +02:00
parent 6147c23c0f
commit b04295ad44
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/Taranis/menu_model_inputs_mixes.cpp
+13 -5
View File
@@ -837,12 +837,16 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
// Value
uint8_t index = expoAddress(s_currIdx)->chn;
lcd_outdezAtt(120, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE);
if (!s_currCh) {
lcd_outdezAtt(120, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE);
}
SIMPLE_MENU(STR_MENUINPUTS, menuTabModel, e_InputsAll, s_maxLines);
// Gauge
drawGauge(120, 1, 58, 6, anas[index], 1024);
if (!s_currCh) {
drawGauge(120, 1, 58, 6, anas[index], 1024);
}
}
else {
lcd_outdezAtt(FW*sizeof(TR_MIXER)+FW+FW/2, 0, getExpoMixCount(false));
@@ -850,13 +854,17 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
// Value
uint8_t index = mixAddress(s_currIdx)->destCh;
displayHeaderChannelName(index);
lcd_outdezAtt(120, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE);
if (!s_currCh) {
displayHeaderChannelName(index);
lcd_outdezAtt(120, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE);
}
SIMPLE_MENU(STR_MIXER, menuTabModel, e_MixAll, s_maxLines);
// Gauge
drawGauge(120, 1, 58, 6, ex_chans[index], 1024);
if (!s_currCh) {
drawGauge(120, 1, 58, 6, ex_chans[index], 1024);
}
}
sub = m_posVert;