aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed mixer transmission between FMU and IOLorenz Meier2013-02-122-1/+3
* Fixes to RC config transmission from Simon WilksLorenz Meier2013-02-121-1/+4
* Merge branch 'px4io-i2c' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-123-4/+4
|\
| * Fix assignment of relay GPIOs.px4dev2013-02-111-2/+2
| * Fix a misleading comment.px4dev2013-02-091-1/+1
| * Fix a sign errorpx4dev2013-02-091-1/+1
* | Merge branch 'px4io-i2c' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-072-4/+14
|\|
| * Fixed altitude jump issue, hunted down and fix by Andrew Tridgell.Lorenz Meier2013-02-051-2/+7
| * Fixed arm ok flag typoLorenz Meier2013-02-051-2/+7
* | Merge branch 'master' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-0313-12/+1841
|\ \ | |/ |/|
| * Merge pull request #194 from NosDE/masterpx4dev2013-02-021-7/+39
| |\
| | * Option for Bus and BlinkM address addedMarco Bauer2013-02-021-2/+2
| | * Options for bus and blinkmaddress added.Marco Bauer2013-02-011-7/+39
| * | HOTFIX: Fixed HoTT compile error, fixed MAVLink crashLorenz Meier2013-01-312-5/+6
| * | Add back some (currently unused) files lost in an earlier NuttX mergepx4dev2013-01-3010-0/+1796
* | | Merge branch 'master' into px4io-i2cpx4dev2013-01-2816-0/+815
|\| |
| * | Merge pull request #120 from PX4/statemachine_docsLorenz Meier2013-01-277-0/+1
| |\ \
| | * | Updated state machine docs after first review roundLorenz Meier2013-01-272-0/+0
| | * | Another diagram updateLorenz Meier2013-01-262-0/+0
| | * | Updated RC mode switching docs, merged with JulianLorenz Meier2013-01-262-0/+0
| | * | Merge branch 'master' of github.com:PX4/Firmware into statemachine_docsLorenz Meier2013-01-26284-2472/+19293
| | |\ \
| | * | | RC mode switching idea using 1 3pos and 2 2pos switchesJulian Oes2013-01-222-0/+0
| | * | | Updated docsLorenz Meier2013-01-214-0/+0
| | * | | Major push in state machine cleanupLorenz Meier2013-01-206-0/+0
| | * | | MergedLorenz Meier2013-01-201071-8272/+183680
| | |\ \ \
| | * | | | Added rc mode docsLorenz Meier2012-12-313-0/+1
| * | | | | Merge pull request #67 from sjwilks/hottLorenz Meier2013-01-279-0/+814
| |\ \ \ \ \
| | * | | | | Move the config param to a more sane location (I hope).Simon Wilks2013-01-251-3/+6
| | * | | | | Enable single wire via ioctl calls and pull the battery voltage from the batt...Simon Wilks2013-01-253-37/+12
| | * | | | | Merge branch 'ioctl' into hottSimon Wilks2013-01-245-1/+245
| | |\ \ \ \ \
| | | * \ \ \ \ Merged and tested against the single wire implementation added to Nuttx r5554.Simon Wilks2013-01-24282-2487/+19281
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | MergedSimon Wilks2013-01-22627-5540/+28894
| | | |\ \ \ \ \
| | | * | | | | | We aren't using RS485 but single wire.Simon Wilks2013-01-213-6/+12
| | | * | | | | | MergedSimon Wilks2013-01-11488-3737/+155739
| | | |\ \ \ \ \ \
| | | * | | | | | | Push single wire operations into stm32_serial.c and added a test to verify Ho...Simon Wilks2012-12-065-0/+263
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into hottSimon Wilks2013-01-241298-11815/+213466
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Addressed compiler warnings and handle non-supported devices properly.Simon Wilks2012-11-301-8/+8
| | * | | | | | | | Code formatting cleanup.Simon Wilks2012-11-303-42/+58
| | * | | | | | | | Cleanup a bit.Simon Wilks2012-11-291-8/+3
| | * | | | | | | | Single wire now working once moving away from UART5.Simon Wilks2012-11-291-24/+41
| | * | | | | | | | Trying to get single wire working. Not quite there yet.Simon Wilks2012-11-292-59/+34
| | * | | | | | | | Fix some memory corruption bugs.Simon Wilks2012-11-223-11/+14
| | * | | | | | | | Messaging cleanup.Simon Wilks2012-11-221-4/+3
| | * | | | | | | | Tried cleaning up console messaging a bit.Simon Wilks2012-11-221-31/+37
| | * | | | | | | | Shorten the post read delay slightly.Simon Wilks2012-11-221-2/+5
| | * | | | | | | | Make the reading and sending of data independant of the message type.Simon Wilks2012-11-223-31/+40
| | * | | | | | | | General code cleanup.Simon Wilks2012-11-212-91/+111
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into hottSimon Wilks2012-11-2126-286/+539
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Added a note on the inclusion of libraries for UART access in the Makefile.Simon Wilks2012-11-211-0/+1
| | * | | | | | | | | Introducing an initial implementation of HoTT telemetry support.Simon Wilks2012-11-214-19/+384