Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1787 → Rev 1788

/beta/Code Redesign killagreg/eeprom.c
171,11 → 171,11
ParamSet.UserParam8 = 0;
ParamSet.ServoCompInvert = 2;
ParamSet.ServoRefresh = 5;
ParamSet.ServoNickControl = 100;
ParamSet.ServoNickControl = 120;
ParamSet.ServoNickComp = 40;
ParamSet.ServoNickMin = 15;
ParamSet.ServoNickMax = 255;
ParamSet.ServoRollControl = 100;
ParamSet.ServoNickMax = 247;
ParamSet.ServoRollControl = 120;
ParamSet.ServoRollComp = 90;
ParamSet.ServoRollMin = 0;
ParamSet.ServoRollMax = 247;
/beta/Code Redesign killagreg/fc.c
211,11 → 211,6
DebugOut.Analog[31] = GPSStickRoll;
if(UART_VersionInfo.HardwareError[0] || UART_VersionInfo.HardwareError[1]) DebugOut.Status[1] |= 0x01;
else DebugOut.Status[1] &= ~0x01;
if(Capacity.MinOfMaxPWM < 250/* && ModelIsFlying > 500*/)
{
BeepTime = 1000;
DebugOut.Analog[25]++;
}
}
 
/************************************************************************/
638,11 → 633,28
if(RC_Quality > 160) // do the mapping of RC-Potis only if the rc-signal is ok
// else the last updated values are used
{
uint8_t tmp;
uint8_t tmp, i;
//update poti values by rc-signals
#define CHK_POTI(b,a) { if(a < 248) b = a; else b = Poti[255 - a]; }
#define CHK_POTI_MM(b,a,min,max) {CHK_POTI(b,a); LIMIT_MIN_MAX(b, min, max); }
 
// update poti values
// limit poti values
#define POTI_MIN 0
#define POTI_MAX 255
for(i=0; i<8; i++)
{
int tmp;
tmp = PPM_in[ParamSet.ChannelAssignment[CH_POTI1+i]] + RC_POTI_OFFSET;
LIMIT_MIN_MAX(tmp, POTI_MIN, POTI_MAX);
if(tmp != Poti[i])
{
Poti[i] += (tmp - Poti[i]) / 8;
if(Poti[i] > tmp) Poti[i]--;
else Poti[i]++;
}
}
 
CHK_POTI_MM(FCParam.HeightD,ParamSet.HeightD,0,100);
CHK_POTI_MM(FCParam.HeightP,ParamSet.HeightP,0,100);
CHK_POTI_MM(FCParam.GyroP,ParamSet.GyroP,10,255);
806,23 → 818,6
}
else FC_StatusFlags |= FC_STATUS_FLY; // set fly flag
 
// update poti values
// limit poti values
#define POTI_MIN 0
#define POTI_MAX 255
for(i=0; i<8; i++)
{
int tmp;
tmp = PPM_in[ParamSet.ChannelAssignment[CH_POTI1+i]] + RC_POTI_OFFSET;
LIMIT_MIN_MAX(tmp, POTI_MIN, POTI_MAX);
if(tmp != Poti[i])
{
Poti[i] += (tmp - Poti[i]) / 8;
if(Poti[i] > tmp) Poti[i]--;
else Poti[i]++;
}
}
 
// if motors are off and the gas stick is in the upper position
if((PPM_in[ParamSet.ChannelAssignment[CH_GAS]] > 80) && !(FC_StatusFlags & FC_STATUS_MOTOR_RUN) )
{
/beta/Code Redesign killagreg/libfc644.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/beta/Code Redesign killagreg/makefile
6,7 → 6,7
#-------------------------------------------------------------------
VERSION_MAJOR = 0
VERSION_MINOR = 81
VERSION_PATCH = 1
VERSION_PATCH = 2
 
VERSION_SERIAL_MAJOR = 11 # Serial Protocol Major Version
VERSION_SERIAL_MINOR = 0 # Serial Protocol Minor Version
/beta/Code Redesign killagreg/spi.c
378,6 → 378,7
GPSInfo.Speed = FromNaviCtrl.Param.Byte[3];
GPSInfo.HomeDistance = FromNaviCtrl.Param.Int[2];
GPSInfo.HomeBearing = FromNaviCtrl.Param.sInt[3];
PPM_in[MAX_CHANNELS-1] = (int16_t)FromNaviCtrl.Param.Byte[8]; // WP_EVENT-Channel
break;
 
default:
/beta/Code Redesign killagreg/version.txt
416,17 → 416,15
- bei I2C-Fehlern wurden die Counter zurück gesetzt und für einige ms die Interrupts angehalten - das ist jetzt behoben
- Nur I2C-Daten senden, wenn das alte Paket komplett raus ist
 
0.81a H.Buss 20.10.2010
- MotorSafetySwitch - Verriegelt das Ein/Ausschalten
- ServoManualControlSpeed - Verlangsamt das Cam-Servo
- CamOrientation - für verdrehte Kamera-Servos
- Position der Status-Bits verändert
- "Zucken" der Servos bei kurzen Empfangsausfällen behoben
0.81b H.Buss + I.Busker 27.10.2010
- jeti update command 'j' added
- Poti-Auswertung nach ParameterZuordnung() verschoben -> FC-Code schneller
- Waypont-Events z.B. zum Triggern der Kamera
 
 
 
Anpassungen bzgl. V0.81a
G.Stobrawa 20.10.2010
Anpassungen bzgl. V0.81b
G.Stobrawa 1.11.2010
 
- Code stärker modularisiert und restrukturiert
- viele Kommentare zur Erklärug eingefügt