dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
10,085 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

623 Commits

Author SHA1 Message Date
Lorenz Meier c93967f39d Merge branch 'hil_range_fix' into paul_estimator_numeric 2014-03-23 14:39:22 +01:00
Lorenz Meier 6c9a40b714 Fixed the HIL actuator range to what it should be 2014-03-23 14:34:15 +01:00
Lorenz Meier 15bab106b7 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-23 13:42:27 +01:00
Julian Oes 2a178f9847 wingwing startup: fix typo 2014-03-22 17:09:32 +01:00
Simon Wilks 5f5a200f4a Add support for the SkyHunter 1800 2014-03-22 10:09:30 +01:00
Lorenz Meier df11310994 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-21 18:15:37 +01:00
Lorenz Meier 3270e2f428 Merge pull request #763 from PX4/beta_mavlink2 
Mavlink multi-stream support
 2014-03-21 18:14:08 +01:00
Thomas Gubler 4b8c3362cd Merge pull request #747 from PX4/wing_wing_defaults 
Defaults for Wing Wing
 2014-03-21 17:54:06 +01:00
Thomas Gubler 7fa6b48a36 wingwing startup script: add FW_THR_CRUISE param 2014-03-21 17:51:58 +01:00
Anton Babushkin b1e59f37fe rc.usb: typo fixed 2014-03-21 19:48:53 +04:00
Lorenz Meier 193397b228 Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2 2014-03-21 10:47:36 +01:00
Lorenz Meier 057bcf3172 Changed RC scaling for fixed wing defaults 2014-03-21 10:45:12 +01:00
Lorenz Meier 2988136e7e Implemented last missing messages, added stream config for USB, made stream config fails for non-existing mavlink links non-fatal 2014-03-21 10:44:31 +01:00
Lorenz Meier e0e6df6733 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-21 08:12:20 +01:00
Lorenz Meier 239a0cc155 Merge pull request #746 from thomasgubler/useioparam 
add SYS_USE_IO param
 2014-03-20 16:58:20 +01:00
Lorenz Meier 541e8362cf Merge branch 'adc_fix' into paul_estimator_mavlink2 2014-03-17 16:55:02 +01:00
Lorenz Meier 295f87f22c Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into beta_mavlink2 2014-03-17 16:52:07 +01:00
Lorenz Meier 46e588e26f Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2 2014-03-17 15:34:26 +01:00
Julian Oes 7718bbebee startup scripts: romfs_pruner doesn't know the inch symbols when used in eclipse, therefore replace these 2014-03-17 15:20:00 +01:00
Lorenz Meier ae35733381 Merge pull request #745 from thomasgubler/caipirinha 
introduce TBS caipirinha autostart script
 2014-03-16 21:52:27 +01:00
Lorenz Meier 1c0d7988e2 Defaults for Wing Wing 2014-03-16 21:38:37 +01:00
Lorenz Meier ab7f07da75 Merge pull request #742 from thomasgubler/phantom 
set phantom autoconfig parameters as provided by Andreas Antener
 2014-03-16 19:15:10 +01:00
Thomas Gubler 4466dbf0b3 add SYS_USE_IO param which allows using standard startup scripts for FMU only mode 2014-03-16 18:47:21 +01:00
Thomas Gubler c1ee1abf27 introduce TBS caipirinha autostart script 2014-03-16 15:18:50 +01:00
Lorenz Meier 7a4efc81b9 Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into mavlink2_hil 2014-03-16 13:50:50 +01:00
Lorenz Meier eccbccb826 Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2 2014-03-16 13:22:01 +01:00
Lorenz Meier c256ba54a0 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_mavlink2 2014-03-16 12:12:33 +01:00
Lorenz Meier ed197b5b59 Merged beta_mavlink2 / master 2014-03-16 12:12:28 +01:00
Anton Babushkin 82389e9702 Merge branch 'beta_mavlink2' into mavlink2_hil 2014-03-16 11:08:54 +04:00
Thomas Gubler 75c168f13f add missing $ in rcS script 2014-03-15 15:29:50 +01:00
Thomas Gubler f4c91b19e4 set phantom autoconfig parameters as provided by Andreas Antener 2014-03-15 13:46:09 +01:00
Anton Babushkin 955bd402d2 Merge branch 'master' into beta_mavlink2 2014-03-15 09:47:02 +04:00
Lorenz Meier e590d96c0a Merge pull request #734 from thomasgubler/rcs_defaultappsflag 
rcS: introduce flag that allows disabling startup of the default apps
 2014-03-14 18:11:46 +01:00
