Commit Graph

74 Commits

Author SHA1 Message Date
Lorenz Meier 0bbc4b7012 Build fixes 2013-08-15 08:42:08 +02:00
Lorenz Meier aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
Lorenz Meier e14d034528 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-08-14 14:58:02 +02:00
Lorenz Meier 828626ee01 Merge pull request #347 from jgoppert/md25_dev
Segway Controller
2013-08-11 14:23:25 -07:00
Lorenz Meier 7c3ee6714c Enabled mathlib 2013-08-04 19:14:25 +02:00
Lorenz Meier c84cdf2ff6 Enabled filter in makefile 2013-08-04 16:03:50 +02:00
James Goppert 8f1487b157 Merge branch 'master' of github.com:jgoppert/Firmware into md25_dev 2013-08-03 12:18:41 -04:00
px4dev 9d6ec6b365 Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.
Rename some directories that got left behind in the great board renaming.
2013-08-02 22:34:55 -07:00
Lorenz Meier d14891554e Merge branch 'config' of github.com:PX4/Firmware 2013-07-30 11:03:45 +02:00
Lorenz Meier 57db5d912b Merge pull request #343 from PX4/meas_split
ETS airspeed and MEAS airspeed combined driver
2013-07-28 06:41:42 -07:00
Lorenz Meier f4fc3bbd57 Added RAMTRON device, updated diagrams 2013-07-28 14:10:37 +02:00
James Goppert 1980d9dd63 Working on segway controller, restructure of fixedwing. 2013-07-28 01:35:43 -04:00
Lorenz Meier 95dde5f1be Implemented config command, fixed a number range set / get issues for some sensor drivers, fixed gyro calibration 2013-07-26 18:24:37 +02:00
Anton Babushkin c6d184e29d Merge branch 'master' into seatbelt_multirotor 2013-07-17 19:16:49 +04:00
Lorenz Meier bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Lorenz Meier 319eb18ab5 Merged 2013-07-14 11:32:04 +02:00
Lorenz Meier 290ca1f9bf Reworked airspeed driver to keep most of it abstract 2013-07-10 21:45:59 +02:00
Simon Wilks a18c6cea18 Merge remote-tracking branch 'upstream/master' into hott-esc 2013-07-09 08:04:07 +02:00
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
Anton Babushkin 320a5b7579 Merge branch 'master' into seatbelt_multirotor 2013-07-08 12:18:32 +04:00
Lorenz Meier 92e0687022 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-17 08:44:07 +02:00
Lorenz Meier 6015809d89 Merged 2013-06-06 17:37:41 +02:00
Lorenz Meier 198df9c82e All apps compiling and linked (listed in NSH help), but not executing yet 2013-06-01 15:14:53 +02:00
Lorenz Meier 5375bb5b86 Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now 2013-06-01 01:04:32 +02:00