dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
2,165 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

2165 Commits

Author SHA1 Message Date
Lorenz Meier 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
Lorenz Meier 61d7e1d285 Reverted changes to multirotor rate controller, changing to a discrete derivative does not help 2012-12-27 17:47:51 +01:00
Lorenz Meier a6f2c6022e Merge branch 'fixedwing_outdoor' of https://github.com/julianoes/Firmware into fixedwing_outdoor 2012-12-27 17:13:52 +01:00
Lorenz Meier b2068b4e0e WIP on mode switching input 2012-12-27 17:13:48 +01:00
Lorenz Meier c259a34a82 Allowed rc.txt files as well 2012-12-27 13:17:43 +01:00
Julian Oes 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
Lorenz Meier 9102b25bce Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-24 01:14:55 +01:00
Lorenz Meier c08135ffef Merged rates setpoints 2012-12-23 21:15:01 +01:00
Lorenz Meier 2f3f0aec46 Merge pull request #115 from PX4/ardrone_startup_update 
Updated PX4IOAR start script
 2012-12-23 11:42:24 -08: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 d5aa763118 Merge pull request #107 from PX4/gyros_parallel 
Made MPU-6000 gyro optional
 2012-12-23 11:25:15 -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 f2fb8c7960 Fix typo 2012-12-23 18:10:00 +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
Julian Oes 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
px4dev 73763353d0 Merge branch 'master' into DSM-decoder-fix 2012-12-19 22:24:00 -08:00
Julian Oes 06407b166f My PID integral part fixes 2012-12-19 17:54:18 -08:00
Julian Oes 28b3ecd9c6 I don't want a switch for failsafe for the copter 2012-12-19 17:06:01 -08:00
Lorenz Meier 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
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 f41e5728fc Correct demixing scaling for v-tail mixers 2012-12-18 13:18:36 +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
Lorenz Meier 97a94e3b89 Fixed MAV_TYPE parameter readout 2012-12-16 16:31:17 +01:00
Lorenz Meier df5c09ead1 Fixed MAVLink parameter initialization 2012-12-16 16:31:02 +01:00
Lorenz Meier b9606d0d6e Reverted arming state machine back to its original state, operational again 2012-12-16 16:30:41 +01:00
Lorenz Meier 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
Lorenz Meier 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
Lorenz Meier 42ffb4161d Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-15 21:24:47 +01:00
Lorenz Meier f40e4d13aa Merge pull request #101 from julianoes/hotfix_matlab_import_script 
Greatly sped up Matlab import script
 2012-12-15 01:38:51 -08:00
Julian Oes 4bc3f80043 Greatly sped up Matlab import script, a 17min flight now takes 2secs to import instead of more than the actual flight time 2012-12-15 00:01:59 -08:00
Lorenz Meier 1fc0a6546e Merged IO feature branch 2012-12-13 11:12:34 +01:00
Lorenz Meier 03076a72ca Added required additional fields: If system is ok to launch (required for LED indicator), if system is ok to override fully by RC (required for multirotors which should not support this), desired PWM output rate in Hz (again required for some multirotors). 2012-12-13 10:23:02 +01:00
Lorenz Meier 26faab64e5 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-09 19:19:59 +01:00
Lorenz Meier 0386a4205b Updated PX4IOAR start script 2012-12-09 19:18:42 +01:00
px4dev 154035279f Merge pull request #98 from sjwilks/px4io_safety_switch 
Added more LED state logic and improve code.
 2012-12-08 14:35:32 -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
px4dev 566012d5aa Merge pull request #97 from sjwilks/px4io_safety_switch 
Add new safety switch LED blink sequence when both FMU and IO are armed
 2012-12-07 18:53:16 -08: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
Lorenz Meier 1ebb3b4ada Merged DSM fixes 2012-12-05 19:55:33 +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