Thomas Gubler 7d48941c02 set correct MAV_TYPE in ardrone startup script 2014-03-13 18:47:31 +01:00
Thomas Gubler bfe8d73560 rcS: introduce flag that allows disabling startup of the default apps in order to start a different set of apps in a autostart script 2014-03-13 15:43:19 +01:00
Thomas Gubler 7a97eb83f6 ardrone startup: set battery V scale parameter in autoconfig to the value given in sensors_params.c 2014-03-13 15:27:12 +01:00
Stefan Rado 5745233f80 Remove non-existent parameter from 4008_ardrone startup script. 2014-03-13 14:36:02 +01:00
Lorenz Meier 84c3d52ba2 Merge branch 'mavlink2_hil' into paul_estimator_mavlink2 2014-03-11 21:15:12 +01:00
Lorenz Meier 5f847ff8a3 Remove HIL flag on startup 2014-03-11 21:14:54 +01:00
Lorenz Meier 4bcdf5f72f Merge branch 'mavlink2_hil' of github.com:PX4/Firmware into paul_estimator_mavlink2 2014-03-11 21:12:26 +01:00
Anton Babushkin 4cee3614c7 rc.usb: increase data rate to 10000bytes/s for USB 2014-03-11 23:04:23 +04:00
Lorenz Meier 5a39a4cbd4 Merged mavlink_beta2 2014-03-11 17:53:42 +01:00
Lorenz Meier 30a57421f8 Dropped default gains 2014-03-10 18:48:07 +01:00
Anton Babushkin 320624e995 Merge branch 'master' into beta_mavlink2 2014-03-08 11:38:00 +04:00
Julian Oes 873fa4cb40 Merge remote-tracking branch 'px4/master' into bottle_drop 
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
 2014-03-07 10:38:31 +01:00
