Subversion Repositories FlightCtrl

Rev

Rev 2159 | Rev 2164 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2159 Rev 2160
Line 69... Line 69...
69 
    *pointerToTgt = configuration_applyVariableToParam(src, 0, 255);
 69 
    *pointerToTgt = configuration_applyVariableToParam(src, 0, 255);
70 
  }
 70 
  }
71 
}
 71 
}
Line 72... Line 72...
72 
 
 72 
 
- 
 
 73 
void setCPUType(void) {   // works only after reset or power on when the registers have default values
- 
 
 74 
#if (MCU_TYPE==atmega644)
- 
 
 75 
        CPUType=ATMEGA644;
73 
void setCPUType(void) {   // works only after reset or power on when the registers have default values
 76 
#else
74 
  if((UCSR1A == 0x20) && (UCSR1C == 0x06)) CPUType = ATMEGA644P;  // initial Values for 644P after reset
 77 
  if((UCSR1A == 0x20) && (UCSR1C == 0x06)) CPUType = ATMEGA644P;  // initial Values for 644P after reset
- 
 
 78 
  else CPUType = ATMEGA644;
75 
  else CPUType = ATMEGA644;
 79 
#endif
Line 76... Line 80...
76 
}
 80 
}
77 
 
 81 
 
78 
/*
 82 
/*
Line 243... Line 247...
243 
    motorMixer.matrix[i][MIX_PITCH] = 0;
 247 
    motorMixer.matrix[i][MIX_PITCH] = 0;
244 
    motorMixer.matrix[i][MIX_ROLL] = 0;
 248 
    motorMixer.matrix[i][MIX_ROLL] = 0;
245 
    motorMixer.matrix[i][MIX_YAW] = 0;
 249 
    motorMixer.matrix[i][MIX_YAW] = 0;
246 
    motorMixer.matrix[i][MIX_OPPOSITE_MOTOR] = (uint8_t)-1;
 250 
    motorMixer.matrix[i][MIX_OPPOSITE_MOTOR] = (uint8_t)-1;
247 
  }
 251 
  }
- 
 
 252 
  /*
248 
  // default = Quadro
 253 
  // default = Quadro+
249 
  motorMixer.matrix[0][MIX_PITCH] = +64;
 254 
  motorMixer.matrix[0][MIX_PITCH] = +64;
250 
  motorMixer.matrix[0][MIX_YAW] = +64;
 255 
  motorMixer.matrix[0][MIX_YAW] = +64;
251 
  motorMixer.matrix[0][MIX_OPPOSITE_MOTOR] = 1;
 256 
  motorMixer.matrix[0][MIX_OPPOSITE_MOTOR] = 1;
Line 252... Line 257...
252 
 
 257 
 
Line 261... Line 266...
261 
  motorMixer.matrix[3][MIX_ROLL] = +64;
 266 
  motorMixer.matrix[3][MIX_ROLL] = +64;
262 
  motorMixer.matrix[3][MIX_YAW] = -64;
 267 
  motorMixer.matrix[3][MIX_YAW] = -64;
263 
  motorMixer.matrix[3][MIX_OPPOSITE_MOTOR] = 2;
 268 
  motorMixer.matrix[3][MIX_OPPOSITE_MOTOR] = 2;
Line 264... Line 269...
264 
 
 269 
 
- 
 
 270 
  memcpy(motorMixer.name, "Quadro +\0", 9);
Line 265... Line -...
265 
  memcpy(motorMixer.name, "Quadro +\0", 9);
 - 
 
266 
 
 271 
  */
267 
  /*
 272 
 
268 
  // default = X
 273 
  // default = Quadro
269 
  mixerMatrix.motor[0][MIX_PITCH] = +45;
 274 
  motorMixer.matrix[0][MIX_PITCH] = +64;
- 
 
 275 
  motorMixer.matrix[0][MIX_ROLL] = +64;
270 
  mixerMatrix.motor[0][MIX_ROLL]  = +45;
 276 
  motorMixer.matrix[0][MIX_YAW] = +64;
271 
  mixerMatrix.motor[0][MIX_YAW]   = +64;
 277 
  motorMixer.matrix[0][MIX_OPPOSITE_MOTOR] = 1;
272 
 
 278 
 
273 
  mixerMatrix.motor[1][MIX_PITCH] = -45;
 279 
  motorMixer.matrix[1][MIX_PITCH] = -64;
- 
 
 280 
  motorMixer.matrix[1][MIX_ROLL] = -64;
274 
  mixerMatrix.motor[1][MIX_ROLL]  = -45;
 281 
  motorMixer.matrix[1][MIX_YAW] = +64;
275 
  mixerMatrix.motor[1][MIX_YAW]   = +64;
 282 
  motorMixer.matrix[1][MIX_OPPOSITE_MOTOR] = 0;
276 
 
 283 
 
277 
  mixerMatrix.motor[2][MIX_PITCH] = +45;
 284 
  motorMixer.matrix[2][MIX_PITCH] = +64;
- 
 
 285 
  motorMixer.matrix[2][MIX_ROLL] = -64;
278 
  mixerMatrix.motor[2][MIX_ROLL]  = -45;
 286 
  motorMixer.matrix[2][MIX_YAW] = -64;
279 
  mixerMatrix.motor[2][MIX_YAW]   = -64;
 287 
  motorMixer.matrix[2][MIX_OPPOSITE_MOTOR] = 3;
280 
 
 288 
 
281 
  mixerMatrix.motor[3][MIX_PITCH] = -45;
 289 
  motorMixer.matrix[3][MIX_PITCH] = -64;
- 
 
 290 
  motorMixer.matrix[3][MIX_ROLL] = +64;
Line 282... Line 291...
282 
  mixerMatrix.motor[3][MIX_ROLL]  = +45;
 291 
  motorMixer.matrix[3][MIX_YAW] = -64;
283 
  mixerMatrix.motor[3][MIX_YAW]   = -64;
 - 
 
284 
 
 292 
  motorMixer.matrix[3][MIX_OPPOSITE_MOTOR] = 2;
Line 285... Line 293...
285 
  memcpy(motorMixer.name, "Quadro X\0", 9);
 293 
 
286 
  */
 294 
  memcpy(motorMixer.name, "Quadro X\0", 9);
287 
}
 295 
}
288 
 
 296 
 
- 
 
 297 
/***************************************************/
289 
/***************************************************/
 298 
/*    Default Values for R/C Channels              */
290 
/*    Default Values for R/C Channels              */
 299 
/***************************************************/
291 
/***************************************************/
 300 
void channelMap_default(void) {
292 
void channelMap_default(void) {
 301 
  channelMap.RCPolarity = 1;
293 
  channelMap.channels[CH_PITCH]    = 1;
 302 
  channelMap.channels[CH_PITCH]    = 1;