Lorenz Meier
329ac2f4ba
Merged master
2013-01-06 10:50:41 +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
px4dev
69cdab9afc
Fix a typo that caused PWM_SERVO_GET ioctls to fail on the FMU PWM outputs.
2013-01-04 23:41:21 -08:00
Lorenz Meier
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
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
668d1b3301
Removed text reuse, causing crash with stack trace
2012-12-30 13:58:30 +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
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
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
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
c08135ffef
Merged rates setpoints
2012-12-23 21:15:01 +01:00
px4dev
95b3828e41
Merge branch '#102-pwm-output-correctness'
2012-12-23 11:38:16 -08:00
px4dev
6b3f36020c
Merge pull request #94 from PX4/DSM-decoder-fix
...
Untangle the DSM decoder from the input source priority logic, clean up input handling some more.
2012-12-23 11:31:31 -08:00
px4dev
a8451a2d18
Update apps/drivers/mpu6000/mpu6000.cpp
...
Don't call ::close on ORB publication handles.
2012-12-23 11:24:54 -08:00
Lorenz Meier
a2aa9dd8fd
Made MPU-6000 gyro optional
2012-12-22 00:56:37 +01:00
px4dev
5b92c51777
Initial implementation of application access to the PX4IO relays.
2012-12-20 21:31:02 -08:00
px4dev
73763353d0
Merge branch 'master' into DSM-decoder-fix
2012-12-19 22:24:00 -08:00
px4dev
76895af6eb
Fix several aspects of the PWM output driver; enable auto-reload, use named constants for various control bits, and use a more polite mechanism at disarm time to avoid runt pulses.
...
This may address an issue we've seen where we get occasional malformed PWM output pulses, possibly due to a race between compare updates and the timer.
2012-12-18 00:35:28 -08:00
px4dev
8d716dea45
Teach 'fake' to set the arming state as well.
...
Whitespace.
2012-12-18 00:33:33 -08:00
px4dev
b8044d9786
use <err.h> more consistently in the fmu driver.
2012-12-18 00:29:22 -08:00
px4dev
6d0bea0298
Fix the PWM servo ioctl base so it's not overlapping the GPIOs
2012-12-18 00:27:12 -08: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
82cbac70ee
Fixed calibration check
2012-12-07 17:07:42 +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
px4dev
6e328b4d7a
Add a 'monitor' verb to the px4io command so we can watch inputs to IO (it could get smarter).
2012-12-03 23:19:12 -08:00
px4dev
451ecc1bf4
Remove a few cut-and-paste author attributions.
2012-12-02 17:53:31 -08:00
px4dev
ad6c60c77c
Merge pull request #90 from PX4/#89-BlinkM-driver
...
BlinkM driver
2012-12-01 22:59:36 -08:00
px4dev
b02c69243d
Merge pull request #75 from PX4/delay_test
...
Added delay test to measure comm delays with a led / scope
2012-12-01 22:55:55 -08:00
px4dev
55e2e18885
Merge pull request #73 from PX4/io_arming
...
Made sure IO and FMU obey the lockdown flag when arming motors
2012-12-01 22:55:33 -08:00
px4dev
c09ed414fd
Merge pull request #80 from PX4/#61-px4io-spektrum-decoder
...
#61 px4io spektrum decoder
2012-12-01 22:54:06 -08:00
px4dev
d92827c54c
Merge pull request #76 from PX4/topics_cleanup
...
Cleaned up different uorb topics, cleaned up excessive stack sizes
2012-12-01 22:53:15 -08:00
px4dev
269bd9f403
Force the fade speed to something sensible. Deal better with failed probes.
2012-12-01 19:36:02 -08:00
px4dev
2a8ef50df4
A driver and shell command for the BlinkM I2C LED controller.
2012-12-01 19:29:36 -08: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