Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1970 → Rev 1971

/branches/dongfang_FC_rewrite/ADXRS610_FC2.0.c
8,7 → 8,11
// Nothing to calibrate.
}
 
void gyro_setDefaults(void) {
void gyro_loadAmplifierOffsets(uint8_t overwriteWithDefaults) {
// No amplifiers, no DAC.
}
 
void gyro_setDefaultParameters(void) {
staticParams.gyroD = 5;
staticParams.driftCompDivider = 1;
staticParams.driftCompLimit = 3;
/branches/dongfang_FC_rewrite/ENC-03_FC1.3.c
53,7 → 53,7
delay_ms_with_adc_measurement(70);
}
 
void gyro_loadOffsets(uint8_t overwriteWithDefaults) {
void gyro_loadAmplifierOffsets(uint8_t overwriteWithDefaults) {
uint16_t timeout = setDelay(2000);
 
if (overwriteWithDefaults) {
73,7 → 73,7
}
}
 
void gyro_setDefaults(void) {
void gyro_setDefaultParameters(void) {
staticParams.gyroD = 3;
staticParams.driftCompDivider = 1;
staticParams.driftCompLimit = 200;
/branches/dongfang_FC_rewrite/analog.c
472,9 → 472,9
void analog_setNeutral() {
if (gyroAmplifierOffset_readFromEEProm()) {
printf("gyro amp invalid%s",recal);
gyro_loadOffsets(1);
gyro_loadAmplifierOffsets(1);
} else
gyro_loadOffsets(0);
gyro_loadAmplifierOffsets(0);
 
if (gyroOffset_readFromEEProm()) {
printf("gyro offsets invalid%s",recal);
/branches/dongfang_FC_rewrite/configuration.c
272,7 → 272,7
/***************************************************/
void paramSet_default(uint8_t setnumber) {
setOtherDefaults();
gyro_setDefaults();
gyro_setDefaultParameters();
for (uint8_t i=0; i<8; i++) {
staticParams.userParams[i] = 0;
/branches/dongfang_FC_rewrite/heightControl.c
90,6 → 90,8
// height, in meters (so the division factor is: 100)
// debugOut.analog[30] = filteredAirPressure / 10;
debugOut.analog[30] = (125200 - filteredAirPressure) / 100;
// Calculated 0 alt number: 108205
// Experimental 0 alt number: 125200
}
 
// takes 180-200 usec (with integral term). That is too heavy!!!
/branches/dongfang_FC_rewrite/invenSense.c
32,7 → 32,11
delay_ms_with_adc_measurement(100);
}
 
void gyro_setDefaults(void) {
void gyro_loadAmplifierOffsets(uint8_t overwriteWithDefaults) {
// No amplifiers, no DAC.
}
 
void gyro_setDefaultParameters(void) {
staticParams.gyroD = 3;
staticParams.driftCompDivider = 2;
staticParams.driftCompLimit = 3;
/branches/dongfang_FC_rewrite/makefile
23,18 → 23,18
#RC = DSL
#RC = SPECTRUM
 
GYRO=ENC-03_FC1.3
GYRO_HW_NAME=ENC
GYRO_HW_FACTOR=1.304f
#GYRO=ENC-03_FC1.3
#GYRO_HW_NAME=ENC
#GYRO_HW_FACTOR=1.304f
#GYRO_PITCHROLL_CORRECTION=1.0f
#GYRO_YAW_CORRECTION=1.0f
 
GYRO=ADXRS610_FC2.0
GYRO_HW_NAME=ADXR
GYRO_HW_FACTOR=1.2288f
GYRO_PITCHROLL_CORRECTION=1.0f
GYRO_YAW_CORRECTION=1.0f
 
#GYRO=ADXRS610_FC2.0
#GYRO_HW_NAME=ADXR
#GYRO_HW_FACTOR=1.2288f
#GYRO_PITCHROLL_CORRECTION=1.0f
#GYRO_YAW_CORRECTION=1.0f
 
#GYRO=invenSense
#GYRO_HW_NAME=Isense
#GYRO_HW_FACTOR=0.6827f
/branches/dongfang_FC_rewrite/sensors.h
26,11 → 26,11
/*
* FC 1.3: Output data in gyroAmplifierOffset to DAC. All other versions: Do nothing.
*/
void gyro_loadOffsets(uint8_t overwriteWithDefaults);
void gyro_loadAmplifierOffsets(uint8_t overwriteWithDefaults);
 
/*
* Set some default FC parameters, depending on gyro type: Drift correction etc.
*/
void gyro_setDefaults(void);
void gyro_setDefaultParameters(void);
 
#endif