be85589e48
Fixed some typos
2012-12-28 20:19:47 +01:00
9e2076b4e4
Cleared last differences, ready for testing
2012-12-28 15:10:25 +01:00
913f5a7812
Cleared last diff items between origin/master and fixedwing_outdoor
2012-12-28 15:06:19 +01:00
a1e1e7bf42
Cleaning up calibration requests
2012-12-28 13:18:52 +01:00
d96add5b61
Even more cleanup, diff now clean
2012-12-28 13:16:34 +01:00
e01c0e1de6
Reverting more nuttx merge
2012-12-28 13:13:30 +01:00
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
cc582b2b44
Only send actuator HIL commands if armed
2012-12-28 13:10:58 +01:00
8b8330a015
Reverted nuttx merge, back to master
2012-12-28 13:10:06 +01:00
45a4bcb6ef
Merged relay activation
2012-12-27 19:06:09 +01:00
7526dd46a2
Added header for common priority bands
2012-12-27 19:01:00 +01:00
e2196bca4f
Added position lock check
2012-12-27 18:36:37 +01:00
f5bad08bd0
Cleaned up control mode state machine / flight mode / navigation state machine still needs a bit cleaning up
2012-12-27 18:27:08 +01:00
61d7e1d285
Reverted changes to multirotor rate controller, changing to a discrete derivative does not help
2012-12-27 17:47:51 +01:00
a6f2c6022e
Merge branch 'fixedwing_outdoor' of https://github.com/julianoes/Firmware into fixedwing_outdoor
2012-12-27 17:13:52 +01:00
b2068b4e0e
WIP on mode switching input
2012-12-27 17:13:48 +01:00
c259a34a82
Allowed rc.txt files as well
2012-12-27 13:17:43 +01:00
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
9102b25bce
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor
2012-12-24 01:14:55 +01:00
c08135ffef
Merged rates setpoints
2012-12-23 21:15:01 +01:00
2f3f0aec46
Merge pull request #115 from PX4/ardrone_startup_update
...
Updated PX4IOAR start script
2012-12-23 11:42:24 -08: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
d5aa763118
Merge pull request #107 from PX4/gyros_parallel
...
Made MPU-6000 gyro optional
2012-12-23 11:25:15 -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
720a1140b2
Merged NuttX
2012-12-23 20:23:30 +01:00
f2fb8c7960
Fix typo
2012-12-23 18:10:00 +01:00
6d34211630
Merge branch 'gyros_parallel' into fixedwing_outdoor
2012-12-22 00:57:50 +01:00
a2aa9dd8fd
Made MPU-6000 gyro optional
2012-12-22 00:56:37 +01:00
4cf2266b79
Robustified actuator output topic, added number of mixed outputs
2012-12-22 00:47:52 +01:00
5b92c51777
Initial implementation of application access to the PX4IO relays.
2012-12-20 21:31:02 -08:00
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
73763353d0
Merge branch 'master' into DSM-decoder-fix
2012-12-19 22:24:00 -08:00
06407b166f
My PID integral part fixes
2012-12-19 17:54:18 -08:00
28b3ecd9c6
I don't want a switch for failsafe for the copter
2012-12-19 17:06:01 -08:00
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
4676b71d8a
Cleanup in ADC driver, re-add all inputs that are present
2012-12-19 14:19:11 +01:00
bc3b66043f
Cleaned up HIL on FMU / IO combo
2012-12-19 11:34:51 +01:00
f41e5728fc
Correct demixing scaling for v-tail mixers
2012-12-18 13:18:36 +01:00
4c2862f6c0
Merged PWM fixes
2012-12-18 12:32:19 +01: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
97a94e3b89
Fixed MAV_TYPE parameter readout
2012-12-16 16:31:17 +01:00
df5c09ead1
Fixed MAVLink parameter initialization
2012-12-16 16:31:02 +01:00
b9606d0d6e
Reverted arming state machine back to its original state, operational again
2012-12-16 16:30:41 +01:00
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
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
42ffb4161d
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor
2012-12-15 21:24:47 +01:00
Lorenz Meier
Julian Oes
px4dev