Lorenz Meier 16dd054fa6 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-03-07 08:03:57 +01:00
Thomas Gubler 602e9c8706 fix if in rc.interface 2014-03-06 23:11:13 +01:00
Thomas Gubler 2fbcc32870 fix comparison in rcS 2014-03-06 23:00:00 +01:00
Anton Babushkin 25faf1b8f8 ardrone: minor fixes 2014-03-06 17:44:10 +04:00
Helen Oleynikova a897c97d95 Changed ARDRONE to an OUTPUT_MODE setting and added a skip option to mixer. Fewer beeps than before. 2014-03-06 12:45:10 +01:00
Helen Oleynikova bcdc8c9e1d Get rid of one set of beeps. 2014-03-05 16:16:10 +01:00
Helen Oleynikova 30665816f0 Added a newline at the end of file. 2014-03-05 15:11:41 +01:00
Helen Oleynikova 5976815f2b Fixed startup parameters. 2014-03-05 15:07:05 +01:00
Helen Oleynikova 9ffa5a665a Set the mavlink port settings back to ttyS1 by default. 2014-03-05 10:56:58 +01:00
Helen Oleynikova 1d9d24f605 Added flag for ARDrone interface. 2014-03-05 10:50:16 +01:00
Helen Oleynikova 958f7597e7 Added actual ARDrone start up script. 2014-03-04 16:33:18 +01:00
Helen Oleynikova ea70e96756 Added ARDrone to autostart 2014-03-04 16:16:39 +01:00
Anton Babushkin 941aca2829 Merge branch 'beta' into beta_mavlink2 2014-03-03 17:40:03 +04:00
Lorenz Meier b809fad3b6 Fixes to startup scripts, back to nominal defaults 2014-03-03 14:24:17 +01:00
Lorenz Meier 862ad8fc58 Merge branch 'beta' of github.com:PX4/Firmware into paul_estimator 2014-03-03 14:23:23 +01:00
Anton Babushkin 6948defdb2 mavlink: HIL fixes, performance optimization 2014-03-01 19:27:53 +04:00
Julian Oes b264352c17 startup: phantom script was missing the default line 2014-03-01 15:47:09 +01:00
Anton Babushkin 256cc2b411 mavlink: cleanup and refactoring, rcS: EXIT_ON_END fix 2014-03-01 18:30:30 +04:00
Anton Babushkin 1b8004cd8e mavlink: add new streams in main loop, minor cleanup and fixes 2014-03-01 16:43:04 +04:00
Anton Babushkin 2159f948ea mavlink: -r (datarate) parameter implemented, minor fixes 2014-02-27 18:31:41 +04:00
Lorenz Meier 87410b5bde Merge branch 'beta' of github.com:PX4/Firmware into paul_estimator 2014-02-21 13:17:29 +01:00
Julian Oes b17cdb12b0 Merge branch 'beta' into beta_mavlink 2014-02-19 14:59:46 +01:00
Stefan Rado 7fa82a27a7 Merge branch 'master' into beta 2014-02-17 22:10:06 +01:00
Stefan Rado 98ee73463f Removed obsolete ROMFS folder for removed logging build. 
The logging makefile was removed in 9a54c7c6.
 2014-02-17 21:14:40 +01:00
Stefan Rado 3eca9f9b6b Updated logging/conv.zip with latest script versions from Tools directory. 2014-02-17 21:11:03 +01:00
Julian Oes 71d4c7fed8 Startup: Hex vs Hexa 2014-02-17 20:20:41 +01:00
Lorenz Meier 8016032a40 Merged beta into paul_estimator 2014-02-16 17:07:02 +01:00
Julian Oes d15fc32097 Merge remote-tracking branch 'px4/beta' into beta_mavlink 2014-02-15 10:10:48 +01:00
Thomas Gubler ccfe476326 decrease MC_PITCHRATE_P for TBS Discovery 2014-02-13 20:53:47 +01:00
Thomas Gubler f6694c2cef rc.fw_defaults: increase acceptance radius which is used by navigator to generate virtual waypoints (RTL etc.) 2014-02-13 00:03:51 +01:00
Julian Oes 3462054f73 Merge remote-tracking branch 'px4/beta' into beta_mavlink 
Conflicts:
	src/modules/mavlink/mavlink.c
	src/modules/mavlink/mavlink_receiver.h
	src/modules/mavlink/orb_listener.c
 2014-02-12 17:10:20 +01:00
