Merge remote-tracking branch 'refs/remotes/origin/master' into PID-Improved

This commit is contained in:
johan9107 2016-10-24 17:36:21 +02:00
commit 7186db1c6b
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ uint16_t motor_output[MOTOR_COUNT];
mixerConfig_s mixerConfig = {
.minThrottle = 1050,
.maxThrottle = MAX_PULSE - 100,
.minCommand = 1000,
.minCommand = 990,
.maxCommand = MAX_PULSE,
.minCheck = 1010,
.pid_at_min_throttle = true,

View File

@ -248,7 +248,7 @@ void calibrateMotors()
pwmActivateAllMotors();
//First set the motor output to the maximum allowed throttle
for (uint8_t i = 1; i < 11; i++ ) pwmAdjustSpeedOfMotor(i,MotorPWMPeriode);
for (uint8_t i = 1; i < 11; i++ ) pwmAdjustSpeedOfMotor(i,MAX_PULSE);
//wait for a little while
HAL_Delay(6200);