Commit Graph

13526 Commits

Author SHA1 Message Date
Thomas Gubler e03e089819 Merge remote-tracking branch 'upstream/master' into attitudeekf 2014-08-14 14:19:05 +02:00
Simon Wilks eabddaa615 Merge remote-tracking branch 'upstream/master' into test_bottle_drop_paul 2014-08-14 13:04:20 +02:00
sjwilks e9b0ee7501 Merge pull request #1273 from PX4/rc_fix
Fixed copy & paste error on RC output
2014-08-14 12:38:08 +02:00
Lorenz Meier e03c4d4b65 Fixed copy & paste error on RC output 2014-08-14 12:34:47 +02:00
Anton Babushkin 73b4c6eba1 mavlink: stream names updated in configuration 2014-08-13 20:09:57 +02:00
Anton Babushkin 54a6e66ada mavlink: in HIL_CONTROLS send 0 for disabled channels 2014-08-13 19:46:35 +02:00
Thomas Gubler e634c9fa99 Merge remote-tracking branch 'origin/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/mavlink/mavlink_receiver.cpp
2014-08-13 15:07:09 +02:00
Lorenz Meier 54fc6aa678 Hotfix: Optimize shell commands for size - we do not need massive performance there 2014-08-13 10:33:46 +02:00
Lorenz Meier 38a14edefa Merge pull request #893 from PX4/geo
GEO lib projection changes / updates
2014-08-13 09:24:31 +02:00
Lorenz Meier 2cc5c6e84f INAV: Add braces to ensure statements are evaluated correctly 2014-08-13 09:14:43 +02:00
Lorenz Meier 3f63b67eb6 Merged master into vision_estimate 2014-08-13 09:08:16 +02:00
Don Gagne c8ecf59ab7 List command bug fix, easier debugging
- List command was generating bad data size because it was adding
directory entry char to buffer before testing buffer overflow.
- Added MAVLINK_FTP_DEBUG define to easily turn on/off noisier
debugging output
2014-08-12 14:23:26 -07:00
Lorenz Meier d6c018d14b Bottle drop iteration - commandline tool for component testing 2014-08-12 17:57:47 +02:00
Thomas Gubler 85eed22150 offboard sp: correctly map acceleration/force in combined setpoint to setpoint triple
Conflicts:
	src/modules/uORB/topics/position_setpoint_triplet.h
2014-08-12 16:46:12 +02:00
Thomas Gubler a04d70ed5a offboard setpoints: correctly check for force setpoint 2014-08-12 14:57:14 +02:00
Thomas Gubler 017f82e2b8 Merge remote-tracking branch 'origin/master' into obcfailsafe 2014-08-12 12:30:20 +02:00
Thomas Gubler 9e9da83cb7 Merge remote-tracking branch 'upstream/master' into attitudeekf 2014-08-11 16:17:27 +02:00
Lorenz Meier f0458af28b Extend vehicle commands as needed 2014-08-11 14:53:04 +02:00
Lorenz Meier f47cf9a002 Bottle drop: C++ify full code base, fix transformation assumptions and other things, ready for integration testing 2014-08-11 14:52:45 +02:00
Thomas Gubler 89986cf3e5 epv/eph threshold variable names changed 2014-08-11 13:46:13 +02:00
Thomas Gubler af1ad04c23 Merge remote-tracking branch 'origin/master' into geo 2014-08-11 13:37:08 +02:00
Julian Oes c7819dbb69 mavlink: use pixhawk dialect 2014-08-11 11:05:29 +02:00
Thomas Gubler 8bbaacb1e9 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_main.h
	src/modules/mavlink/mavlink_receiver.cpp
2014-08-11 10:33:11 +02:00
Lorenz Meier b0fe5ae1ba Bring back nominal state of fw attitude controller 2014-08-11 08:58:39 +02:00
Lorenz Meier 38ec489dfc Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-11 08:53:49 +02:00
Lorenz Meier 5abdacc907 Merge pull request #1265 from PX4/FTP
More FTP support
2014-08-10 23:46:14 +02:00
Don Gagne 1d3edfa629 More FTP support
Added:
- sequence numbers
- directory list returns file sizes
- open command returns file size in data
2014-08-10 12:02:10 -07:00
Lorenz Meier 9ecec7fada Add default initializers and timestamp in local position 2014-08-10 01:30:25 +02:00
Lorenz Meier 5225d87854 Updated MAVLink to latest revision 2014-08-10 01:24:04 +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
Lorenz Meier f3969abac4 Merge pull request #886 from PX4/smooth_pos_hold
Smooth transitions to stabilized modes
2014-08-09 19:01:16 +02:00
Lorenz Meier b0b2f34992 Merged master 2014-08-09 12:22:28 +02:00
Anton Babushkin 03f839a27a mc_pos_control: more accurate position setpoint reset, keep attitude setpoint continuous 2014-08-08 00:24:18 +02:00
Anton Babushkin faaeaeb113 mc_pos_control: manual and offboard control reorganization and cleanup 2014-08-08 00:22:57 +02:00
Anton Babushkin a9d3e9854f Merge branch 'master' into smooth_pos_hold 2014-08-07 23:08:54 +02:00
Lorenz Meier 20c3a329c7 Introduce similar checks fo all other health checks in the filter 2014-08-07 07:36:59 +02:00
Lorenz Meier 13b9cd0cec Do not fuse height after innovation consistency check fail 2014-08-07 07:25:20 +02:00
Lorenz Meier 95fc701376 Merge pull request #1254 from PX4/tecs_logging
TECS logging
2014-08-06 17:41:15 +02:00
Lorenz Meier 5c5fc93ce6 Merge pull request #1258 from PX4/uavcan_fix
uavcan: fix actuator groups subcriptions and poll()
2014-08-06 17:39:59 +02:00
Pavel Kirienko 33762ce861 UAVCAN ESC mixer: removed the failsafe placeholder, it's no use here 2014-08-06 12:40:07 +04:00
Don Gagne cfe5c45e04 Fix broken arming unit test
Also, update arming_state_transition calls to add new fRunPreArmChecks
flag.
2014-08-04 09:42:16 -07:00
Don Gagne 014fd5f47b Add fRunPreArmChecks flag
This is to allow unit tests to be written which do not perform pre-arm
checks
2014-08-04 09:41:29 -07:00
Don Gagne 6fbeaeaace Update arming_state_transition calls
Add new fRunPreArmChecks flag
2014-08-04 09:40:38 -07:00
Lorenz Meier ff760d07b4 Add TECS logging 2014-08-03 13:19:10 +02:00
Lorenz Meier 020ac409be Remove airspeed and altitude raw data from TECS log, as we have these quantities already in the system log 2014-08-03 13:17:18 +02:00
Anton Babushkin f7582b4d00 Merge branch 'master' into smooth_pos_hold 2014-08-02 22:11:57 +02:00
Anton Babushkin 5824607c76 uavcan: fix actuator groups subcriptions and poll() 2014-08-02 13:01:42 +02:00
Pavel Kirienko d3d5aa9bdc Merge branch 'uavcan_node_info' 2014-08-02 03:40:22 +04:00
Pavel Kirienko 9725a16352 UAVCAN: Fixed short git hash computation 2014-08-02 03:34:57 +04:00
Lorenz Meier 4d03202c4c Warn on far waypoints 2014-08-01 23:42:26 +02:00