dc50d96b5d
Merge commit '0f2decb70f505b108999fcdb80e89d7aae6760ce' into nuttx-merge-0f2decb
2013-01-01 15:33:39 -08:00
c08135ffef
Merged rates setpoints
2012-12-23 21:15:01 +01:00
95b3828e41
Merge branch '#102-pwm-output-correctness'
2012-12-23 11:38:16 -08:00
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
a8451a2d18
Update apps/drivers/mpu6000/mpu6000.cpp
...
Don't call ::close on ORB publication handles.
2012-12-23 11:24:54 -08:00
a2aa9dd8fd
Made MPU-6000 gyro optional
2012-12-22 00:56:37 +01:00
0f2decb70f
Prep for release 6.24
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5447 42af7a65-404d-4744-a932-0658087f49c3
2012-12-20 20:22:21 +00:00
73763353d0
Merge branch 'master' into DSM-decoder-fix
2012-12-19 22:24:00 -08:00
272fc3b523
Some minor fixes for CONFIG_ADDRENV=y
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5444 42af7a65-404d-4744-a932-0658087f49c3
2012-12-19 21:16:03 +00:00
56a6504618
Incorporate address environment interfaces in binfmt/ logic
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5443 42af7a65-404d-4744-a932-0658087f49c3
2012-12-19 17:54:26 +00:00
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
8d716dea45
Teach 'fake' to set the arming state as well.
...
Whitespace.
2012-12-18 00:33:33 -08:00
b8044d9786
use <err.h> more consistently in the fmu driver.
2012-12-18 00:29:22 -08:00
6d0bea0298
Fix the PWM servo ioctl base so it's not overlapping the GPIOs
2012-12-18 00:27:12 -08:00
200ce6d7ff
configs/xtrs/nsh and pashello now use kconfig-frontends and build Windows native
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5422 42af7a65-404d-4744-a932-0658087f49c3
2012-12-09 17:34:53 +00: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
82cbac70ee
Fixed calibration check
2012-12-07 17:07:42 +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
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
451ecc1bf4
Remove a few cut-and-paste author attributions.
2012-12-02 17:53:31 -08:00
ad6c60c77c
Merge pull request #90 from PX4/#89-BlinkM-driver
...
BlinkM driver
2012-12-01 22:59:36 -08:00
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
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
c09ed414fd
Merge pull request #80 from PX4/#61-px4io-spektrum-decoder
...
#61 px4io spektrum decoder
2012-12-01 22:54:06 -08:00
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
269bd9f403
Force the fade speed to something sensible. Deal better with failed probes.
2012-12-01 19:36:02 -08:00
2a8ef50df4
A driver and shell command for the BlinkM I2C LED controller.
2012-12-01 19:29:36 -08:00
7f7356cdc9
standard keypad inteface and apps/examples/keypadtest from Denis Carikli
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5403 42af7a65-404d-4744-a932-0658087f49c3
2012-12-01 15:43:51 +00: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
2ac0cac11f
Build fix - need <termios.h>
2012-11-30 21:50:19 -08:00
6f572637de
Fixed missing heading for mtkcustom and nmea
2012-11-30 14:26:03 -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
31c5425e50
Merge remote-tracking branch 'origin/#61-px4io-spektrum-decoder' into sbus
2012-11-30 10:42:36 +01:00
d16d66f990
Enabled UART3, added JTAG make target for IO, removed potentially problematic usleep
2012-11-30 10:42:27 +01: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
c9230359ef
All ZNEO configurations converted to use the mconf/Kconfig tool
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 18:44:02 +00:00
9c8101d4f1
Add some more information to comments.
2012-11-29 10:18:21 -08:00
cdada458a1
z8 configurations will now build in Windows native environment
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5399 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 15:24:27 +00:00
724d3c4c0d
Patches for NSH disable background, and ARMv7M assembly from Freddie Chopin
...
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5398 42af7a65-404d-4744-a932-0658087f49c3
2012-11-29 13:58:53 +00:00
401c54bdd3
Merge branch '#78-px4io-firmware-updater' of github.com:PX4/Firmware into sbus
2012-11-29 09:54:23 +01:00
px4dev