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

Had forgotten to add the shift in channel names on failsafe setup page

Browse source
This commit is contained in:
Andre Bernet 2015-11-01 14:03:19 +04:00
parent b1ec421b02
commit 1641db873d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
radio/src/gui/Taranis/menu_model_setup.cpp
View file

@ -867,12 +867,13 @@ void menuModelFailsafe(uint8_t event)
static bool longNames = false; static bool longNames = false;
bool newLongNames = false; bool newLongNames = false;
uint8_t ch = 0; uint8_t ch = 0;
uint8_t channelStart = g_model.moduleData[g_moduleIdx].channelsStart;
if (event == EVT_KEY_LONG(KEY_ENTER)) { if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event); killEvents(event);
event = 0; event = 0;
if (s_editMode) { if (s_editMode) {
g_model.moduleData[g_moduleIdx].failsafeChannels[m_posVert] = channelOutputs[m_posVert+g_model.moduleData[g_moduleIdx].channelsStart]; g_model.moduleData[g_moduleIdx].failsafeChannels[m_posVert] = channelOutputs[m_posVert+channelStart];
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
AUDIO_WARNING1(); AUDIO_WARNING1();
s_editMode = 0; s_editMode = 0;
@ -912,7 +913,7 @@ void menuModelFailsafe(uint8_t event)
// Channels // Channels
for (uint8_t line=0; line<8; line++) { for (uint8_t line=0; line<8; line++) {
coord_t y = 9+line*7; coord_t y = 9+line*7;
int32_t channelValue = channelOutputs[ch+g_model.moduleData[g_moduleIdx].channelsStart]; int32_t channelValue = channelOutputs[ch+channelStart];
int32_t failsafeValue = 0; int32_t failsafeValue = 0;
bool failsafeEditable = false; bool failsafeEditable = false;
uint8_t ofs = (col ? 0 : 1); uint8_t ofs = (col ? 0 : 1);
@ -924,13 +925,13 @@ void menuModelFailsafe(uint8_t event)
if (failsafeEditable) { if (failsafeEditable) {
// Channel name if present, number if not // Channel name if present, number if not
uint8_t lenLabel = ZLEN(g_model.limitData[ch].name); uint8_t lenLabel = ZLEN(g_model.limitData[ch+channelStart].name);
if (lenLabel > 4) { if (lenLabel > 4) {
newLongNames = longNames = true; newLongNames = longNames = true;
} }
if (lenLabel > 0) if (lenLabel > 0)
lcd_putsnAtt(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE); lcd_putsnAtt(x+1-ofs, y, g_model.limitData[ch+channelStart].name, sizeof(g_model.limitData[ch+channelStart].name), ZCHAR | SMLSIZE);
else else
putsChn(x+1-ofs, y, ch+1, SMLSIZE); putsChn(x+1-ofs, y, ch+1, SMLSIZE);