Commit Graph

54 Commits

Author SHA1 Message Date
tridge60@gmail.com 3dd3f1091e don't force config in default APM_Config.h
defaults for these are already in config.h, but protected with #ifndef
wrappers. The #ifndef wrappers are useful to allow users to have
makefile targets for different configs, so you can (for example), do
"make heli" with a local makefile

This makes it easier for developers to ensure that all configs build
correctly

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2890 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-07-17 10:33:09 +00:00
jasonshort ed5c7d01b1 New PIDs - I rewrote the control laws from scratch to add a PI Rate function. The end result should fly nearly identically to the current version. The nice detail is that we can use NG PID values for easy transition!
Before: ->  After
Stabilize P –> Stabilize P (Use NG values, or 8.3 x the older AC2 value)
Stabilize I –> Stabilize I (Stays same value)
Stabilize D –> Rate P (Stays same value)
–> Rate I (new)
 
Added a new value – an I term for rate. The old stabilization routines did not use this term. Please refer to the config.h file to read more about the new PIDs.
Added framework for using DCM corrected Accelerometer rates. Code is commented out for now.
Added set home at Arming.
Crosstrack is now a full PID loop, rather than just a P gain for more control. 
Throttle now slews when switching out of Alt hold or Auto modes for less jarring transitions
Sonar and Baro PIDs are now combined into a throttle PID Yaw control is completely re-written.
Added Octa_Quad support - Max



git-svn-id: https://arducopter.googlecode.com/svn/trunk@2836 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-07-11 00:47:08 +00:00
jasonshort 66798352c7 AC 2.0.32 Beta
new Loiter PIDs
tuned down control on standard frame
shunk the mixing range for sonar from 3 meters to 2 meters
added framework for Guided mode - not tested!
removed pitch and roll deadzone
decoupled SIMPLE mode from LOITER PIDs
Synced Mavlink with APM
Logs report correct WP number now.
disabled Sonar spike filter.


git-svn-id: https://arducopter.googlecode.com/svn/trunk@2722 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-07-02 22:44:59 +00:00
jasonshort 88d258f804 clean up to work better with the Mission planner and enable Camera control.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2697 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-28 06:31:18 +00:00
jasonshort 0efd0fa1f3 changed camera stabilization to 1 instead of ENABLED
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2696 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-27 19:57:40 +00:00
jasonshort 7f3719086f 2.0.29
Fixed Mavlink issue
Added look at home option for SIMPLE mode. Off be default. Untested.
Upped performance of Yaw.


git-svn-id: https://arducopter.googlecode.com/svn/trunk@2695 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-27 17:01:53 +00:00
jasonshort 1e8572f7c6 2.0.26
minor updates, 
Arming motors now for only Stabilize, Simple, and Acro Modes.
V Octo Support


git-svn-id: https://arducopter.googlecode.com/svn/trunk@2657 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-24 04:37:54 +00:00
jasonshort 39b08decf3 AC2.0.24b
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2567 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-16 17:03:26 +00:00
rmackay9@yahoo.com 8261ea0807 Traditional Heli - merged heli code into ACM trunk code!
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2548 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-12 12:14:10 +00:00
jasonshort a643149bdc Updates for 2.0.21
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2459 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-06-01 05:50:17 +00:00
jasonshort d3c1f5c307 Big update from Field testing.
Includes updated motor tests. These need to be verified.
Nav loiter D was added (.03) - verify this helps.
Nav_lat is now filtered for Rate control. This is to keep jerky pitching to a minimum.


git-svn-id: https://arducopter.googlecode.com/svn/trunk@2448 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-31 05:29:06 +00:00
jasonshort 77966c4c6a Better sonar hold ++
added mag calibration - still not sure if needed.
better sonar spike filter
2.0.19

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2434 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-29 19:32:55 +00:00
jasonshort c67601dacb 2.0.18
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2433 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-29 04:02:01 +00:00
jasonshort 4c52712f52 2.0.16, Now that Yaw PID vs PI issue is sorted, this is reverting back to Rate based Yaw.
Made minor change in Loiter to check something.
Motor LEDs enabled. Let me know if they work OK.
Armed Motors is now Solid to match GPS behavior.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2421 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-27 18:21:55 +00:00
jasonshort 0c2ffd30b3 Yaw Alternate enabled by default.
Yaw dead_zone minimized
revved to 2.0.11


git-svn-id: https://arducopter.googlecode.com/svn/trunk@2394 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-24 05:04:48 +00:00
jasonshort e73badae95 Added resetting of Loiter location based on stick input. Fly it to a location and let it stick.
Added Octo Support
Fixed Loiter issue regarding Yaw towards loiter location
Added Yaw control alternative for testing
decreased Yaw deadband to +-5°
revved to 2.0.10



git-svn-id: https://arducopter.googlecode.com/svn/trunk@2391 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-24 02:23:02 +00:00
jasonshort 39a7276c9c Added resetting of Loiter location based on stick input. Fly it to a location and let it stick.
Added Octo Support
Fixed Loiter issue regarding Yaw towards loiter location
Added Yaw control alternative for testing
decreased Yaw deadband to +-5°
revved to 2.0.10



