Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2365 → Rev 2366

/trunk/fc.c
382,8 → 382,8
if(ServoActive) DDRD |=0x80; // enable J7 -> Servo signal
else
{
// if(EE_Parameter.ServoCompInvert & SERVO_NICK_INV) NickServoValue = ((128 + 60) * 4 * 16); // neutral position = upper 1/4// else
NickServoValue = ((128 - 60) * 4 * 16); // neutral position = lower 1/4
if((EE_Parameter.ServoCompInvert & SERVO_NICK_INV) && (EE_Parameter.ServoCompInvert & SERVO_RELATIVE)) NickServoValue = 12000;//((128 + 60) * 4 * 16); // neutral position = upper 1/4// else
else NickServoValue = ((128 - 60) * 4 * 16); // neutral position = lower 1/4
CalculateServoSignals = 1;
CalculateServo(); // nick
CalculateServo(); // roll
402,7 → 402,6
NeutralAccZ = (int16_t)GetParamWord(PID_ACC_TOP);
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space
#endif
 
if((AdNeutralNick < 150 * 16) || (AdNeutralNick > 850 * 16)) { VersionInfo.HardwareError[0] |= FC_ERROR0_GYRO_NICK; };
if((AdNeutralRoll < 150 * 16) || (AdNeutralRoll > 850 * 16)) { VersionInfo.HardwareError[0] |= FC_ERROR0_GYRO_ROLL; };
if((AdNeutralGier < 150 * 2) || (AdNeutralGier > 850 * 2)) { VersionInfo.HardwareError[0] |= FC_ERROR0_GYRO_YAW; };
1061,6 → 1060,8
SpeakHoTT = SPEAK_MK_OFF;
#endif
}
else
if(delay_ausschalten == 100) beeptime = 3500;
}
else delay_ausschalten = 0;
}
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/timer0.c
271,7 → 271,13
 
if(CalculateServoSignals == 1)
{
nick = (cosinus * IntegralNick) / 128L - (sinus * IntegralRoll) / 128L;
 
if(Parameter_UserParam1 < 100) // testweise
{
nick = (cosinus * IntegralNick) / 128L - (sinus * IntegralRoll) / 128L;
}
else nick = 0;
nick -= POI_KameraNick * 7;
nick = ((long)Parameter_ServoNickComp * nick) / 512L;
// offset (Range from 0 to 255 * 3 = 765)
/trunk/version.txt
614,4 → 614,11
// 30 Fix -> -127
// 31 Fix -> 0
// 32 Fix -> 128
2.00b
- default Camera-Position after calibration changed if Inverted
- some changes in ACC-Altitude hold to reduce climbing in fast foreward fly
- UserParameter1 > 100 disables camera nick control (for BL-Gimbals with self-alignments)
- Beep at motor off (1sek)