34d078b556
Merged latest master
2013-01-06 11:32:08 +01:00
329ac2f4ba
Merged master
2013-01-06 10:50:41 +01:00
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
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
d93fda20fd
Add ADC measurements and reporting to PX4IO, including calibration for the battery input.
2012-12-31 21:06:26 -08:00
9be1f99935
Add trivial ADC support to PX4IO.
2012-12-31 19:41:18 -08:00
0cc723dbc3
Fixed connection loss / failsafe detection, added decoding of two switch channels if IO supports 18 RC channels. Loss is tested, switch channels are not.
2012-12-31 09:21:44 +01:00
f2d4eb2887
Revert "Removed text reuse, causing crash with stack trace"
...
This reverts commit 668d1b3301
2012-12-30 15:08:25 -08:00
668d1b3301
Removed text reuse, causing crash with stack trace
2012-12-30 13:58:30 +01:00
fd016abd46
Implement the remaining pieces of mixer upload to PX4IO.
2012-12-30 01:17:19 -08:00
c740e9c616
Add a receive error counter for debugging purposes.
2012-12-30 01:16:54 -08:00
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
d81edb09cf
whitespace/formatting
2012-12-29 16:01:24 -08:00
0ae5997bd0
Fix some scaling errors in the PWM <-> mixer-internal conversions.
2012-12-29 13:28:32 -08:00
6b9d5dac4d
Rough in the new mixer path for PX4IO.
2012-12-29 12:58:41 -08:00
d5da457e29
Fix PX4IO to run C++ static ctors
2012-12-29 12:57:29 -08:00
5b92c51777
Initial implementation of application access to the PX4IO relays.
2012-12-20 21:31:02 -08:00
73763353d0
Merge branch 'master' into DSM-decoder-fix
2012-12-19 22:24:00 -08:00
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
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
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
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
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
de88732e8e
Prevented unhealthy RC input from propagating through the system
2012-12-01 10:49:52 +01:00
ea8872f545
Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder
2012-12-01 00:50:39 -08:00
efd3b9dea6
Clean up the FMU communications init.
2012-11-30 22:36:17 -08:00
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
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
1e6e06595a
Avoid processing S.bus channels that cannot be communicated to FMU
2012-11-30 21:51:36 -08:00
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
e0df7e6a76
save ~200 bytes of RAM by correctly positioning the S.bus decoder table in flash.
2012-11-30 01:46:14 -08:00
c961dd8bab
Just for fun, add a (completely untested) S.bus decoder.
2012-11-30 01:34:33 -08:00
9fa794a8fa
Rework the PX4IO software architecture:
...
- Use a separate thread for handing R/C inputs and outputs.
- Remove all PX4IO R/C receiver configuration; it's all automatic now.
- Rework the main loop, dedicate it to PX4FMU communications after startup.
- Fix several issues in the px4io driver that would cause a crash if PX4IO was not responding.
2012-11-30 00:02:47 -08:00
9c8101d4f1
Add some more information to comments.
2012-11-29 10:18:21 -08:00
d0efd1a419
Fix the DSM (spektrum) protocol decoder, and add some format auto-detection to it.
2012-11-29 00:35:21 -08:00
3321ca0888
Don't print the status line so much; we seem to drop a lot of receive characters this way.
2012-11-29 00:34:44 -08:00
03a82e0a03
Fix includes for debug output.
2012-11-29 00:33:44 -08:00
e9acc18df4
Lowered arm button prelling
2012-11-15 11:57:55 -08:00
a8dfcaace2
Several fixes, hex flies, failsafe not really tested yet
2012-11-11 11:55:27 -08:00
52143d6a68
Reverting commenting, that happened by accident
2012-11-08 09:26:37 -08:00
2b5f551838
Revert "Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs.""
...
This reverts commit 38b20f2a1a
2012-11-07 14:56:03 -08:00
38b20f2a1a
Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs."
...
This reverts commit ff3a014971
2012-11-07 14:46:28 -08:00
9f92c6df67
Merge branch 'master' of https://github.com/PX4/Firmware
2012-11-07 10:24:49 -08:00
ff3a014971
Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs.
2012-11-07 02:47:01 -08:00
74f7600602
Again some hacking to make arming/disarming work for now
2012-11-06 19:03:08 -08:00
39659e57f8
Add prototypical support for Spektrum satellite remotes to PX4IO.
2012-11-05 00:55:45 -08:00
87fd9fcc06
Fix red/blue LED assignment.
2012-11-05 00:55:45 -08:00
7fbad5adea
Fix PWM channel zero output; pin configuration was being overwritten by USART2 setup.
2012-11-04 16:44:36 -08:00
487597b385
Checkpoint; messages from FMU now make it to IO intact; fix HRT init timing, process more bytes from the serial port, add some simple packet counting.
2012-11-03 01:14:25 -07:00
ccc7b13185
There are four relay channels (two are power switches)
2012-11-03 01:14:25 -07:00
Lorenz Meier