Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean-up only 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1592 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
jasonshort 2011-02-05 06:31:03 +00:00
parent 7b9ede0b29
commit 641aeefbf5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopterMega/motors.pde
View File

@ -107,7 +107,6 @@ set_servos_4()
motor_out[CH_4] = rc_3.radio_out - rc_2.pwm_out; motor_out[CH_4] = rc_3.radio_out - rc_2.pwm_out;
// servo Yaw // servo Yaw
//motor_out[CH_3] = rc_4.radio_out;
APM_RC.OutputCh(CH_7, rc_4.radio_out); APM_RC.OutputCh(CH_7, rc_4.radio_out);
@ -141,6 +140,7 @@ set_servos_4()
} }
// limit output so motors don't stop
motor_out[CH_1] = constrain(motor_out[CH_1], out_min, rc_3.radio_max); motor_out[CH_1] = constrain(motor_out[CH_1], out_min, rc_3.radio_max);
motor_out[CH_2] = constrain(motor_out[CH_2], out_min, rc_3.radio_max); motor_out[CH_2] = constrain(motor_out[CH_2], out_min, rc_3.radio_max);
motor_out[CH_3] = constrain(motor_out[CH_3], out_min, rc_3.radio_max); motor_out[CH_3] = constrain(motor_out[CH_3], out_min, rc_3.radio_max);
@ -211,12 +211,7 @@ set_servos_4()
} }
}else{ }else{
num++; // our motor is unarmed, we're on the ground
if (num > 10){
num = 0;
//Serial.print("-");
}
reset_I(); reset_I();
if(rc_3.control_in > 0){ if(rc_3.control_in > 0){