Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2159 → Rev 2160

/branches/dongfang_FC_rewrite/configuration.c
71,8 → 71,12
}
 
void setCPUType(void) { // works only after reset or power on when the registers have default values
#if (MCU_TYPE==atmega644)
CPUType=ATMEGA644;
#else
if((UCSR1A == 0x20) && (UCSR1C == 0x06)) CPUType = ATMEGA644P; // initial Values for 644P after reset
else CPUType = ATMEGA644;
#endif
}
 
/*
245,7 → 249,8
motorMixer.matrix[i][MIX_YAW] = 0;
motorMixer.matrix[i][MIX_OPPOSITE_MOTOR] = (uint8_t)-1;
}
// default = Quadro
/*
// default = Quadro+
motorMixer.matrix[0][MIX_PITCH] = +64;
motorMixer.matrix[0][MIX_YAW] = +64;
motorMixer.matrix[0][MIX_OPPOSITE_MOTOR] = 1;
263,27 → 268,30
motorMixer.matrix[3][MIX_OPPOSITE_MOTOR] = 2;
 
memcpy(motorMixer.name, "Quadro +\0", 9);
*/
 
/*
// default = X
mixerMatrix.motor[0][MIX_PITCH] = +45;
mixerMatrix.motor[0][MIX_ROLL] = +45;
mixerMatrix.motor[0][MIX_YAW] = +64;
// default = Quadro
motorMixer.matrix[0][MIX_PITCH] = +64;
motorMixer.matrix[0][MIX_ROLL] = +64;
motorMixer.matrix[0][MIX_YAW] = +64;
motorMixer.matrix[0][MIX_OPPOSITE_MOTOR] = 1;
 
mixerMatrix.motor[1][MIX_PITCH] = -45;
mixerMatrix.motor[1][MIX_ROLL] = -45;
mixerMatrix.motor[1][MIX_YAW] = +64;
motorMixer.matrix[1][MIX_PITCH] = -64;
motorMixer.matrix[1][MIX_ROLL] = -64;
motorMixer.matrix[1][MIX_YAW] = +64;
motorMixer.matrix[1][MIX_OPPOSITE_MOTOR] = 0;
 
mixerMatrix.motor[2][MIX_PITCH] = +45;
mixerMatrix.motor[2][MIX_ROLL] = -45;
mixerMatrix.motor[2][MIX_YAW] = -64;
motorMixer.matrix[2][MIX_PITCH] = +64;
motorMixer.matrix[2][MIX_ROLL] = -64;
motorMixer.matrix[2][MIX_YAW] = -64;
motorMixer.matrix[2][MIX_OPPOSITE_MOTOR] = 3;
 
mixerMatrix.motor[3][MIX_PITCH] = -45;
mixerMatrix.motor[3][MIX_ROLL] = +45;
mixerMatrix.motor[3][MIX_YAW] = -64;
motorMixer.matrix[3][MIX_PITCH] = -64;
motorMixer.matrix[3][MIX_ROLL] = +64;
motorMixer.matrix[3][MIX_YAW] = -64;
motorMixer.matrix[3][MIX_OPPOSITE_MOTOR] = 2;
 
memcpy(motorMixer.name, "Quadro X\0", 9);
*/
}
 
/***************************************************/
290,6 → 298,7
/* Default Values for R/C Channels */
/***************************************************/
void channelMap_default(void) {
channelMap.RCPolarity = 1;
channelMap.channels[CH_PITCH] = 1;
channelMap.channels[CH_ROLL] = 0;
channelMap.channels[CH_THROTTLE] = 2;