Commit Graph

9685 Commits

Author SHA1 Message Date
Lorenz Meier 082a0c7aa5 Merge branch 'master' of github.com:PX4/Firmware into st24 2014-10-07 09:25:59 +02:00
Lorenz Meier c2687a7774 ST24 integration in IO firmware 2014-10-07 08:05:45 +02:00
Lorenz Meier cb0cbe479a Finalizing ST24 lib 2014-10-07 08:05:32 +02:00
Lorenz Meier 9c89499696 Fix up ST24 lib 2014-10-07 07:14:28 +02:00
Lorenz Meier debff9e179 Updates to ST24 decoding library 2014-10-06 19:20:39 +02:00
Lorenz Meier 966688d092 Fixed ST24 test 2014-10-06 19:20:17 +02:00
Lorenz Meier 34e75672bb SBUS2 fix 2014-10-06 19:20:02 +02:00
Denis Yeldandi 6bf005e901 PASHS,POP,20 is needed for 20Hz configuration 2014-10-06 17:56:56 +04:00
Lorenz Meier b4c188cf19 Fix file location for st24 test 2014-10-06 13:41:29 +02:00
Lorenz Meier 7b0ac1db85 Fix compile error in parser 2014-10-06 07:53:32 +02:00
Lorenz Meier 72f6aaca96 Add ST24 test harness 2014-10-06 07:53:18 +02:00
Thomas Gubler c6de36d683 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-10-05 13:17:37 +02:00
Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
2014-10-05 13:17:32 +02:00
Lorenz Meier c0eefc983a File test compile fixes 2014-10-05 13:13:22 +02:00
Lorenz Meier 850c630e11 Navigator: Optimize for space 2014-10-05 13:09:19 +02:00
Lorenz Meier ff17f31cce Dataman: Optimize for space 2014-10-05 13:09:02 +02:00
Lorenz Meier 2587074a07 Compile fixes in navigator 2014-10-05 13:07:56 +02:00
Thomas Gubler ebc84b9f44 reduce mavlink message buffer size 2014-10-05 13:02:13 +02:00
Thomas Gubler 61352b8e1a remove warnx 2014-10-05 12:52:04 +02:00
Lorenz Meier 80ed01a5b4 Merge pull request #1363 from vooon/ftp_write_support
FTP: write support
2014-10-05 12:35:02 +02:00
Lorenz Meier 3239ba1570 Merge pull request #1360 from DonLakeFlyer/UnitTestFramework
Upgraded unit test framework
2014-10-05 12:33:21 +02:00
Lorenz Meier d655865976 Merge pull request #1279 from PX4/takeoff_fix
navigator: skip takeoff if already above takeoff altitude
2014-10-05 12:32:14 +02:00
Lorenz Meier 2722921b30 Fixed function name of mission modification logic, attributed @DrTon 2014-10-05 12:30:29 +02:00
Vladimir Ermakov 0fbdb8d326 FTP: Return bytes written in payload. 2014-10-05 13:23:57 +04:00
Vladimir Ermakov 56a9d16fc4 FTP: Save errno in _copy_file(). 2014-10-05 13:19:13 +04:00
Thomas Gubler 3cebfd4045 Merge remote-tracking branch 'upstream/master' into takeoff_fix
Conflicts:
	src/modules/navigator/mission.cpp
2014-10-05 10:55:12 +02:00
Lorenz Meier a0c9c88443 Merge branch 'master' of github.com:PX4/Firmware into st24 2014-10-04 15:35:59 +02:00
Lorenz Meier 63b7fac10c Merge pull request #1286 from PX4/mpc_track
mc_pos_control: path following and smooth transitions on waypoints in AUTO
2014-10-04 14:22:03 +02:00
Thomas Gubler b7c2ba75e3 Merge pull request #1377 from PX4/revert-1376-hud_alt_reporting
Revert "Use global position altitude to report HUD altitude, for consist...
2014-10-04 12:32:40 +02:00
Lorenz Meier 7bde4fa634 Revert "Use global position altitude to report HUD altitude, for consistency." 2014-10-04 12:31:16 +02:00
Lorenz Meier ea269dbbbe Merge pull request #1376 from tstellanova/hud_alt_reporting
Use global position altitude to report HUD altitude, for consistency.
2014-10-04 11:51:28 +02:00
Denis Yeldandi e0a21000c8 Merge branch 'ashtech' into ashtech_hi_freq 2014-10-04 09:22:17 +04:00
Denis Yeldandi 04ceb3c95d Fixed km/h -> knots in POS 2014-10-04 09:21:47 +04:00
tstellanova 5846f217d0 Use global position altitude to report HUD altitude, for consistency.
Otherwise the HUD altitude jumps between two very different values.
2014-10-03 17:18:44 -07:00
Anton Babushkin 84908f8f3d mc_pos_control: AUTO speed limiting bug fixed 2014-10-02 15:45:02 +04:00
Denis Yeldandi a960fcbdef Increased ashtech POS frequency and increased baudrate 2014-10-02 14:34:20 +04:00
Denis Yeldandi 83632ec0ce Merge branch 'master' into ashtech 2014-10-02 14:28:07 +04:00
Thomas Gubler 2766285d56 mavlink: change message buffer size to 4 2014-09-30 16:00:14 +02:00
Thomas Gubler 5452732610 switch back to common mavlink dialect 2014-09-30 15:54:27 +02:00
Thomas Gubler f4851c1b14 ubx: disable sbas configuration per default 2014-09-30 15:50:58 +02:00
Thomas Gubler 4fbeb73bda fix merge fail, remove double declaration of circuit breaker 2014-09-30 15:48:48 +02:00
Thomas Gubler c5a1ddd8f2 re-enable MC apps on FMUV1 2014-09-30 15:42:56 +02:00
Thomas Gubler e7313683cd Merge remote-tracking branch 'upstream/master' into swissfang 2014-09-30 15:40:11 +02:00
Thomas Gubler 6da52c5543 remove unnecessary variable 2014-09-30 15:39: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
Lorenz Meier 47f151d4ce Deactivate FrSky telem by default 2014-09-30 15:19:06 +02:00
Lorenz Meier 47dcf88271 Flash optimization 2014-09-30 15:18:30 +02:00
Lorenz Meier 76e9710d76 Merge pull request #1213 from PX4/obcfailsafe
Obc failsafe
2014-09-30 14:50:26 +02:00
Denis Yeldandi 213f4aadbd Ashtech GPS driver 2014-09-30 15:44:47 +04:00
Thomas Gubler d11f05b12c commander: update gps and engine cb only when changed 2014-09-30 13:40:03 +02:00