Anton Babushkin 16908f9aff autostart for multicopters: frame-specific default parameters reverted and cleaned up 2014-02-11 23:24:49 +01:00
Julian Oes 3c592e3a06 Startup: fix merge mistake 2014-02-11 15:35:26 +01:00
Lorenz Meier 30612eb32d Merge branch 'paul_estimator' of github.com:PX4/Firmware into paul_estimator 2014-02-11 09:56:07 +01:00
Lorenz Meier 4d9f0ccac4 Merge branch 'master' into paul_estimator 2014-02-11 09:55:29 +01:00
Lorenz Meier 1b978293d9 Merged master into beta 2014-02-11 08:24:18 +01:00
Lorenz Meier 0388d9adef Hotfix and cleanup for system mixers 2014-02-11 08:09:51 +01:00
Julian Oes 36d1ec80ef Startup: don't configure anything if definitions are missing 2014-02-10 15:12:32 +01:00
Stefan Rado d70d84c9a7 Fixed wrong VEHICLE_TYPE for multicopters. 2014-02-10 13:35:11 +01:00
Julian Oes 0d4b5d9395 X5: adjusted default parameters based on test flight 2014-02-10 13:15:34 +01:00
Lorenz Meier 6b931a2738 Testing: Autostart fake GPS in HIL, to be REMOVED 2014-02-10 08:58:36 +01:00
Julian Oes 0a87f1d01c Startup scripts: move X5 attitude parameters back to X5 script and only leave airframe independent params in FW defaults script 2014-02-08 00:32:57 +01:00
Julian Oes de8a9268f3 Startup scripts: bring back HIL parameters for Malolo 2014-02-08 00:31:53 +01:00
Julian Oes 096735897c Startup scripts: added important LAND and RTL parameters for FW 2014-02-07 23:52:56 +01:00
Julian Oes 008a973ef7 Startup scripts: get the indentation right, take 2 2014-02-07 23:51:57 +01:00
Thomas Gubler ac653416f8 X5: copy content of FMU_Q.mix to FMU_X5.mix because FMU_Q was used previously by the X5 startup script 2014-02-07 23:20:22 +01:00
Julian Oes df41c04be7 Startup scripts: use rc.fw_defaults for default FW parameters 2014-02-07 23:13:12 +01:00
Julian Oes fff00318cd Startup scripts: get the indentation right 2014-02-07 22:39:06 +01:00
Julian Oes 70e1bfa4d6 Startup scripts: use rc.mc_defaults for default MC parameters 2014-02-07 22:28:42 +01:00
Julian Oes 0f0c5f74b3 Startup: Raise min throttle 2014-02-05 19:44:31 +01:00
Julian Oes 15f021eec2 Startup: Hex vs Hexa 2014-02-05 19:03:26 +01:00
Lorenz Meier 011e9f5a99 Merge pull request #633 from PX4/fmuv1_ram_cleanup 
Fmuv1 ram cleanup
 2014-02-05 11:23:47 +01:00
