diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 03447ec3e..212d1a763 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -738,7 +738,7 @@ void menuProcModel(uint8_t event) } #ifdef DSM2 else if (protocol == PROTO_DSM2) { - if (m_posHorz > 1) m_posHorz = 1; + if (attr && m_posHorz > 1) m_posHorz = 1; int8_t x = limit((int8_t)0, (int8_t)g_model.ppmNCH, (int8_t)2); g_model.ppmNCH = x; lcd_putsiAtt(MODEL_PARAM_OFS+5*FW, y, STR_DSM2MODE, x, (attr && m_posHorz==1) ? blink : 0); diff --git a/src/open9x.cpp b/src/open9x.cpp index 072f39f87..8fface27e 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -1033,20 +1033,20 @@ void checkLowEEPROM() void checkTHR() { - if(g_model.disableThrottleWarning) return; + if (g_model.disableThrottleWarning) return; - int thrchn=(2-(stickMode&1));//stickMode=0123 -> thr=2121 + int thrchn = (2-(stickMode&1));//stickMode=0123 -> thr=2121 #ifdef SIMU int16_t lowLim = THRCHK_DEADBAND - 1024 ; #else getADC_single(); // if thr is down - do not display warning at all - int16_t lowLim = THRCHK_DEADBAND + g_eeGeneral.calibMid[thrchn] - g_eeGeneral.calibSpanNeg[thrchn]; + int16_t lowLim = (g_eeGeneral.throttleReversed ? THRCHK_DEADBAND - g_eeGeneral.calibMid[thrchn] - g_eeGeneral.calibSpanPos[thrchn] : THRCHK_DEADBAND + g_eeGeneral.calibMid[thrchn] - g_eeGeneral.calibSpanNeg[thrchn]); #endif int16_t v = anaIn(thrchn); if (g_eeGeneral.throttleReversed) v = - v; - if(v<=lowLim) return; + if (v<=lowLim) return; // first - display warning MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT); @@ -2012,11 +2012,9 @@ void perOut(uint8_t tick10ms) int16_t v = 0; if (s_perout_mode != e_perout_mode_normal) { if (!sw || k >= NUM_STICKS || (k == THR_STICK && g_model.thrTrim)) { - printf("CONTINUE\n"); continue; } else { - printf("LIGNE AJOUTEE\n"); if (!(s_perout_mode & e_perout_mode_nosticks)) v = anas[k]; }