Commit Graph

625 Commits

Author SHA1 Message Date
Roman Bapst 4915c15036 removed files and code segments which should not be there and removed 2014-11-10 17:58:33 +01:00
Roman Bapst 7954540f45 removed files which should not be in here 2014-11-10 17:52:43 +01:00
Roman Bapst 31238516b5 pulled from PX4 master 2014-11-10 17:16:30 +01:00
Roman Bapst 4fdf8e1ff2 updated from remote 2014-10-23 16:59:21 +02:00
Simon Wilks 99f839b038 Add a min PWM output so motors idle on arming. 2014-10-23 10:57:31 +02:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Thomas Gubler cc05f0f185 Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
2014-09-30 15:38:27 +02:00
Roman Bapst 9ddb21404e Updated from remote master 2014-09-23 13:28:41 +02:00
Julian Oes d9bb3a5112 viper: removed wrong failsafe values 2014-09-23 06:08:24 +10:00
Julian Oes bdddcf338d viper: changed some values for doors and bottle drop servos 2014-09-20 22:53:56 +10:00
Don Gagne deda5d0a04 Upgraded unit test framework 2014-09-13 19:59:44 -07:00
Vladimir Ermakov ed66097ebc FTP: Update unit test for new header size.
_list_test failed.
2014-09-10 11:54:42 +04:00
Lorenz Meier 75e9497ab1 Fix FX79 mixer 2014-09-03 18:15:30 +02:00
Don Gagne 7db57310d5 New mavlink_ftp unit test data 2014-09-02 15:32:16 -07:00
Lorenz Meier c9a92e6030 Merge branch 'master' into swissfang 2014-08-31 21:12:23 +02:00
Lorenz Meier 84d26185df Better initial config for Phantom 2014-08-31 21:11:20 +02:00
Roman Bapst b86dc8ef39 "Get newest update"Merge branch 'master' of https://github.com/PX4/Firmware 2014-08-28 10:55:30 +02:00
Lorenz Meier 65dab36910 Improve startup and payload handling 2014-08-26 10:13:52 +02:00
Lorenz Meier 47e39841df Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang 2014-08-26 09:37:56 +02:00
Pavel Kirienko 1fa49aaea9 UAVCAN: clarification 2014-08-24 01:41:54 +04:00
Pavel Kirienko 6a8971e28f New UAVCAN initialization logic 2014-08-23 17:31:46 +04:00
Roman Bapst cedfdfca60 some hacks for the quadshot 2014-08-22 16:00:34 +02:00
Lorenz Meier 20ceba48cf Do not modify startup where not absolutely required 2014-08-15 20:34:04 +02:00
Simon Wilks 0c78794e57 Fix the index numbers and command max travel in the app for the drop servo. 2014-08-14 16:43:49 +02:00
Simon Wilks eabddaa615 Merge remote-tracking branch 'upstream/master' into test_bottle_drop_paul 2014-08-14 13:04:20 +02:00
Anton Babushkin 73b4c6eba1 mavlink: stream names updated in configuration 2014-08-13 20:09:57 +02:00
Lorenz Meier 309a718db4 Put payload outputs for AERT mixer onto right actuator group 2014-08-12 17:57:14 +02:00
Lorenz Meier 4adc6d30b3 Merged failsafe from master 2014-08-12 08:22:50 +02:00
Lorenz Meier f4cf94b084 Improved rcS handling, added failsafe flag. Needs further testing for USB stability 2014-08-12 08:21:06 +02:00
Lorenz Meier 467e67e7e7 Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-11 19:39:30 +02:00
Lorenz Meier 2ca8903240 If we failed loading params, reset them (if the file handle is valid the file is corrupted and there is no hope, if its just not present the reset command will not do anything) 2014-08-11 14:56:13 +02:00
Lorenz Meier 258fb27e14 Ensure that a failing dataman start does not abort boot 2014-08-11 14:54:18 +02:00
Lorenz Meier c81c94d74f Fix control group in Viper mixer 2014-08-11 14:52:07 +02:00
Lorenz Meier 01a2554771 Viper mixer: Set failsafe values so we are not starting to command actuators 2014-08-11 14:51:49 +02:00
Lorenz Meier ab80459b32 Fixed whitespace in rcS 2014-08-11 08:56:06 +02:00
Julian Oes 6ff32b2338 Merge branch 'master' into test_bottle_drop_paul
Conflicts:
	ROMFS/px4fmu_common/init.d/3035_viper
2014-08-09 19:59:45 +02:00
Julian Oes e6210058a3 mixers: added Viper mixer 2014-08-09 19:52:30 +02:00
Julian Oes 3fdf63d2b3 Startup script: added viper script
Conflicts:
	mavlink/include/mavlink/v1.0
2014-08-09 19:47:48 +02:00
Julian Oes 312f9e0ccc mixers: adapted FX79 mixer to have more pitch influence 2014-08-09 19:43:57 +02:00
Lorenz Meier b0b2f34992 Merged master 2014-08-09 12:22:28 +02:00
Anton Babushkin 7f293be7d7 mavlink, rc.usb: increase HIL_CONTROLS rate and datarate on USB to allow HIL simulation @ 200Hz 2014-07-31 17:30:00 +02:00
Lorenz Meier 68415137b9 Merge pull request #1217 from PX4/mavlinkrates2
Mavlink: don't use mavlink helpers
2014-07-31 11:29:10 +02:00
Anton Babushkin e3bc557155 rc.usb: set RC_CHANNELS_RAW rate to 5Hz 2014-07-29 11:59:38 +02:00
Lorenz Meier af7385bdc2 Re-instate TECS default gains 2014-07-29 11:15:23 +02:00
Anton Babushkin a2ac45f4e0 Merge commit 'bd808ccf3a825ac1304a72dcede12478fda76857' into mavlinkrates2 2014-07-25 18:41:25 +02:00
Anton Babushkin c5a623e158 rcS: set rates for parameters and missions on USB connection 2014-07-25 14:30:45 +02:00
Lorenz Meier 086fc7f758 Merge pull request #1128 from PX4/uavcan
Basic UAVCAN support
2014-07-22 06:48:49 +02:00
Lorenz Meier f7c330fa60 Remove all handles to TECS params in startup scripts 2014-07-18 07:58:59 +02:00
Lorenz Meier f89062fe3b Merge pull request #1186 from PX4/logging
Multi-instance handling for sensors
2014-07-17 07:33:50 +02:00
Lorenz Meier 65c952e134 Merge pull request #1185 from PX4/mc_defaults
Better defaults for min values for some of the multicopters
2014-07-16 17:57:48 +02:00