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

Issue 83 fixed

Browse Source 
Problem with wav files played twice when loading a model
Different EEPROM format for Expos/DRs on ARM
Issue 102 fixed
This commit is contained in:
bsongis
2012-08-21 20:54:48 +00:00
parent 223c0645e8
commit bf2055e1ad
9 changed files with 107 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
-46
View File
@@ -1328,25 +1328,6 @@ bool reachExpoMixCountLimit(uint8_t expo)
return false;
}
#if defined(PCBV4)
inline void pauseMixerCalculations()
{
cli();
TIMSK5 &= ~(1<<OCIE5A);
sei();
}
inline void resumeMixerCalculations()
{
cli();
TIMSK5 |= (1<<OCIE5A);
sei();
}
#else
#define pauseMixerCalculations()
#define resumeMixerCalculations()
#endif
void deleteExpoMix(uint8_t expo, uint8_t idx)
{
pauseMixerCalculations();
@@ -1553,12 +1534,6 @@ void menuProcExpoOne(uint8_t event)
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT((int8_t&)ed->weight));
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, (int8_t&)ed->weight, 0, 100, 0, STR_DRWEIGHT);
break;
#if defined(PCBARM)
case EXPO_FIELD_EXPO:
lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->expo, attr|INFLIGHT(ed->expo));
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, ed->expo, -100, 100, 0, STR_DREXPO);
break;
#else
case EXPO_FIELD_EXPO:
if (ed->curveMode==MODE_EXPO || ed->curveParam==0) {
ed->curveMode = MODE_EXPO;
@@ -1569,20 +1544,7 @@ void menuProcExpoOne(uint8_t event)
lcd_putsAtt(EXPO_ONE_2ND_COLUMN, y, STR_NA, attr);
}
break;
#endif
#if defined(CURVES)
#if defined(PCBARM)
case EXPO_FIELD_CURVE:
putsCurve(EXPO_ONE_2ND_COLUMN, y, ed->curve, attr);
if (attr) {
CHECK_INCDEC_MODELVAR(event, ed->curve, 0, CURVE_BASE+MAX_CURVES-1);
if (ed->curve>=CURVE_BASE && event==EVT_KEY_FIRST(KEY_MENU)) {
s_curveChan = ed->curve - CURVE_BASE;
pushMenu(menuProcCurveOne);
}
}
break;
#else
case EXPO_FIELD_CURVE:
if (ed->curveMode!=MODE_EXPO || ed->curveParam==0) {
putsCurve(EXPO_ONE_2ND_COLUMN, y, ed->curveParam, attr);
@@ -1600,7 +1562,6 @@ void menuProcExpoOne(uint8_t event)
}
break;
#endif
#endif
#if defined(FLIGHT_PHASES)
case EXPO_FIELD_FLIGHT_PHASE:
ed->phases = editPhases(EXPO_ONE_2ND_COLUMN-2*FW, y, event, ed->phases, attr);
@@ -2000,17 +1961,10 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
CHECK_INCDEC_MODELVAR(_event, ed->weight, 0, 100);
}
#if defined(PCBARM)
if (ed->curve)
putsCurve(EXPO_LINE_EXPO_POS-3*FW, y, ed->curve);
else if (ed->expo)
lcd_outdezAtt(EXPO_LINE_EXPO_POS, y, ed->expo, 0);
#else
if (ed->curveMode == MODE_CURVE)
putsCurve(EXPO_LINE_EXPO_POS-3*FW, y, ed->curveParam);
else
lcd_outdezAtt(EXPO_LINE_EXPO_POS, y, ed->curveParam, 0);
#endif
#if defined(PCBARM)
if (ed->name[0]) {