Commit Graph

2213 Commits

Author SHA1 Message Date
Simon Wilks 0a89ab7075 Send rc channel ordering and channel attributes from FMU to IO 2013-01-05 22:13:12 +01:00
Simon Wilks 1b81724ef7 Manually remap the channel assignements for testing. 2013-01-05 15:46:26 +01:00
Julian Oes 805c08815e The multirotor mixer return 0 instead of the number of channels, my Hex is flying now (not reliably now, random flips 2012-12-31 16:12:55 -08:00
Julian Oes 8d1b1354e1 A wrong parameter name in commander was responsible for manual override always ok 2012-12-31 12:31:31 -08:00
Lorenz Meier 7972a56076 State machine / switching improvements 2012-12-31 00:41:11 +01:00
Lorenz Meier 1b82dbb58d Merge branch '#111-px4io-integrated-mixing' of github.com:PX4/Firmware into fixedwing_io_mixing 2012-12-31 00:34:12 +01:00
px4dev dbb841b0dc Rework the way we scan text for scaler definitions; something weird was going on with sscanf's handling of %n that wasn't obvious. This seems to work around the issue. 2012-12-30 15:09:21 -08:00
px4dev f2d4eb2887 Revert "Removed text reuse, causing crash with stack trace"
This reverts commit 668d1b3301.
2012-12-30 15:08:25 -08:00
Lorenz Meier 36d556256f Merge branch '#111-px4io-integrated-mixing' into fixedwing_io_mixing 2012-12-30 14:03:33 +01:00
Lorenz Meier 668d1b3301 Removed text reuse, causing crash with stack trace 2012-12-30 13:58:30 +01:00
Lorenz Meier 234af06571 Fixed merge error 2012-12-30 12:05:38 +01:00
Lorenz Meier 1da1b8f49c Merge branch 'fixedwing_outdoor' into fixedwing_io_mixing 2012-12-30 11:01:59 +01:00
Lorenz Meier 2577e1a749 Removed compile errors, removed non-wanted MAVLink dependency in commander app 2012-12-30 11:01:09 +01:00
Lorenz Meier abe1b9759a Merged IO mixing branch 2012-12-30 10:49:27 +01:00
px4dev f6ea42ab5e Fix px4io signal test command to force FMU armed state. 2012-12-30 01:28:07 -08:00
px4dev fd016abd46 Implement the remaining pieces of mixer upload to PX4IO. 2012-12-30 01:17:19 -08:00
px4dev c740e9c616 Add a receive error counter for debugging purposes. 2012-12-30 01:16:54 -08:00
px4dev b14abad3a0 Fix logic for handling partial buffers. 2012-12-30 01:16:28 -08:00
Lorenz Meier 142556b442 merged 2012-12-30 10:03:05 +01:00
Lorenz Meier 62a95bf8e6 Stabilization enabling / switching 2012-12-30 09:53:45 +01:00
px4dev 85375c2201 Rename the FMU->IO output controls to reflect the fact that they are controls, not servo values. 2012-12-29 17:15:48 -08:00
px4dev b8250de1e6 Assorted compile fixes. 2012-12-29 16:22:30 -08:00
px4dev d81edb09cf whitespace/formatting 2012-12-29 16:01:24 -08:00
px4dev f9520ee39d Factory method for a simple mixer that converts PWM/PPM values to the standard internal format. 2012-12-29 16:00:50 -08:00
Lorenz Meier 0298714db5 Merge branch 'fixedwing_outdoor' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-30 00:04:54 +01:00
px4dev 0ae5997bd0 Fix some scaling errors in the PWM <-> mixer-internal conversions. 2012-12-29 13:28:32 -08:00
px4dev 6b9d5dac4d Rough in the new mixer path for PX4IO. 2012-12-29 12:58:41 -08:00
px4dev 6ede0e2f18 Add the ability to reset a mixer group. Report the remaining buffer size from load_from_buf. 2012-12-29 12:58:10 -08:00
px4dev d5da457e29 Fix PX4IO to run C++ static ctors 2012-12-29 12:57:29 -08:00
Lorenz Meier 4976a3a47d Added accel magnitude check, added conversion functions for various standard cases 2012-12-29 16:21:59 +01:00
Lorenz Meier b240e31c1c Safer fixed wing mode switching 2012-12-29 11:18:49 +01:00
Lorenz Meier c652f718c0 Minor fixes, pushing WIP 2012-12-29 11:00:15 +01:00
px4dev 35c82ff2fc Make mixer ioctls load from a memory buffer rather than a file. This is prep for uploading the memory buffer to IO to be processed there. 2012-12-29 00:01:04 -08:00
px4dev f0da789626 Remove the unused complex-multirotor setup ioctl, since it's not implemented anywhere. 2012-12-28 16:44:17 -08:00
Lorenz Meier be85589e48 Fixed some typos 2012-12-28 20:19:47 +01:00
Lorenz Meier 9e2076b4e4 Cleared last differences, ready for testing 2012-12-28 15:10:25 +01:00
Lorenz Meier 913f5a7812 Cleared last diff items between origin/master and fixedwing_outdoor 2012-12-28 15:06:19 +01:00
Lorenz Meier a1e1e7bf42 Cleaning up calibration requests 2012-12-28 13:18:52 +01:00
Lorenz Meier d96add5b61 Even more cleanup, diff now clean 2012-12-28 13:16:34 +01:00
Lorenz Meier e01c0e1de6 Reverting more nuttx merge 2012-12-28 13:13:30 +01:00
Lorenz Meier 38a1076a33 Cleaned up attitude control in HIL, implemented very simple guided / stabilized mode with just attitude stabilization 2012-12-28 13:12:27 +01:00
Lorenz Meier cc582b2b44 Only send actuator HIL commands if armed 2012-12-28 13:10:58 +01:00
Lorenz Meier 8b8330a015 Reverted nuttx merge, back to master 2012-12-28 13:10:06 +01:00
px4dev 3c865c7261 Build the mixer library for PX4IO as well 2012-12-27 15:12:09 -08:00
Lorenz Meier 45a4bcb6ef Merged relay activation 2012-12-27 19:06:09 +01:00
Lorenz Meier 7526dd46a2 Added header for common priority bands 2012-12-27 19:01:00 +01:00
Lorenz Meier e2196bca4f Added position lock check 2012-12-27 18:36:37 +01:00
Lorenz Meier f5bad08bd0 Cleaned up control mode state machine / flight mode / navigation state machine still needs a bit cleaning up 2012-12-27 18:27:08 +01:00
Lorenz Meier 61d7e1d285 Reverted changes to multirotor rate controller, changing to a discrete derivative does not help 2012-12-27 17:47:51 +01:00
Lorenz Meier a6f2c6022e Merge branch 'fixedwing_outdoor' of https://github.com/julianoes/Firmware into fixedwing_outdoor 2012-12-27 17:13:52 +01:00