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

Correct failsafe mapping (fix #2975)

Browse source
This commit is contained in:
Andre Bernet 2015-10-30 12:03:45 +04:00
parent b65fa29e1d
commit 08ff104d26
4 changed files with 68 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

5
companion/src/modeledit/setup.cpp
View file

@ -306,6 +306,11 @@ void ModulePanel::update()
ui->failsafesLayoutLabel->setVisible(mask & MASK_FAILSAFES); ui->failsafesLayoutLabel->setVisible(mask & MASK_FAILSAFES);
ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES); ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
if (mask & MASK_CHANNELS_RANGE) {
ui->channelsStart->setMaximum(32 - ui->channelsCount->value());
ui->channelsCount->setMaximum(qMin(16, 32-ui->channelsStart->value()));
}
} }
void ModulePanel::on_trainerMode_currentIndexChanged(int index) void ModulePanel::on_trainerMode_currentIndexChanged(int index)

8
companion/src/modeledit/setup_module.ui
View file

@ -67,12 +67,12 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="2" column="3" alignment="Qt::AlignLeft"> <item row="2" column="3" alignment="Qt::AlignLeft">
<widget class="QSpinBox" name="channelsStart"> <widget class="QSpinBox" name="channelsStart">
<property name="maximumSize"> <property name="maximumSize">
@ -353,7 +353,7 @@
<string/> <string/>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>4</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16</number> <number>16</number>

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