Lorenz Meier 4499919f76 Fix for hexa mixer 2014-02-04 18:27:06 +01:00
Julian Oes d5caffa845 startup: make sdlog2 working again on FMUv1 2014-02-04 16:52:47 +01:00
Lorenz Meier 1e6011cc87 Stop the through hoop jumping now that we can handle multiple interfaces 2014-02-02 16:59:39 +01:00
Lorenz Meier dd7c198268 Merged master into beta 2014-02-01 19:03:45 +01:00
Lorenz Meier 80d645ada8 Merge branch 'master' into paul_estimator 2014-02-01 16:05:47 +01:00
Lorenz Meier 22efca262d Merge branch 'master' of github.com:PX4/Firmware 2014-02-01 16:05:19 +01:00
Lorenz Meier 091fe61bf2 Comment in HIL start script 2014-02-01 16:04:51 +01:00
Lorenz Meier b1539d8a74 Removed further unneeded commands and other things eating space 2014-02-01 15:56:57 +01:00
Lorenz Meier 0982b081b8 ROMFS cleanup to eleminate excessive comments and resulting flash usage 2014-02-01 15:46:04 +01:00
Thomas Gubler 723259d46d update malolo parameters related to RTL 2014-02-01 14:36:34 +01:00
Thomas Gubler c2911cbecf add malolo (flightgear HIL flying wing) autostart config 2014-02-01 12:32:03 +01:00
Anton Babushkin 5a7a356c20 autostart 4012_hk_x550 script updated 2014-01-31 12:24:29 +01:00
Anton Babushkin 9f88cbdc0b autostart scripts: default MPC parameters updated 2014-01-31 12:18:52 +01:00
Anton Babushkin 103bece726 rc scripts cleanup, avoid duplicating parameters, use inheritance instead 2014-01-31 11:36:25 +01:00
Lorenz Meier e32d92e732 Switch to Paul’s estimator for all fixed wing setups 2014-01-31 10:00:03 +01:00
Simon Wilks 9cdc13185b Remove differential aileron mixing as this will result in a pitching effect on flying wings. 2014-01-30 23:09:20 +01:00
Lorenz Meier dc3907fb36 Merge branch 'master' of github.com:PX4/Firmware into beta 2014-01-27 18:16:50 +01:00
Lorenz Meier 7e855b5a23 Deleted test - should not be in mainline 2014-01-27 17:20:24 +01:00
Lorenz Meier 4c4cd41b72 Registered all new system types 2014-01-27 17:14:31 +01:00
Lorenz Meier 068cc190e2 Updated / added all system types that have been available before 2014-01-27 17:14:18 +01:00
Lorenz Meier ba90dc87f6 HOTFIX: Re-enable legacy config support, uncomment commented out configs. Needs more work. 2014-01-27 16:43:44 +01:00
Anton Babushkin b3d98e4a19 Merge branch 'master' into beta 2014-01-23 23:10:05 +01:00
Lorenz Meier 1afe7f2c50 Added tune on IO upgrade error 2014-01-23 18:39:32 +01:00
Lorenz Meier a0db455334 Cleanup wording in rcS 2014-01-23 08:43:55 +01:00
Lorenz Meier f504863fee Make startup less chatty 2014-01-23 08:25:56 +01:00
Lorenz Meier ac37172b52 Hotfix: Prevent failures in boot handling due to missing microSD card logfile - we are not depending on the microSD any more completely 2014-01-23 08:17:04 +01:00
Anton Babushkin a3dbd817dc Merge branch 'master' into beta 2014-01-20 16:48:50 +01:00
Lorenz Meier f8c5a6cc50 Merged master into logging 2014-01-20 13:19:49 +01:00
Anton Babushkin 00a799ddad autostart: default MC_ parameters fixed 2014-01-20 11:10:50 +01:00
Anton Babushkin 01975619c8 Merge branch 'sdlog2_timestamp' into beta 2014-01-19 23:26:21 +01:00
Anton Babushkin 5e3c365cd4 rc: use sdlog2 -t option 
sdlog2: move all logs and conv.zip to "log" dir, messages cleanup
 2014-01-19 22:56:24 +01:00
