dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
2,227 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

75 Commits

Author SHA1 Message Date
Lorenz Meier a9e87c791d Fixed header for sbus input 2013-01-06 10:13:53 +01:00
Lorenz Meier 3c85f8267f merged relay changes from master 2013-01-06 09:51:38 +01:00
px4dev 9df2aaf312 Merge branch 'master' into #111-px4io-integrated-mixing 
Fix a botched merge for #106 at the same time.
 2013-01-06 00:40:17 -08:00
px4dev b3e16b4861 Merge pull request #123 from PX4/#106-px4io-relays 
Initial implementation of application access to the PX4IO relays.
 2013-01-06 00:32:04 -08:00
Lorenz Meier 83039e76d3 Reverted unwanted S.Bus changes 2013-01-06 01:32:39 +01: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 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 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 abe1b9759a Merged IO mixing branch 2012-12-30 10:49:27 +01: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
Lorenz Meier 142556b442 merged 2012-12-30 10:03:05 +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 d81edb09cf whitespace/formatting 2012-12-29 16:01:24 -08: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 d5da457e29 Fix PX4IO to run C++ static ctors 2012-12-29 12:57:29 -08:00
Lorenz Meier be85589e48 Fixed some typos 2012-12-28 20:19:47 +01:00
Lorenz Meier 45a4bcb6ef Merged relay activation 2012-12-27 19:06:09 +01:00
Julian Oes d4edf2e85c Override is now really disabled for multirotors, also I don't think the parameter got ever read by the commander but I might be wrong 2012-12-23 17:20:53 -08:00
px4dev 5b92c51777 Initial implementation of application access to the PX4IO relays. 2012-12-20 21:31:02 -08:00
Julian Oes 8053b4b9f7 Revert "I don't want a switch for failsafe for the copter" 
This reverts commit 28b3ecd9c6.
 2012-12-20 08:55:54 -08:00
px4dev 73763353d0 Merge branch 'master' into DSM-decoder-fix 2012-12-19 22:24:00 -08:00
Julian Oes 28b3ecd9c6 I don't want a switch for failsafe for the copter 2012-12-19 17:06:01 -08:00
Lorenz Meier fe6496a04d Correctly do position lock led signalling on IO and position lock measurement on FMU, tested with HIL. 2012-12-19 14:20:40 +01:00
Lorenz Meier b9606d0d6e Reverted arming state machine back to its original state, operational again 2012-12-16 16:30:41 +01:00
Lorenz Meier e56911bf2d Fixed signal loss detection on S.Bus parsing, stripped PX4IO code parts from S.Bus parser to allow FMU / IO parser code sharing. Added S.Bus channels 17 and 18 if channel data struct has enough space. Tested with receiver and PX4FMU. 2012-12-16 15:31:44 +01:00
Lorenz Meier f81d00594c Made PX4IO FMU timeout based on IOs HRT, updating mixers now on every FMU update and not at fixed rate, this is WIP and currently does not support mixing with RC-only 2012-12-15 23:28:03 +01:00
Lorenz Meier 1fc0a6546e Merged IO feature branch 2012-12-13 11:12:34 +01:00
Lorenz Meier 03076a72ca Added required additional fields: If system is ok to launch (required for LED indicator), if system is ok to override fully by RC (required for multirotors which should not support this), desired PWM output rate in Hz (again required for some multirotors). 2012-12-13 10:23:02 +01:00
Lorenz Meier 26faab64e5 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-09 19:19:59 +01:00
Simon Wilks 03b51c69e0 Added more LED state logic and improve code. 
The LED will now also indicate when the FMU is ARMED. Switched to using
a 16-bit value where each bit indicates what state the LED should be
in.
 2012-12-08 13:39:28 +01:00
Simon Wilks 197e573885 Add an additional safety switch LED blink sequence when FMU and IO are armed 
If both the FMU and the IO board are armed then the secure switch will
blink two times quickly then a pause followed by two quick blinks and
so on.
 2012-12-07 21:34:41 +01:00
Lorenz Meier 1ebb3b4ada Merged DSM fixes 2012-12-05 19:55:33 +01:00
px4dev fd771f67f2 Adjust the control mapping from DSM receivers to correspond to the standard PPM control mapping for channels 0-4. 2012-12-04 22:00:24 -08:00
px4dev 7c3b28d503 Lock out the PPM decoder if the DSM or S.bus decoders have seen a frame recently. 2012-12-04 09:52:16 -08:00
px4dev 1485a4ec1a Fix breakage to the DSM parser introduced with the input prioritisation logic. Back out to a "any input wins" strategy; connecting multiple receivers to I/O at the same time is currently not supported (read: strange things will happen). 2012-12-03 23:20:28 -08:00
Lorenz Meier 126e6ac207 Enabled manual override switch, work in progress. Added initial demix testing code to support delta mixing on the remote for convenient manual override 2012-12-01 16:30:21 +01:00
Lorenz Meier de88732e8e Prevented unhealthy RC input from propagating through the system 2012-12-01 10:49:52 +01:00
px4dev ea8872f545 Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder 2012-12-01 00:50:39 -08:00
px4dev efd3b9dea6 Clean up the FMU communications init. 2012-11-30 22:36:17 -08:00
px4dev 7d9d307ab0 We don't need non-blocking I/O for this context anymore; it's OK for it to block. 2012-11-30 22:15:40 -08:00
px4dev 8c4e9de70a Use the right constraint for the output mixer; we might end up wanting more virtual control channels. 2012-11-30 21:52:18 -08:00
px4dev 1e6e06595a Avoid processing S.bus channels that cannot be communicated to FMU 2012-11-30 21:51:36 -08:00
Lorenz Meier ef4a54666d Harmonized PPM, S.BUS and DSM input (order: first preference S.Bus, then DSM, then PPM, first available and valid source is chosen), tested with FMU, valid channel inputs 2012-11-30 14:57:54 +01:00
px4dev e0df7e6a76 save ~200 bytes of RAM by correctly positioning the S.bus decoder table in flash. 2012-11-30 01:46:14 -08:00
px4dev c961dd8bab Just for fun, add a (completely untested) S.bus decoder. 2012-11-30 01:34:33 -08:00