Commit Graph

2426 Commits

Author SHA1 Message Date
px4dev 919d53766a Less noisy build again. 2013-01-11 02:31:30 -08:00
px4dev f127495caa Manually fixup merge botches via direct comparison with NuttX r5447. 2013-01-11 02:14:43 -08:00
px4dev 48c5d63319 Merge branch 'nuttx-merge-0f2decb' into nuttx-merge-5447 2013-01-11 00:46:38 -08:00
px4dev 003f4c8156 Merge commit '3f420066964fe574bcf1c243d6a66646a433f777' into nuttx-merge-5447 2013-01-11 00:46:22 -08:00
px4dev d796a3b43b Merge commit 'b3f037e876055ff4f5169fb5df1639d50d7d5976' into nuttx-merge-5447 2013-01-11 00:45:53 -08:00
px4dev ca305933a1 Merge commit 'eaf1d8063cc707b1041e8583663d9edd45f42c5d' into nuttx-merge-5447
Build system updates to sync with NuttX upstream.
2013-01-11 00:45:25 -08:00
px4dev ccf9882dc5 Merge branch 'master' into nuttx-merge-5447 2013-01-11 00:39:22 -08:00
px4dev 40dfbf0d97 Merge pull request #137 from PX4/fixedwing
Add latest fixed wing control bits, multi rotors supported.
2013-01-10 23:38:13 -08:00
Lorenz Meier 31ca806958 More print cleanups in commander app 2013-01-11 08:24:28 +01:00
Lorenz Meier 9608dfefa3 Stripped a lot of text from commander app 2013-01-11 08:18:12 +01:00
Lorenz Meier cf8eed9a6b Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-11 08:07:35 +01:00
px4dev 0cb2a508b2 Merge pull request #141 from PX4/sdlog_buffering
Sdlog buffering
2013-01-10 23:01:46 -08:00
Lorenz Meier b52402dbe2 Fixed code style for mavlink app 2013-01-11 07:48:09 +01:00
Lorenz Meier fdf1c712b1 Fixed code style for conversions 2013-01-11 07:47:22 +01:00
Lorenz Meier 970ae0c13e Fixed code style for attitude estimator 2013-01-11 07:46:40 +01:00
Lorenz Meier cded2787f0 Fixed code style for multirotor_att_control app 2013-01-11 07:45:24 +01:00
Lorenz Meier cf563eda86 px4io code style 2013-01-11 07:44:17 +01:00
Lorenz Meier dc100f2020 Fixedwing controller code style 2013-01-11 07:44:03 +01:00
Lorenz Meier 9ab20b11b6 Code style 2013-01-11 07:42:09 +01:00
Lorenz Meier d6116d9564 Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-11 07:36:44 +01:00
Lorenz Meier 65c8028629 Working on override channel mapping, allowed trim cal only with RC on 2013-01-11 07:35:40 +01:00
px4dev b5bdb48843 Merge pull request #143 from julianoes/feature_io_bl_rev3
Added support for IO bootloader revision 3 on FMU
2013-01-10 22:31:59 -08:00
px4dev 6de688676d Suppress annoying C++ ABI portability warnings
This suppresses an otherwise not useful warning when mixing C++ and va_list
2013-01-10 18:53:26 -08:00
Julian Oes b5eccef69e Started with px4io stop implementation 2013-01-10 15:49:53 -08:00
Julian Oes 5e20dd1736 Added support for IO bootloader revision 3 on FMU 2013-01-10 15:35:47 -08:00
Lorenz Meier 1d4feb6905 Merged sdlog_buffering branch 2013-01-10 14:43:59 +01:00
Lorenz Meier 46cf2a538f Included workaround for MacOS timestamp issue 2013-01-10 12:57:09 +01:00
Lorenz Meier 241a8357c0 Fixed minor bug in log conversion script 2013-01-09 23:54:10 +01:00
Lorenz Meier 1a107bd7bf Added warning, needs more work on the rotation matrix output 2013-01-09 16:56:23 +01:00
Lorenz Meier d60173224f Merge branch 'master' of github.com:PX4/Firmware into fixedwing
t.
2013-01-09 16:53:01 +01:00
Lorenz Meier 447bcb990d Merge branch 'fixedwing' of github.com:PX4/Firmware into fixedwing 2013-01-09 16:52:45 +01:00
Lorenz Meier 4435befefd Added offset parameters for roll, pitch and yaw 2013-01-09 16:52:15 +01:00
Lorenz Meier 955ae0aa45 Merged 2013-01-09 16:40:09 +01:00
Lorenz Meier fd75f19374 Updated MAVLink version, included omnidirectional flow message 2013-01-09 16:38:30 +01:00
Lorenz Meier 16e49c447d Added support for battery voltage and differential pressure to logging and plot script 2013-01-09 16:37:45 +01:00
Lorenz Meier e1a6f1b910 Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-09 16:26:12 +01:00
Lorenz Meier d957f8e004 Hotfix: Copying from right actuator topic on IO if FMU and IO PWM outs are enabled 2013-01-09 13:11:06 +01:00
Lorenz Meier 6c93cbfa5e Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-09 09:41:52 +01:00
Lorenz Meier 6f8081b5ea Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-09 09:41:07 +01:00
Lorenz Meier 3bb145f584 Enabled and tested ring buffer, logging at full 250 Hz sensor rate 2013-01-09 09:39:51 +01:00
px4dev b5424a4d02 Fix the CMSIS DSP_Lib include path specification. This avoids some scary messages from 'make depend'. 2013-01-08 14:40:20 -08:00
Lorenz Meier b48f99b601 Updated state switching to most recent state machine rev 2013-01-08 22:22:22 +01:00
Lorenz Meier 780087acf0 Merged with master 2013-01-08 21:25:38 +01:00
Lorenz Meier 9a7befef18 Merge pull request #139 from NosDE/master
Added Battery Alarm Status to Struct Vehicle_Status
2013-01-08 12:04:17 -08:00
unknown 1998ce1205 Battery-Warn-State added to struct Vehicle_Status 2013-01-08 20:37:47 +01:00
Lorenz Meier b78a430424 Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering 2013-01-08 17:41:33 +01:00
Lorenz Meier 8cc9fb9e2c Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-08 17:40:44 +01:00
px4dev 01ea8eb54f Test for CortexM4 and FPU rather than the ARM mathlib-internal define. 2013-01-08 08:26:04 -08:00
px4dev ee5cd2c95a Rather than assume that px4fmu means CMSIS DSPlib, test for cortex M4 and FPU. 2013-01-08 08:25:06 -08:00
Lorenz Meier 435bae6542 Added logging with worker thread for microSD writes, untested, but feature-complete 2013-01-08 14:57:12 +01:00