Lorenz Meier
f788d452ea
Merged
2013-01-06 11:47:30 +01:00
Lorenz Meier
359989a2eb
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc
2013-01-06 11:25:24 +01:00
Lorenz Meier
d3fd3d8219
Merged, compiling
2013-01-06 11:25:17 +01:00
px4dev
6ae9f03544
Merge commit '375d3c14d742248b434c080527886a95ea1d563f'
2013-01-06 02:01:53 -08:00
Lorenz Meier
1b2e886878
Removed unwanted cast
2013-01-06 10:24:00 +01:00
Lorenz Meier
f89cd312ec
Used correct datatype, removed unwanted cast
2013-01-06 10:16:50 +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
Simon Wilks
7842caf3b2
Moved the channel mappings and attributes to the config section
2013-01-06 04:21:04 +01:00
Lorenz Meier
ad7637861d
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing
2013-01-06 01:32:55 +01:00
Lorenz Meier
8eb8909a3c
Merge branch 'master' of github.com:PX4/Firmware into px4io-adc-integration-battery-msg
2013-01-06 00:50:51 +01:00
Simon Wilks
0a89ab7075
Send rc channel ordering and channel attributes from FMU to IO
2013-01-05 22:13:12 +01:00
Andrew Tridgell
318609bf59
fixed PWM_SERVO_GET
...
this was using the wrong channel
2013-01-06 06:31:37 +11:00
Andrew Tridgell
0134186420
fixup rate
2013-01-06 06:31:00 +11:00
Andrew Tridgell
219ab05a70
added PWM_SERVO_SET_UPDATE_RATE ioctl
...
this allows apps to set the PWM update rate. APM needs this to honor
the user configurable PWM rate setting for copters.
2013-01-06 06:29:28 +11: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
803352e722
Fixed stupid copy/paste typo
2013-01-01 13:39:00 +01:00
Lorenz Meier
4eb7df6ff5
Introduced battery_status uORB topic, changed sensors app to publish to it, extended px4io driver to publish to it. Both do only so if the battery voltage is reasonably high, at 3.3V
2013-01-01 13:30:24 +01:00
px4dev
bd2f6b58e6
Configure ADC GPIOs on IO
2012-12-31 19:40:41 -08:00
px4dev
b167912b1b
Enable the temperature sensor channel for F2/F4 devices.
2012-12-31 18:31:37 -08:00
px4dev
bc432b1feb
Cleanup and add support for multiple channels.
2012-12-31 17:06:30 -08: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
px4dev
22f5a1dc94
First cut at a simple® ADC driver built on our driver framework.
2012-12-31 01:30:57 -08: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
Lorenz Meier
142556b442
merged
2012-12-30 10:03:05 +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
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
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
9102b25bce
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor
2012-12-24 01:14:55 +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
720a1140b2
Merged NuttX
2012-12-23 20:23:30 +01:00
Lorenz Meier
6d34211630
Merge branch 'gyros_parallel' into fixedwing_outdoor
2012-12-22 00:57:50 +01:00
Lorenz Meier
a2aa9dd8fd
Made MPU-6000 gyro optional
2012-12-22 00:56:37 +01:00
Lorenz Meier
4cf2266b79
Robustified actuator output topic, added number of mixed outputs
2012-12-22 00:47:52 +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
Lorenz Meier
4676b71d8a
Cleanup in ADC driver, re-add all inputs that are present
2012-12-19 14:19:11 +01:00
Lorenz Meier
bc3b66043f
Cleaned up HIL on FMU / IO combo
2012-12-19 11:34:51 +01:00
Lorenz Meier
4c2862f6c0
Merged PWM fixes
2012-12-18 12:32:19 +01: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
