Adam M Rivera
d09916422a
Merge branch 'retro-loiter' of https://code.google.com/r/a432511-wip into auto-approach
...
Conflicts:
Tools/ArdupilotMegaPlanner/Common.cs
2012-04-19 11:08:34 -05:00
Adam M Rivera
4430f75344
navigation.pde: Put the new calc_GPS_velocity method in a compiler if that checks the new RETRO_LOITER_MODE config value (saves space and ensures its not being used unless retro loiter mode is enabled)
2012-04-19 10:21:04 -05:00
Adam M Rivera
9181eedf5a
Merge branch 'master' of https://code.google.com/p/ardupilot-mega into retro-loiter
2012-04-19 10:17:36 -05:00
Adam M Rivera
ad13854ab7
Loiter: Made the "retro loiter" routines configurable. Add RETRO_LOITER_MODE ENABLED to APM_Config.h to enable the older loiter shtuff.
2012-04-19 10:16:29 -05:00
Adam M Rivera
3995381800
Arducopter.pde: Moved gps to 10hz. Changed calc_XY_velocity to calc_GPS_velocity.
2012-04-18 23:07:35 -05:00
Adam M Rivera
c7c6dd70b9
navigation.pde: Added calc_GPS_velocity. Added constraint to x/y error and x/y rate error.
2012-04-18 23:06:15 -05:00
James Goppert
f094085c25
Improved cmake options.
2012-04-18 23:15:29 -04:00
James Goppert
0a38e2b8d4
Updated ArduPlane/ArduCopter cmake options.
2012-04-18 15:16:02 -04:00
Adam M Rivera
5ee15da73b
Planner/defines.h: Updated the enumeration value for APPROACH so as not to disturb the order of the universe.
2012-04-18 10:32:01 -05:00
James Goppert
26e3d6ae45
Switched to project specific cmake lists.
...
This is better since each project has very different options.
2012-04-17 23:07:20 -04:00
Adam M Rivera
baf8218b58
ArduCopter: Added code to prevent mode from switching to APPROACH on every loiter.
2012-04-16 16:29:54 -05:00
Adam M Rivera
b891622210
ArduCopter: Changed millis compare to use new config value for approach delay.
2012-04-16 14:04:30 -05:00
Adam M Rivera
3146c22ea8
commands_logic.pde: Added write to constrained value to EEPROM.
2012-04-16 14:03:33 -05:00
Adam M Rivera
3135cd91d0
config.h: Added RTL_APPROACH_DELAY config value.
2012-04-16 14:00:08 -05:00
Adam M Rivera
8128fb2d5f
Merge branch 'master' of https://code.google.com/p/ardupilot-mega into auto-approach
...
Conflicts:
ArduCopter/Parameters.h
2012-04-16 10:23:01 -05:00
Adam M Rivera
b611b6a1e8
system.pde: Updated param name to loiter_timer.
2012-04-16 10:12:30 -05:00
Adam M Rivera
03e11cf893
commands_logic: Allowed for an approach alt as low as 1m. Added a check to make sure we are currently above our target approach alt.
2012-04-16 10:11:50 -05:00
Adam M Rivera
637f778dd0
ArduCopter: Updated param name from auto_land_timer to loiter_timer, because it could really be used for more routines like auto-approach. Added timer before approach (20s).
2012-04-16 10:07:57 -05:00
Adam M Rivera
2d096c401f
Parameters: Changed rtl_approach_alt to float to support more granular altitudes
2012-04-16 10:06:29 -05:00
rmackay9
4dadd888d8
ArduCopter - CH6 Tuning - added AHRS_YAW_KP parameter as 30. Now you can easily set the amount that the mag is used to correct the gyro based yaw estimate in the DCM
2012-04-16 23:47:57 +09:00
Andrew Tridgell
5a9ad6ddbb
AHRS: enable AHRS_ group in ArduCopter
2012-04-16 20:55:14 +10:00
Adam M Rivera
f27b5d538b
ArduCopter, commands_logic: Updated logic to allow as low as 5m.
2012-04-15 19:50:05 -05:00
Adam M Rivera
e4940ec3bb
ArduCopter: Added check to make sure user defined approach alt is at least 5.
2012-04-15 16:58:22 -05:00
Adam M Rivera
0027c9253b
commands_logic: Added check to make sure the do_approach method is not being used to land.
2012-04-15 16:57:49 -05:00
Adam M Rivera
70d67b0791
System: Added handler for the new APPROACH flight mode which will initiate an approach to a target alt as defined by the user.
2012-04-15 16:55:34 -05:00
Adam M Rivera
d1a7fdb9ef
ArduCopter: Added check to g.rtl_approach_alt, which if greater than zero will initiate an approach to the target alt rather than land.
2012-04-15 16:54:43 -05:00
Adam M Rivera
d12bf86876
commands_logic: Added do_approach() to set the new target alt based on the user defined value.
2012-04-15 16:53:25 -05:00
Adam M Rivera
fb5dc3085b
Defines: Added new control mode (APPROACH).
2012-04-15 16:52:32 -05:00
Adam M Rivera
f5e0b002ba
Parameters: Added new APPROACH_ALT params (g.rtl_approach_alt) which stored the users desired target altitude after RTL is complete.
2012-04-15 16:51:41 -05:00
rmackay9
ccb21613b5
ArduCopter - updated firmware version to "2.6 Beta"
2012-04-14 14:26:44 +09:00
rmackay9
33bd558a94
ArduCopter - LEDS - main code to support COPTER_LEDS.
...
Code by Robert Lefebvre
2012-04-12 22:55:44 +09:00
rmackay9
a429c78d20
ArduCopter - LEDS - set new output pins to OUTPUT to support COPTER_LEDS.
...
Code by Robert Lefebvre
2012-04-12 22:55:40 +09:00
rmackay9
663eda6d47
ArduCopter - LEDS - define pins to be used for COPTER_LEDS.
...
Code by Robert Lefebvre
2012-04-12 22:55:36 +09:00
rmackay9
ac9555a3b4
ArduCopter - LEDS - added new COPTER_LEDS definition
...
Code by Robert Lefebvre
2012-04-12 22:55:32 +09:00
rmackay9
d1a5d1f94c
ArduCopter - LEDS - two new parameters to support COPTER_LEDS.
...
Code by Robert Lefebvre.
2012-04-12 22:55:28 +09:00
rmackay9
8f0bc57967
ArduCopter - navigation.pde - added logging of Loiter PID controllers
2012-04-11 23:52:25 +09:00
rmackay9
023378a214
ArduCopter - Parameters.h - changed initialisation order to remove compiler warning (have not changed enum values so shouldn't require eeprom format id update)
2012-04-09 17:37:06 +09:00
rmackay9
c7edd7857c
ArduCopter - added dataflash logging of roll and pitch rate controllers
2012-04-08 10:19:20 +09:00
rmackay9
0607be8ea5
ArduCopter - removed unused motor pde files including heli.pde, motors_hexa.pde, motors_octa.pde, motors_octa_quad.pde, motors_tri.pde and motors_y6.pde
2012-04-04 23:06:12 +09:00
rmackay9
2128085576
ArduCopter - test.pde - changed references "motor_armed" to "motors.armed()" as part of move to AP_Motors library.
...
Change to ESC initialisation calls to use motors.throttle_pass_through method of AP_Motors class.
2012-04-04 23:05:26 +09:00
rmackay9
2fc3b740c4
ArduCopter - system.pde - changed references to "motor_armed" to "motors.armed()" as part of the move to use AP_Motors library.
2012-04-04 23:03:21 +09:00
rmackay9
5e2147de1f
ArduCopter - setup.pde - changed cli for helicopter to call the new AP_Motors class's parameters instead of the global parameters.
...
changed init_esc to call the AP_Motor's class's "throttle_pass_through" function.
2012-04-04 23:02:29 +09:00
rmackay9
1701cac0b1
ArduCopter - radio.pde - changed motor initialisation to set update rate, frame orientation, min and max throttle to AP_Motors class.
...
Note: perhaps the motors speed at least should be moved to a parameter within the motors class.
output_min function greatly simplified as this is handled by the AP_Motors class.
2012-04-04 23:00:56 +09:00
rmackay9
0f4203a755
ArduCopter - motors.pde - changed references to "motor_armed" to "motors.armed()" because we've moved to using the AP_Motors class.
...
Simplified set_servos_4 function which was responsible for calling "output_motors_armed" or "output_motors_disarmed" as this determination as to whether the motors are armed or not is handled within the AP_Motors class.
2012-04-04 22:58:42 +09:00
rmackay9
00d540bfa9
ArduCopter - leds.pde - changed refrences to "motor_armed" to "motors.armed()"
2012-04-04 22:57:50 +09:00
rmackay9
ffd77f58ab
ArduCopter - removed references to MOT_1 etc as these are now within the AP_Motors class (i.e. MOT_1 has become AP_MOTORS_MOT_1)
2012-04-04 22:56:07 +09:00
rmackay9
929e933b69
ArduCopter - increased firmware version to 118. Removed nearly all heli parameters as these are all created by the AP_MotorHeli class now.
...
Note: we cannot move the heli_servos to the AP_MotorHeli class yet because of a small issue in the parameters class.
2012-04-04 22:55:07 +09:00
rmackay9
acc24291f3
ArduCopter - Log.pde - changed MOT output to dataflash to take values from AP_Motors class's motor_out array instead of the global motor_out array.
2012-04-04 22:53:21 +09:00
rmackay9
86d2a9ffdb
ArduCopter - GCS_Mavlink.pde - changed output to ground station to use new AP_Motor's class motors array inplace of the global "motor_out" array.
2012-04-04 22:52:26 +09:00
rmackay9
23c3f25654
ArduCopter - Attitude.pde - moved heli_get_angle_boost from heli.pde (which will be removed) to Attitude.pde. In fact we should combine heli_get_angle_boost and the regular get_angle_boost.
2012-04-04 22:51:39 +09:00