Thomas Gubler 302632e7c4 Merge remote-tracking branch 'upstream/autostart_cleanup' into beta 2014-01-19 12:43:32 +01:00
Thomas Gubler d96e63960c enable new autostart scripts for Rascal HIL and X5 2014-01-19 12:42:43 +01:00
Anton Babushkin 23cc0684ba rcS: MAV_TYPE bug fixed, use 8 PWM outputs on HIL fake output 2014-01-19 10:45:38 +01:00
Anton Babushkin 42f4f45979 mc_att_control_vector renamed to mc_att_control 2014-01-19 10:44:57 +01:00
Anton Babushkin d55ef18c7f Merge branch 'autostart_cleanup' into navigator_new_vector 2014-01-18 20:45:33 +01:00
Anton Babushkin a9e288dfdd rc: bug fixed 2014-01-18 20:08:08 +01:00
Anton Babushkin eb752b57d9 rc: typo fixed 2014-01-18 16:59:39 +01:00
Anton Babushkin bb8cf0894f autostart: HIL and bad PX4IO fixes 2014-01-18 16:47:23 +01:00
Anton Babushkin 524a502a56 autostart fixes 2014-01-18 16:42:49 +01:00
Anton Babushkin 98ad84bb58 Merge branch 'autostart_cleanup' into navigator_new_vector 2014-01-18 00:07:50 +01:00
Anton Babushkin 5db68264c7 rcS: HIL fixed 2014-01-18 00:07:25 +01:00
Anton Babushkin 43d751737b rc: use vector control apps for multirotors 2014-01-18 00:05:04 +01:00
Anton Babushkin 36ba448754 rcS: start navigator and dataman 2014-01-17 23:21:16 +01:00
Anton Babushkin c94eb3198a rcS: use mtd on FMUv1 too 2014-01-17 23:15:23 +01:00
Anton Babushkin a863b07f8c Merge branch 'autostart_cleanup' into navigator_new_vector 2014-01-17 23:14:24 +01:00
Anton Babushkin a8d362de13 Autostart: use MIXER instead of FRAME_GEOMETRY 2014-01-15 00:02:57 +01:00
Anton Babushkin d1b2186806 Autostart 3DR Iris updated 2014-01-14 21:59:48 +01:00
Anton Babushkin 7b60761bf5 Merge branch 'master' into autostart_cleanup 2014-01-14 15:52:46 +01:00
Anton Babushkin 97e4522c76 Merge branch 'master' into navigator_new_vector 2014-01-14 15:45:49 +01:00
Anton Babushkin 7bcddd192f Merge branch 'navigator_new' into navigator_new_vector 2014-01-13 13:07:25 +01:00
Thomas Gubler 1008d0c383 fix small error in rc.fw_interface 2014-01-13 08:03:38 +01:00
Thomas Gubler 449ed058c3 rc.fw_interface: use mixer file from sd if it exists 2014-01-12 18:55:41 +01:00
Thomas Gubler d079074e80 update the skywalker x5 script 2014-01-12 18:49:43 +01:00
Lorenz Meier ab401da3e8 Fixed rcS typo 2014-01-12 17:43:33 +01:00
Lorenz Meier 3387aa64d4 Enabled MTD partitions, successfully tested params 2014-01-12 16:33:23 +01:00
Anton Babushkin 3339edeae6 Autostart: tones cleanup 2014-01-11 18:45:56 +01:00
Anton Babushkin 4dd5c13b98 Autostart: fixes 2014-01-11 17:52:29 +01:00
Anton Babushkin 41add86164 Autostart: standalone FMUv1 setup fixed 2014-01-11 11:34:18 +01:00
Anton Babushkin 95c99618f9 Autostart: mkblctrl mixer loading fixed 2014-01-11 11:26:55 +01:00
Thomas Gubler f224374ed3 Merge remote-tracking branch 'upstream/master' into navigator_new 2014-01-11 00:49:30 +01:00
Anton Babushkin 3f6f26e5f6 Autostart for fixed wing bug fixed 2014-01-11 00:40:19 +01:00
Anton Babushkin e301bdcf99 Autostart: some fixed wing setups added 2014-01-11 00:34:46 +01:00
Anton Babushkin 2e11992992 Don’t try to find autostart script if SYS_AUTOSTART = 0 2014-01-10 23:41:03 +01:00
Anton Babushkin f3a3d62cf9 Use rc.txt, config.txt, extras.txt files, minor boot messages fixes 2014-01-10 23:14:29 +01:00
Anton Babushkin 6e60984556 rcS and autostart scripts cleanup, WIP 2014-01-10 22:04:56 +01:00
Anton Babushkin f5501a0508 Merge branch 'master' into autostart_cleanup 2014-01-10 16:23:51 +01:00
Anton Babushkin b5d56523bc Init scripts cleanup, WIP 2014-01-10 13:18:34 +01:00
Anton Babushkin 532c4c771e Autostart: generic quad, hexa and octo added, WIP 2014-01-09 10:05:24 +01:00
Anton Babushkin 9a5ef70070 init: USE_LOGGING and USE_GPS env vars removed 2014-01-08 23:32:27 +01:00
Anton Babushkin 4cffd99db9 Major autostart rewrite 2014-01-08 20:55:12 +01:00
Anton Babushkin 8d7620c3cb Merge branch 'master' into navigator_new_vector 2014-01-08 15:44:24 +01:00
Lorenz Meier ab407a82ba Merge branch 'master' into mount_tests 2014-01-07 22:42:09 +01:00
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +01:00
Lorenz Meier 76477b2057 Added support for Octo Cox 2014-01-06 09:25:53 +01:00
Lorenz Meier 7590d91cf2 Improved mount test 2014-01-04 17:05:52 +01:00
Lorenz Meier 97e8386290 Auto-restarting mount test if config file present 2014-01-04 13:54:14 +01:00
Anton Babushkin 5bedd8c714 Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 14:52:00 +04:00
Anton Babushkin 6a5d5f7136 Merge master into navigator_new 2014-01-02 14:51:48 +04:00
Lorenz Meier 1d9e8a7b72 Reboot if IO update startup fails on first try 2014-01-01 23:43:39 +01:00
Anton Babushkin b7f2c89a16 Merge branch 'master' into navigator_new_vector 2014-01-01 14:14:35 +04:00
Anton Babushkin a71b04775c Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector 2013-12-30 08:55:26 +04:00
Lorenz Meier bc76924b7e Cleanup, removed commander start calls in locations where its not needed 2013-12-30 00:52:50 +01:00
Julian Oes c1e50b8a1f Merge remote-tracking branch 'px4/master' into navigator_new 2013-12-29 14:48:54 +01:00
Lorenz Meier 07c1ff77a2 Fixed MAV type and typo 2013-12-28 23:21:31 +01:00
Lorenz Meier 5e8857e411 Further cleanup, added octos 2013-12-28 22:52:23 +01:00
Lorenz Meier ab330de180 Fixed typo 2013-12-28 22:34:09 +01:00
Lorenz Meier 501c5ff49f Cleaned up startup, should be completely compatible, but allows clean QGC indices 2013-12-28 22:18:07 +01:00
Lorenz Meier d7a3aaba45 Getting multicopter startup back to generic, trimming down number and content of different startup scripts 2013-12-28 22:16:06 +01:00
Simon Wilks b20e07a1c5 Updated defaults following recent test flight that included autostart and land 2013-12-28 18:12:55 +01:00
Simon Wilks 1cca94defc Whitespace fix 2013-12-28 17:23:52 +01:00
Simon Wilks 1637c62751 Set the tested defaults 2013-12-28 17:19:09 +01:00
Simon Wilks 988c5351e3 Merge remote-tracking branch 'upstream/master' into fx79 2013-12-28 17:15:16 +01:00
Simon Wilks 3f84ad79c5 Typo fix. 2013-12-28 14:46:55 +01:00
Simon Wilks 4e5f743e41 Added config for the FX-79 2013-12-28 14:45:29 +01:00
Simon Wilks f17538a7f3 Updated parameters to latest flight tested values 2013-12-28 09:03:42 +01:00
Simon Wilks d9f75a751b Startup script for Wing Wing (Z-84) 2013-12-28 08:56:58 +01:00
Anton Babushkin 7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Julian Oes 40f2d581bf Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator 
Conflicts:
	src/drivers/px4fmu/fmu.cpp
	src/modules/dataman/dataman.c
	src/modules/dataman/dataman.h
	src/modules/mavlink/orb_listener.c
	src/modules/mavlink/waypoints.c
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_mission.cpp
	src/modules/navigator/navigator_mission.h
	src/modules/uORB/topics/mission.h
 2013-12-27 00:04:32 +01:00
Julian Oes 05ec96b0f7 Startup script for simple logging 2013-12-26 23:46:33 +01:00
Anton Babushkin e1f949163b makefiles and rc scripts fixed to use new attitude and position controllers 2013-12-26 23:06:36 +04:00
Anton Babushkin 1e4bb764a6 Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:31:12 +04:00
Thomas Gubler 80986ce813 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups 2013-12-23 16:59:20 +01:00