Commit Graph

667 Commits

Author SHA1 Message Date
Chris Anderson 80a342fbf8 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-11 00:14:31 -08:00
Jason Short db1fafaaec R9 2012-01-10 23:46:08 -08:00
Jason Short 22ebe00773 comma 2012-01-10 23:45:33 -08:00
Jason Short 7933492fec Switched to set_next_WP for mode switches 2012-01-10 23:43:44 -08:00
Jason Short 30f5ecda54 Fixed Type Error 2012-01-10 23:43:44 -08:00
Jason Short ed903c6cd3 Fixed type error 2012-01-10 23:43:44 -08:00
Jason Short 36516161b5 Climb rate control 2012-01-10 23:43:44 -08:00
Jason Short 78925d57c2 added set_new_altitude call() 2012-01-10 23:43:44 -08:00
Jason Short 0c9dc11ac1 Added ending for auto landing 2012-01-10 23:42:27 -08:00
Jason Short 7d4067a6ed updated climb rate control
Land detector
2012-01-10 23:42:27 -08:00
Jason Short f683371508 added set_new_altitude call 2012-01-10 23:42:27 -08:00
Jason Short 581657ab7a climb rate control 2012-01-10 23:42:26 -08:00
Jason Short 439c15f3fc Added climb rate control
removed unused vars
2012-01-10 23:42:26 -08:00
Jason Short c385db412e Added altitude change flags 2012-01-10 23:42:26 -08:00
Jason Short 9cbfcac802 Made timer unsigned 2012-01-10 23:42:26 -08:00
Jason Short 9d1b1dba77 Added comments 2012-01-10 23:42:26 -08:00
Jason Short 5b00928b15 added location error calc to get better data. Otherwise we'll be 1 GPS read off. 2012-01-10 23:42:26 -08:00
Jason Short 0744179970 Added comments
moved out failsafe check. otherwise the reporting was erroneous.
2012-01-10 23:42:26 -08:00
Jason Short 5d28e97339 Moved failsafe check to more logical place 2012-01-10 23:42:26 -08:00
Jason Short f240888b49 added #if to wind compensation code 2012-01-10 23:42:26 -08:00
Pat Hickey 7961021895 ArduCopter motors_y6: rewrite CH_ macros with MOT_ macros 2012-01-09 22:06:49 -08:00
Pat Hickey 397aef9c2a ArduCopter motors_y6: rewrite loop in terms of motors 2012-01-09 22:06:49 -08:00
Pat Hickey 2f11c3f17a ArduCopter motors_tri: rewrite CH_ macros with MOT_ macros
* Third Tricopter motor was on CH_4, so it is called MOT_4. This
  will be changed in a subsequent commit.
2012-01-09 22:06:49 -08:00
Pat Hickey 757471c3a3 ArduCopter motors_octa_quad: rewrite remainder from CH_ macros to MOT_ macros 2012-01-09 22:06:48 -08:00
Pat Hickey ee7356c1a7 ArduCopter motors_octa_quad: rewrite loop in terms of motors 2012-01-09 22:05:01 -08:00
Pat Hickey f8aa1456cc ArduCopter motors_octa: rewrite remainder from CH_ macros to MOT_ macros 2012-01-09 21:57:02 -08:00
Pat Hickey ad5c31cd38 ArduCopter motors_octa: rewrite janky loops to use ch_of_mot
* Previously the loop was written over channels, now it is over motors
* the correct channel for that motor is determined by ch_of_mot.
* ch_of_mot is defined correctly based on the config_channels macros.
2012-01-09 21:57:02 -08:00
Pat Hickey f055cbc720 ArduCopter motors_hexa: rewrite remainder from CH_ macros to MOT_ macros. 2012-01-09 21:57:02 -08:00
Pat Hickey 2cf935e2d2 ArduCopter motors_hexa: rewrite janky loops to use ch_of_mot
* Previously the loop was written over channels, now it is over motors
* the correct channel for that motor is determined by ch_of_mot.
* ch_of_mot is defined correctly based on the config_channels macros.
2012-01-09 21:57:02 -08:00
Pat Hickey b8b6e3c25b ArduCopter: add ch_of_mot lookup to motors.pde 2012-01-09 21:57:02 -08:00
Pat Hickey 87735fef24 ArduCopter test.pde: translate from CH_ to MOT_ notation 2012-01-09 21:57:02 -08:00
Pat Hickey 20b0e4cd33 ArduCopter setup.pde: translate from CH_ to MOT_ notation 2012-01-09 21:57:02 -08:00
Pat Hickey 38c2a052be ArduCopter radio.pde: translate CH_ to MOT_ outputs 2012-01-09 21:57:02 -08:00
Pat Hickey 8d4db05f50 Rename ArduCopter/config_motors.h to config_channels.h 2012-01-09 21:57:02 -08:00
Pat Hickey b22920c0ea ArduCopter: Change TRI_FRAME yaw servo output to CH_TRI_YAW define 2012-01-09 21:57:02 -08:00
Pat Hickey ccff9041f8 ArduCopter Camera.pde: changed from CH_n to CH_CAM_ notation. 2012-01-09 21:57:02 -08:00
Pat Hickey 8d595d7c53 motors_quad: translate from CH_ to MOT_ notation. 2012-01-09 21:57:02 -08:00
Pat Hickey 7b056f208d ArduCopter: include config_motors.h in sketch 2012-01-09 21:57:01 -08:00
Pat Hickey e969e0dc55 ArduCopter config_motors.h: stubs in for CH_CAM_PITCH and CH_CAM_ROLL 2012-01-09 21:57:01 -08:00
Pat Hickey eb345c009b ArduCopter config_motors.h: proper defs for APM1 MOT_[5..8] 2012-01-09 21:57:01 -08:00
Pat Hickey bcb43ec9b5 ArduCopter config.h: add standard ifndef/define header macro wrappers 2012-01-09 21:57:01 -08:00
Pat Hickey a1cc77f41e ArduCopter: add config_motors.h with MOT_n to CH_m mapping
* APM1 values are not valid, but hopefully APM2 will stay that way?
2012-01-09 21:57:01 -08:00
Pat Hickey d015e0d6d9 APM_RC & ArduCopter: Change interface to SetFastOutputChannels to use _BV
* Every use of MSK_CH_n changed to _BV(CH_n)
* Easier to read, and will allow CH_n to be parameterized without needing
  a separate macro expansion for the MSK value.
2012-01-09 21:57:01 -08:00
Chris Anderson ca201a7d9d Merge branch 'master' of https://code.google.com/p/ardupilot-mega
Conflicts:
	ArduCopter/APM_Config.h
	ArduPlane/APM_Config.h
2012-01-09 09:01:46 -08:00
Jason Short ba72a98345 Slowed Auto Descent
Don't return true in Landing code to prevent flyways in Stabilize
2012-01-08 23:01:22 -08:00
Randy Mackay 7b9701fdd5 ArduCopter - added ROLL_PITCH_STABLE_OF (i.e. Stabilised Roll/Pitch + adjustments based on optical flow)
Removed optical flow from regular loiter for now until it's tested.
2012-01-09 13:53:54 +09:00
analoguedevices 8b68da3105 Put in commented-out APM2 #defines, to save people the trouble of having to type them in themselves 2012-01-09 01:59:55 +00:00
Jason Short fda12c8902 Added Acro to Rate_P 2012-01-08 14:52:10 -08:00
Randy Mackay 598593e1fc ArduCopter - changed Sonar to use A1 (was AN4) 2012-01-08 17:48:30 +09:00
Jason Short a8574e813d R8 2012-01-07 22:28:03 -08:00