@ -876,9 +876,10 @@ void menuModelFailsafe(uint8_t event)
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].failsafeChannels[m_posVert] = channelOutputs[m_posVert+g_model.moduleData[g_moduleIdx].channelsStart];
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
AUDIO_WARNING1(); AUDIO_WARNING1();
s_editMode = 0;
SEND_FAILSAFE_NOW(g_moduleIdx); SEND_FAILSAFE_NOW(g_moduleIdx);
} }
else { else {
@ -888,14 +889,14 @@ void menuModelFailsafe(uint8_t event)
else if (failsafe == FAILSAFE_CHANNEL_HOLD) else if (failsafe == FAILSAFE_CHANNEL_HOLD)
failsafe = FAILSAFE_CHANNEL_NOPULSE; failsafe = FAILSAFE_CHANNEL_NOPULSE;
else else
failsafe = channelOutputs[m_posVert]; failsafe = 0;
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
AUDIO_WARNING1(); AUDIO_WARNING1();
SEND_FAILSAFE_NOW(g_moduleIdx); SEND_FAILSAFE_NOW(g_moduleIdx);
} }
} }
SIMPLE_SUBMENU_NOTITLE(NUM_CHNOUT); SIMPLE_SUBMENU_NOTITLE(NUM_CHANNELS(g_moduleIdx));
SET_SCROLLBAR_X(0); SET_SCROLLBAR_X(0);
@ -904,10 +905,6 @@ void menuModelFailsafe(uint8_t event)
// Column separator // Column separator
lcd_vline(LCD_W/2, FH, LCD_H-FH); lcd_vline(LCD_W/2, FH, LCD_H-FH);
if (m_posVert >= 16) {
ch = 16;
}
lcd_putsCenter(0*FH, FAILSAFESET); lcd_putsCenter(0*FH, FAILSAFESET);
lcd_invert_line(0); lcd_invert_line(0);
@ -919,77 +916,78 @@ 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]; int32_t channelValue = channelOutputs[ch+g_model.moduleData[g_moduleIdx].channelsStart];
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);
if (ch >= g_model.moduleData[g_moduleIdx].channelsStart && ch < NUM_CHANNELS(g_moduleIdx) + g_model.moduleData[g_moduleIdx].channelsStart) { if (ch < NUM_CHANNELS(g_moduleIdx)) {
failsafeValue = g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line]; failsafeValue = g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line];
failsafeEditable = true; failsafeEditable = true;
} }
// Channel name if present, number if not if (failsafeEditable) {
uint8_t lenLabel = ZLEN(g_model.limitData[ch].name); // Channel name if present, number if not
if (lenLabel > 4) { uint8_t lenLabel = ZLEN(g_model.limitData[ch].name);
newLongNames = longNames = true; if (lenLabel > 4) {
} newLongNames = longNames = true;
}
if (lenLabel > 0)
lcd_putsnAtt(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE); if (lenLabel > 0)
else lcd_putsnAtt(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
putsChn(x+1-ofs, y, ch+1, SMLSIZE); else
putsChn(x+1-ofs, y, ch+1, SMLSIZE);
// Value
LcdFlags flags = TINSIZE; // Value
if (m_posVert == ch) { LcdFlags flags = TINSIZE;
flags |= INVERS; if (m_posVert == ch) {
if (s_editMode) { flags |= INVERS;
if (!failsafeEditable || failsafeValue == FAILSAFE_CHANNEL_HOLD || failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { if (s_editMode) {
s_editMode = 0; if (failsafeValue == FAILSAFE_CHANNEL_HOLD || failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
} s_editMode = 0;
else { }
flags |= BLINK; else {
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line], -lim, +lim); flags |= BLINK;
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line], -lim, +lim);
}
} }
} }
}
#if defined(PPM_UNIT_PERCENT_PREC1) #if defined(PPM_UNIT_PERCENT_PREC1)
uint8_t wbar = (longNames ? SLIDER_W-16 : SLIDER_W-6); uint8_t wbar = (longNames ? SLIDER_W-16 : SLIDER_W-6);
#else #else
uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W); uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W);
#endif #endif
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) { if (failsafeValue == FAILSAFE_CHANNEL_HOLD) {
lcd_putsAtt(x+COL_W-4-wbar-ofs-16, y, "HOLD", flags); lcd_putsAtt(x+COL_W-4-wbar-ofs-16, y, "HOLD", flags);
failsafeValue = 0; failsafeValue = 0;
} }
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
lcd_putsAtt(x+COL_W-4-wbar-ofs-16, y, "NONE", flags); lcd_putsAtt(x+COL_W-4-wbar-ofs-16, y, "NONE", flags);
failsafeValue = 0; failsafeValue = 0;
} }
else { else {
#if defined(PPM_UNIT_US) #if defined(PPM_UNIT_US)
lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags); lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags);
#elif defined(PPM_UNIT_PERCENT_PREC1) #elif defined(PPM_UNIT_PERCENT_PREC1)
lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags); lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags);
#else #else
lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags); lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags);
#endif #endif
}
// Gauge
lcd_rect(x+COL_W-3-wbar-ofs, y, wbar+1, 6);
unsigned int lenChannel = limit((uint8_t)1, uint8_t((abs(channelValue) * wbar/2 + lim/2) / lim), uint8_t(wbar/2));
unsigned int lenFailsafe = limit((uint8_t)1, uint8_t((abs(failsafeValue) * wbar/2 + lim/2) / lim), uint8_t(wbar/2));
coord_t xChannel = (channelValue>0) ? x+COL_W-ofs-3-wbar/2 : x+COL_W-ofs-2-wbar/2-lenChannel;
coord_t xFailsafe = (failsafeValue>0) ? x+COL_W-ofs-3-wbar/2 : x+COL_W-ofs-2-wbar/2-lenFailsafe;
lcd_hlineStip(xChannel, y+1, lenChannel, DOTTED, 0);
lcd_hlineStip(xChannel, y+2, lenChannel, DOTTED, 0);
lcd_hline(xFailsafe, y+3, lenFailsafe);
lcd_hline(xFailsafe, y+4, lenFailsafe);
} }
// Gauge
lcd_rect(x+COL_W-3-wbar-ofs, y, wbar+1, 6);
unsigned int lenChannel = limit((uint8_t)1, uint8_t((abs(channelValue) * wbar/2 + lim/2) / lim), uint8_t(wbar/2));
unsigned int lenFailsafe = limit((uint8_t)1, uint8_t((abs(failsafeValue) * wbar/2 + lim/2) / lim), uint8_t(wbar/2));
coord_t xChannel = (channelValue>0) ? x+COL_W-ofs-3-wbar/2 : x+COL_W-ofs-2-wbar/2-lenChannel;
coord_t xFailsafe = (failsafeValue>0) ? x+COL_W-ofs-3-wbar/2 : x+COL_W-ofs-2-wbar/2-lenFailsafe;
lcd_hlineStip(xChannel, y+1, lenChannel, DOTTED, 0);
lcd_hlineStip(xChannel, y+2, lenChannel, DOTTED, 0);
lcd_hline(xFailsafe, y+3, lenFailsafe);
lcd_hline(xFailsafe, y+4, lenFailsafe);
ch++; ch++;
} }
} }

4
radio/src/pulses/pxx_arm.cpp
View file

@ -231,7 +231,7 @@ void setupPulsesPXX(unsigned int port)
} }
else { else {
if (i < sendUpperChannels) { if (i < sendUpperChannels) {
int16_t failsafeValue = g_model.moduleData[port].failsafeChannels[8+g_model.moduleData[port].channelsStart+i]; int16_t failsafeValue = g_model.moduleData[port].failsafeChannels[8+i];
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) if (failsafeValue == FAILSAFE_CHANNEL_HOLD)
chan = 4095; chan = 4095;
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE)
@ -240,7 +240,7 @@ void setupPulsesPXX(unsigned int port)
chan = limit(2049, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (failsafeValue * 512 / 682) + 3072, 4094); chan = limit(2049, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (failsafeValue * 512 / 682) + 3072, 4094);
} }
else { else {
int16_t failsafeValue = g_model.moduleData[port].failsafeChannels[g_model.moduleData[port].channelsStart+i]; int16_t failsafeValue = g_model.moduleData[port].failsafeChannels[i];
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) if (failsafeValue == FAILSAFE_CHANNEL_HOLD)
chan = 2047; chan = 2047;
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE)