This commit is contained in:
bsongis
2012-07-01 19:44:34 +00:00
parent 236c3539d1
commit da024aad74
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -890,12 +890,12 @@ void menuProcPhaseOne(uint8_t event)
break;
case 3:
lcd_putsLeft( y, STR_FADEIN);
lcd_outdezAtt(10*FW, y, phase->fadeIn, attr|LEFT);
lcd_outdezAtt(10*FW, y, phase->fadeIn*5, attr|PREC1|LEFT);
if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeIn, 0, 15);
break;
case 4:
lcd_putsLeft( y, STR_FADEOUT);
lcd_outdezAtt(10*FW, y, phase->fadeOut, attr|LEFT);
lcd_outdezAtt(10*FW, y, phase->fadeOut*5, attr|PREC1|LEFT);
if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeOut, 0, 15);
break;
}
+1 -1
View File
@@ -2041,7 +2041,7 @@ inline void doMixerCalculations(uint16_t tmr10ms, uint8_t tick10ms)
uint8_t fadeTime = max(g_model.phaseData[s_last_phase].fadeOut, g_model.phaseData[phase].fadeIn);
if (fadeTime) {
s_fade_flight_phases |= (1<<s_last_phase) + (1<<phase);
delta = (MAX_ACT / 100) / fadeTime;
delta = (MAX_ACT / 50) / fadeTime;
}
else {
fp_act[s_last_phase] = 0;