Commit Graph

1434 Commits

Author SHA1 Message Date
Lorenz Meier 80b84819d2 Merged fixed wing branches 2012-11-26 21:02:36 +01:00
Lorenz Meier eca12343fd Merge branch 'io_arming' into fixedwing_outdoor 2012-11-26 17:52:30 +01:00
Lorenz Meier 11b0242f55 Not arming FMU in HIL mode 2012-11-26 17:50:14 +01:00
Lorenz Meier 4298f68fcd IO does not arm in HIL mode 2012-11-26 17:43:07 +01:00
Lorenz Meier 9bc044eae9 More fixed wing improvements 2012-11-26 17:42:08 +01:00
Lorenz Meier 7cc712b286 More fixed wing improvements 2012-11-26 17:41:51 +01:00
Thomas Gubler 4366d9e319 fw_controller testing 2012-11-25 18:20:54 +01:00
Lorenz Meier 2ca09ab3d1 Merged with coordinated turn effort 2012-11-25 17:10:49 +01:00
Lorenz Meier 20a29bff99 Fixes for roll/pitch feedforward 2012-11-25 16:42:31 +01:00
Lorenz Meier 346d93b271 Merged 2012-11-25 13:56:19 +01:00
Lorenz Meier faa672f8bb mode switching for all platforms, additional fixed wing modes 2012-11-25 13:55:28 +01:00
Thomas Gubler dd05426002 manual merge of origin/master into fw_control 2012-11-25 00:50:25 +01:00
Lorenz Meier dc72d467d4 fixed wing manual setpoints in manual mode 2012-11-25 00:28:15 +01:00
Lorenz Meier 9f35de51a6 Removed unneeded header 2012-11-24 22:39:43 +01:00
Lorenz Meier c184d7baeb Enabled aux manual control channels 2012-11-24 19:37:51 +01:00
Lorenz Meier b1bc5e0e46 Improved drivers, allowed parallel use of multiple gyros 2012-11-23 22:52:37 +01:00
px4dev adb04f632f Local changes to match upstream changes. 2012-11-22 20:35:08 -08:00
px4dev a3842eb4d1 Merge branch 'master' of file:///Users/Shared/NuttX/NuttX into nuttx-merge-cbf2eea
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5383 42af7a65-404d-4744-a932-0658087f49c3
2012-11-22 20:34:32 -08:00
patacongo cbf2eea7f0 A few more fixes for ez80 Windows Native build (still not enough)
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5381 42af7a65-404d-4744-a932-0658087f49c3
2012-11-21 23:22:38 +00:00
Thomas Gubler 6fb54ec62c manual merge of origin/master into fw_control 2012-11-21 21:35:13 +01:00
patacongo 27ec2129d7 /configs/stm32f4discovery/winbuild and configs/cloudctrl upated to use Mike's Toolchain.defs; Fix error introduced into tools/configure.sh
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5380 42af7a65-404d-4744-a932-0658087f49c3
2012-11-21 19:54:44 +00:00
Lorenz Meier 0193d590db Removed debug printf 2012-11-21 17:37:52 +01:00
Lorenz Meier d9a3103413 Merge branch 'development' of github.com:PX4/Firmware into development 2012-11-21 17:37:00 +01:00
Lorenz Meier 4d1256e3f3 Removed left-over comment 2012-11-21 17:36:52 +01:00
Lorenz Meier e24c349d1d Temporarily very verbose on flow output 2012-11-21 15:42:42 +01:00
Lorenz Meier 25e304c869 Added vicon, actuator controls effective and optical flow to logging 2012-11-21 15:32:59 +01:00
Lorenz Meier ffda224b41 Added actuator controls effective topic 2012-11-21 14:59:55 +01:00
Lorenz Meier d1cde9858d Fixed typo in console message string 2012-11-21 14:59:17 +01:00
Lorenz Meier 13000a7121 Yaw rate sanity checking for controller 2012-11-20 16:51:13 +01:00
Lorenz Meier 7820024d90 Disabling commander black magic 2012-11-20 16:50:55 +01:00
patacongo f552862bb5 Missing comma in EVERY DELFILE/DELDIR macro call in every Makefile
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5373 42af7a65-404d-4744-a932-0658087f49c3
2012-11-20 15:47:41 +00:00
Lorenz Meier 3bfc309856 Added setpoint triplet 2012-11-20 15:20:13 +01:00
Lorenz Meier 6ff4520904 Cleaned up PI wrapping code, still subject to testing 2012-11-20 15:19:51 +01:00
patacongo 6833671f0c 0001-some-fixes-for-FreeMODBUS-and-MODBUS-example.patch from Freddi Chopin
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5372 42af7a65-404d-4744-a932-0658087f49c3
2012-11-20 13:36:07 +00:00
Julian Oes 129e6d73de Changed yaw position control to yaw speed control for multirotors, tested with ardrone 2012-11-19 16:17:52 -08:00
Julian Oes 2652b16d37 Distinction between yaw position and yaw speed control, just messsed around in the code, untested 2012-11-19 09:26:38 -08:00
Lorenz Meier 9c8e031f6b Fixed minor optical flow receive and retransmit issue, value was not re-transmitted 2012-11-19 13:37:38 +01:00
Lorenz Meier d006a3fe2d Added onboard, receive-only MAVLink app for onboard UART networks 2012-11-18 16:19:10 +01:00
Lorenz Meier 340323830c Minor cleanups in docs and output 2012-11-18 16:17:09 +01:00
patacongo d4dca58d93 Most of the changes needed to support Windows native clean; distclean is has a problem
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5367 42af7a65-404d-4744-a932-0658087f49c3
2012-11-17 18:54:53 +00:00
patacongo 8b823f6bee Mostly cosmetic build changes
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5362 42af7a65-404d-4744-a932-0658087f49c3
2012-11-16 14:13:04 +00:00
patacongo da3dd04ea5 Changes from Mike
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
2012-11-16 12:41:58 +00:00
Julian Oes e9acc18df4 Lowered arm button prelling 2012-11-15 11:57:55 -08:00
Julian Oes 33e750602a Merge remote-tracking branch 'upstream/master' into io
Fixed Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c

rc loss failsafe throttle tested
2012-11-15 11:55:55 -08:00
patacongo 9129fb715b Fix a place that had a '\' but needed a '/'
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5359 42af7a65-404d-4744-a932-0658087f49c3
2012-11-15 19:35:15 +00:00
patacongo afda776368 Fix various build-related typos
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5358 42af7a65-404d-4744-a932-0658087f49c3
2012-11-15 19:22:47 +00:00
patacongo 2581506dfb Move some (hopefully) un-necessary quotes in Makefiles for Mike
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5356 42af7a65-404d-4744-a932-0658087f49c3
2012-11-15 17:43:29 +00:00
Lorenz Meier 3016ae72a3 minor cosmetic changes in commander 2012-11-15 17:20:14 +01:00
Lorenz Meier 7f916779df Minor cleanup of param load / store 2012-11-15 17:19:52 +01:00
Lorenz Meier df5e4d1904 Improved self-test logic 2012-11-15 17:19:21 +01:00