Adam M Rivera
7d13371acf
Merge branch 'master' of https://code.google.com/p/ardupilot-mega into auto-approach
2012-04-20 11:45:38 -05:00
rmackay9
f0a9209935
ArduCopter - regressed version back to 2.5.4
2012-04-20 21:58:32 +09:00
James Goppert
5390467f3d
Worked on ArduCopter cmake options.
2012-04-19 16:05:08 -04:00
Adam M Rivera
c233defbe6
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
1676e09f12
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
24363ccb83
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
d29f1ef331
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
a7bc3d2cc6
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
d4a4641ae6
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
53c143a575
Improved cmake options.
2012-04-18 23:15:29 -04:00
James Goppert
0e7e77760a
Updated ArduPlane/ArduCopter cmake options.
2012-04-18 15:16:02 -04:00
Adam M Rivera
a3842734a9
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
a9f0bd24d7
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
f6d81a16c2
ArduCopter: Added code to prevent mode from switching to APPROACH on every loiter.
2012-04-16 16:29:54 -05:00
Adam M Rivera
56a00fa1f7
ArduCopter: Changed millis compare to use new config value for approach delay.
2012-04-16 14:04:30 -05:00
Adam M Rivera
07e53fad18
commands_logic.pde: Added write to constrained value to EEPROM.
2012-04-16 14:03:33 -05:00
Adam M Rivera
7b277d7044
config.h: Added RTL_APPROACH_DELAY config value.
2012-04-16 14:00:08 -05:00
Adam M Rivera
f9affb3295
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
0c3d6614cd
system.pde: Updated param name to loiter_timer.
2012-04-16 10:12:30 -05:00
Adam M Rivera
3d024ba2dd
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
41702aca94
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
a366bb2f81
Parameters: Changed rtl_approach_alt to float to support more granular altitudes
2012-04-16 10:06:29 -05:00
rmackay9
870b5e5f75
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
95cb35c7bb
AHRS: enable AHRS_ group in ArduCopter
2012-04-16 20:55:14 +10:00
Adam M Rivera
77d6f22864
ArduCopter, commands_logic: Updated logic to allow as low as 5m.
2012-04-15 19:50:05 -05:00
Adam M Rivera
2954bf6f76
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
cddcdb8be3
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
a2b338c052
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
a24b7bcf14
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
cfe3b58248
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
83fe6733d4
Defines: Added new control mode (APPROACH).
2012-04-15 16:52:32 -05:00
Adam M Rivera
7ba8c291bd
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
a71ed6abec
ArduCopter - updated firmware version to "2.6 Beta"
2012-04-14 14:26:44 +09:00
rmackay9
24b81db20e
ArduCopter - LEDS - main code to support COPTER_LEDS.
...
Code by Robert Lefebvre
2012-04-12 22:55:44 +09:00
rmackay9
c337df11c8
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
d70f5da5e0
ArduCopter - LEDS - define pins to be used for COPTER_LEDS.
...
Code by Robert Lefebvre
2012-04-12 22:55:36 +09:00
rmackay9
84b07b5e6a
ArduCopter - LEDS - added new COPTER_LEDS definition
...
Code by Robert Lefebvre
2012-04-12 22:55:32 +09:00
rmackay9
0a3bc9a66a
ArduCopter - LEDS - two new parameters to support COPTER_LEDS.
...
Code by Robert Lefebvre.
2012-04-12 22:55:28 +09:00
rmackay9
fad162989f
ArduCopter - navigation.pde - added logging of Loiter PID controllers
2012-04-11 23:52:25 +09:00
rmackay9
f8210b164c
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
df85051574
ArduCopter - added dataflash logging of roll and pitch rate controllers
2012-04-08 10:19:20 +09:00
rmackay9
998058ec07
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
ad9a8acbab
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
1d086c83f0
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
4aa40bdf10
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
473126581d
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
905a445391
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
aa54458dcf
ArduCopter - leds.pde - changed refrences to "motor_armed" to "motors.armed()"
2012-04-04 22:57:50 +09:00
rmackay9
7df17e9b3b
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
ee308ea06c
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