aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Checkpoint: navigation state machine as discussed with LorenzJulian Oes2013-02-217-152/+373
* Checkpoint: New hierarchical statesJulian Oes2013-02-205-471/+367
* Checkpoint: Added HIL state, arming/disarming works now, also from GQCJulian Oes2013-02-193-321/+382
* Checkpoint: Arming/Disarming worksJulian Oes2013-02-183-7/+22
* Merge branch 'px4io-i2c' into new_state_machineJulian Oes2013-02-1833-1214/+3098
|\
| * Merged, removed unneeded lineAndrew Tridgell2013-02-173-9/+48
| * Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c-nuttxLorenz Meier2013-02-170-0/+0
| |\
| * \ Merge branch 'px4io-i2c' into px4io-i2c-nuttxLorenz Meier2013-02-178-95/+167
| |\ \
| | * \ Merged masterLorenz Meier2013-02-174-79/+129
| | |\ \
| | * | | Finished and tested in-air restore of arming state, as long as both boards re...Lorenz Meier2013-02-174-16/+38
| * | | | Merge branch 'px4io-i2c' into px4io-i2c-nuttxLorenz Meier2013-02-171-3/+9
| |\| | |
| | * | | Fixed excessive debug buffer sizeLorenz Meier2013-02-171-3/+9
| * | | | Merge branch 'px4io-i2c' of github.com:PX4/Firmware into px4io-i2c-nuttxLorenz Meier2013-02-175-41/+207
| |\| | |
| | * | | Allow to in-air restore the FMU and IO arming state if only one of the two failsLorenz Meier2013-02-175-41/+207
| * | | | Re-enabled signalsLorenz Meier2013-02-171-1/+1
| * | | | MergedLorenz Meier2013-02-17165-2616/+6129
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Disable signals again, it is too early (needs NuttX merge)Lorenz Meier2013-02-171-1/+1
| * | | | Merge branch 'master' into px4io-i2cLorenz Meier2013-02-1736-6718/+0
| |\ \ \ \
| * | | | | Merged debuglevel command from TridgeAndrew Tridgell2013-02-175-1/+37
| * | | | | More outputAndrew Tridgell2013-02-171-1/+3
| * | | | | Made timeouts configurable, untestedLorenz Meier2013-02-162-2/+3
| * | | | | px4io: enable signalsAndrew Tridgell2013-02-161-1/+1
| * | | | | Merge branch 'master' into px4io-i2cLorenz Meier2013-02-161-4/+3
| |\ \ \ \ \
| * | | | | | Slightly adjusted battery voltage measurement after calibration against B&K P...Lorenz Meier2013-02-161-1/+1
| * | | | | | Merge branch 'master' into px4io-i2cLorenz Meier2013-02-161-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-1658-759/+3244
| |\ \ \ \ \ \ \
| * | | | | | | | Merged debug level commits from TridgeAndrew Tridgell2013-02-143-12/+65
| * | | | | | | | px4io: added isr_debug()Andrew Tridgell2013-02-141-1/+61
| * | | | | | | | MergedLorenz Meier2013-02-130-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reworked manual override flag, reworked arming slightly. Pending testingLorenz Meier2013-02-133-7/+6
| * | | | | | | | | Reworked manual override flag, reworked arming slightly. Pending testingLorenz Meier2013-02-134-21/+12
| |/ / / / / / / /
| * | | | | | | | Ensured that the mixer output obeys the FMU and IO armed stateLorenz Meier2013-02-121-2/+3
| * | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-121-26/+137
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:PX4/Firmware into px4io-i2cLorenz Meier2013-02-125-65/+160
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed scaling of RC calibration in IO driver, fixed interpretation of (odd, b...Lorenz Meier2013-02-121-6/+24
| * | | | | | | | | | 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 branch 'master' into px4io-i2cpx4dev2013-01-2816-0/+815
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into px4io-i2cpx4dev2013-01-268-49/+178
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Now that we're mostly done with I2C, the old serial interface can be cleaned ...px4dev2013-01-261-329/+0
| * | | | | | | | | | | | | It looks like retrying reads from the ms5611 is not safe either.px4dev2013-01-261-8/+1
| * | | | | | | | | | | | | Disarm IO at driver startup time.px4dev2013-01-261-0/+12