git-svn-id: https://arducopter.googlecode.com/svn/trunk@2389 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-24 02:14:18 +00:00
jasonshort 4764bf9b63 2.0.6 Beta updates. Frame options + X moved to AP_Var.
Updated nav code.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2345 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-18 23:38:24 +00:00
jasonshort 27ab016d98 added comments for frame types
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2330 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-16 06:05:08 +00:00
jasonshort 26f5610d2c added reference to FRAME_TYPE
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2277 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-15 02:04:52 +00:00
jasonshort 1a6db76d2e added reference to FRAME_TYPE
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2276 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-15 02:03:23 +00:00
jasonshort 9780ee69d9 Slight increase to loop speed - for Max
removed throttle integrator until I have more time to deal with the data
tweaked control loops to be more like RC1 for Max to try. They fly great BTW
tweaked config to be more better.
Mavlink - only cosmetic tweaks

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2254 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-13 19:29:45 +00:00
jasonshort 2251db1b7c Added APM's current sensing.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2234 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-09 15:46:56 +00:00
jasonshort 17acfca526 re-org'ed the logs
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2231 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-09 04:16:58 +00:00
jasonshort d783745823 git-svn-id: https://arducopter.googlecode.com/svn/trunk@2185 f9c3cf11-9bcb-44bc-f272-b75c42450872 2011-05-07 20:47:57 +00:00
jasonshort bf7efc4f54 Defaulted APM_Config.h
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2091 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-05-05 05:21:04 +00:00
jasonshort cf4b603315 refinements to nav
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1922 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-27 05:08:24 +00:00
jasonshort 7e843ee679 Warning!!! The recent build 1919 was tagged as sparkfun.
The trunk is unstable, so please be careful. I've made a lot of changes based on the Sparkfun challange. Most include how we handle things like altitude, but the mission scripting has also been updated as well.


git-svn-id: https://arducopter.googlecode.com/svn/trunk@1920 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-25 05:12:59 +00:00
jasonshort 9aaba3fd0f Navigation bug fixes, tuning.
better handling of sonar at angles and baro mixing. - optimized for flats.
Crosstrack test bug found and fixed.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1916 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-21 23:07:31 +00:00
jasonshort 0c61e9dd79 Lots of little things. Yaw control is updated based on Jani's logs. Thanks!
Takeoff now works well.
better logging.
tuned down kD for Yaw - was causing some bad behavior.
Auto mission now resets when entering mode.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1914 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-21 05:15:45 +00:00
jasonshort 87812c9eec Reworking Yaw some more. Yaw is testing really well with this version.
I have moved Pitch_Max to a different part of the code. It was limiting SIMPLE mode which was bad. Now it only limits in Auto modes, RTL, LOITER, etc.


git-svn-id: https://arducopter.googlecode.com/svn/trunk@1899 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-17 05:17:42 +00:00
jasonshort 21980216b9 Altitude control fix - trying to go higher would make alt hold reset to 0
Yaw fix, 
improved PID defaults
potential logging fix


git-svn-id: https://arducopter.googlecode.com/svn/trunk@1877 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-13 16:33:06 +00:00
jasonshort c3737db26c added better value for Sonar minimal value for landing
removed FBW mode - no longer needed
added set_throttle_cruise_flag to auto set the throttle value for alt hold
added altitude minimum option for waypoints
added support for relative WPs
added support for Yaw tracking per WP in options bitmask

lowered default sonar kD value
increased minimal value to set the throttle cruise value with CH7 switch
updated README.txt
added additional stock test missions available in CLI


git-svn-id: https://arducopter.googlecode.com/svn/trunk@1856 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-08 19:13:31 +00:00
jasonshort 7b26ec8463 updated test mission. It now passes the tests. Be sure to verify things are working well before flying.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1843 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-04-03 21:11:14 +00:00
jasonshort bcc1bf65f2 updates - support
new test mission  - Liftoff, spin, land
updated scripted Yaw control

Public Beta candidate...

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1814 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-26 06:35:52 +00:00
tridge60@gmail.com 53549f14a6 undid accidentical commit of local changes
sorry about that!

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1806 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-21 07:35:54 +00:00
tridge60@gmail.com 7c4b7cba0a tridge: my config
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1800 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-03-21 07:30:24 +00:00
jasonshort e51be3328b Should be flyable now. Please Use Reset in setup before flying.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1726 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-25 05:33:39 +00:00
jasonshort d481503937 updated Param gen - won't compile yet.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1666 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-17 07:09:13 +00:00
jasonshort 9fc23e6c70 alt hold updates
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1637 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-13 22:32:34 +00:00
jasonshort e5fde180fd switch compass orientation back to default
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1610 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-02-07 06:20:08 +00:00
jasonshort b250df996e FBW bug fixes
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1576 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-30 02:36:03 +00:00
jasonshort b4abbacbd8 fixed FBW bugs
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1560 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-26 07:14:54 +00:00
jasonshort 2f9bce7656 added instructions for Acro setting
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1557 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-25 06:28:34 +00:00
jasonshort e185d02785 better default config
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1549 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-24 01:57:31 +00:00
jphelirc 021746fd0a hexa frame setp
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1536 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-23 16:40:03 +00:00
jasonshort feb3f1a811 Added support for the AttoPilot Current sensor, Logging current is enabled at 10hz,
Trim is now called again on pitch and roll, now that trimming can be done with adc_offsets. Fixed setup::motors for x frame.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1505 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-17 03:44:12 +00:00
jasonshort 95baa14ecd Big update - motors re-assigned to new positions.
New, fabulous Yaw control.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1398 f9c3cf11-9bcb-44bc-f272-b75c42450872
2011-01-02 20:34:42 +00:00
jasonshort c45057a747 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1374 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-30 07:41:43 +00:00
jasonshort d95e8539d9 git-svn-id: https://arducopter.googlecode.com/svn/trunk@1373 f9c3cf11-9bcb-44bc-f272-b75c42450872 2010-12-30 07:40:57 +00:00