Commit Graph

378 Commits

Author SHA1 Message Date
Chris Anderson 7b2bcaef20 Merge branch 'master' of https://code.google.com/p/ardupilot-mega
Conflicts:
	ArduCopter/APM_Config.h
2012-01-13 09:19:04 -08:00
Michael Oborne af21f6b2dd firmware build 2012-01-14 01:00:41 +08:00
Chris Anderson e47897d95b Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-11 11:02:32 -08:00
Michael Oborne 2677476b91 APM Planner 1.1.20
add ac2 land Mode
add xplane 10 support
add disconnect verify
2012-01-12 01:33:42 +08:00
Chris Anderson 80a342fbf8 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-11 00:14:31 -08:00
Jason Short 1e1e36e649 Tweaks 2012-01-10 23:43:44 -08:00
Jason Short 56de5d58c5 Added altitude 2012-01-10 23:42:26 -08:00
Jason Short 9cbfcac802 Made timer unsigned 2012-01-10 23:42:26 -08:00
Chris Anderson 7dd3ae1d70 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-09 16:22:50 -08:00
Michael Oborne 787bdc379a APM Planner 1.1.19
fix log download
misc
2012-01-10 08:16:10 +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
Andrew Tridgell 6245ce935d autotest: cope with startup messages in a different order 2012-01-09 18:09:04 +11:00
Andrew Tridgell 8af708b165 autotest: make history pages use the css style 2012-01-09 18:09:04 +11:00
Jason Short b1341011a0 updated throttle to keep altitude 2012-01-07 22:27:25 -08:00
Chris Anderson 5aab7d583c Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-06 12:32:39 -08:00
Jason Short 4638bb6ea4 enabled failsafe on SIM parameters 2012-01-06 10:22:26 -08:00
Jason Short efb6305b03 Added failsafe test 2012-01-06 10:22:13 -08:00
Jason Short 7ecddc1cb8 Added RTL with Auto_land test
Fixed Simple Mode test
2012-01-05 22:13:20 -08:00
Chris Anderson 28e93a11ea Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-05 15:44:03 -08:00
Michael Oborne ce83b8efa5 APM Planner 1.1.18 - missed stuff 2012-01-06 07:38:12 +08:00
Michael Oborne 93d5be164f APM Planner 1.1.18
fix heli setup screen
2012-01-06 06:54:47 +08:00
Chris Anderson d94562986f Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-05 09:48:32 -08:00
Jason Short 782fbc2d38 thought the commented out function was too cool to loose, but not using it now
changed the WP index number
2012-01-04 09:52:25 -08:00
Jason Short 827955dc6e Looking for larger than 255 numbers 2012-01-04 09:51:36 -08:00
Andrew Tridgell 9833636500 pysim: support octax 2012-01-04 22:15:17 +11:00
Andrew Tridgell b9b0aa4a81 autotest: change to an octa frame for autotest
this will be a useful experiment
2012-01-04 22:03:37 +11:00
Andrew Tridgell 45efb174e5 autotest: fix for new sim_multicopter.py command 2012-01-04 21:49:19 +11:00
Andrew Tridgell 5317e47e2d pysim: added more frame types 2012-01-04 21:45:58 +11:00
Andrew Tridgell 1da04837ca pysim: accept frame type in sim_arducopter.sh 2012-01-04 19:34:28 +11:00
Andrew Tridgell e4ae5ffd0e pysim: show frame type at startup 2012-01-04 19:34:11 +11:00
Andrew Tridgell f395e8e36d rename sim_quad.py to sim_multicopter.py 2012-01-04 19:14:42 +11:00
Andrew Tridgell bc49573b4c pysim: added --frame option 2012-01-04 19:13:47 +11:00
Andrew Tridgell f4d7e108fa pysim: generalise the quadcopter code for multicopters
this allows for arbitrary multicopter motor arrangements
2012-01-04 19:13:15 +11:00
Chris Anderson 074317516d Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-03 20:11:08 -08:00
Hazy d905c07f5b APM Planner
add Traditional Chinese thanks EllisSu (Su Chuan Zhi)
2012-01-04 11:03:54 +08:00
Chris Anderson 7eaec83278 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2012-01-02 15:02:02 -08:00
Michael Oborne e8cf75b6cd APM Planner 1.1.17
add polish thanks GrzegorzSz
added french thanks Don Brooks
fix posible rc setup lag
2012-01-03 06:53:14 +08:00
Chris Anderson 4e1b140c57 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-12-30 09:31:05 -08:00
Jason Short 005ff8d47e Fixed Loiter Timeout bug, added more wind by default. 2011-12-29 23:02:02 -08:00
Jason Short f0d3cdf4ed Turn off Super Simple by default 2011-12-29 23:02:02 -08:00
Jason Short 22172820a8 Made wind not reverse itself to be more natural 2011-12-29 23:02:02 -08:00
Chris Anderson d698da5f05 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-12-29 15:57:43 -08:00
Michael Oborne b5b223c6f5 APM Planner 1.1.16
change reset order
add french lang
2011-12-30 07:34:17 +08:00
Chris Anderson 04729402e1 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-12-29 08:43:52 -08:00
Michael Oborne 2a75ffdd4c APM Planner 1.1.15
fix reset issue
add Circle AP Mode
change time to wait to 17 secs
2011-12-29 18:31:42 +08:00
Andrew Tridgell 352b0ac5af autotest: update copies of pymavlink in autotest 2011-12-29 08:30:08 +11:00
Chris Anderson 04c73fbe72 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-12-27 21:15:36 -08:00
Michael Oborne 590d812bc3 firmware build 2011-12-28 07:20:05 +08:00
Chris Anderson 2d97926dfc Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-12-27 15:19:15 -08:00
Michael Oborne 1527234c81 APM Planner 1.1.14
remove bad params from loading from file
add message on firmware screen.
fix moving geofence
fix terminal crash bug
modify udp param list
2011-12-28 07:05:12 +08:00