Lorenz Meier
5111249eb8
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1
2013-09-07 11:12:56 +02:00
tstellanova
23a355644b
grab the git hash and inject it into every log file header
2013-09-06 10:18:08 -07:00
Lorenz Meier
d74bea57ac
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1
2013-09-05 22:18:00 +02:00
Simon Wilks
fddaa49ed8
Make sure the unit tests aren't included as part of the standard firmware
2013-09-01 22:44:58 +02:00
Lorenz Meier
0104f070c6
Merge branch 'multirotor' into fixedwing_l1
2013-08-27 16:11:41 +02:00
Lorenz Meier
2537977101
Merge pull request #15 from sjwilks/multirotor_unittests
...
Add a simple unit testing framework and tests for the commander state machine.
2013-08-25 14:27:38 -07:00
Simon Wilks
e25f2ff44f
Whitespace and formatting cleanup.
2013-08-25 22:54:31 +02:00
Simon Wilks
548f322493
Added a simple unit test framework and initial testing some of the commander state machines.
2013-08-25 22:43:01 +02:00
Lorenz Meier
a897b3d88e
Added complete attitude control framework
2013-08-23 16:28:53 +02:00
Lorenz Meier
686d150800
Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into multirotor
...
ge aborts
2013-08-23 09:28:43 +02:00
px4dev
f70a4b3b70
Add support for adding extra files to the ROMFS from the config.
...
If there is an IO firmware image already built when we build the corresponding FMU ROMFS, copy it into the ROMFS. Note - due to there being no fixed build ordering, to be certain that you have the most current IO firmware, you must build the IO firmware explicitly first.
2013-08-22 23:47:55 -07:00
Lorenz Meier
3005c8aae0
Added missing config files, compiling
2013-08-21 18:37:22 +02:00
Lorenz Meier
fab110d21f
Moved math library to library dir, improved sensor-level HIL, cleaned up geo / conversion libs
2013-08-21 18:13:01 +02:00
Lorenz Meier
309ea81460
Merged fmuv2_bringup
2013-08-21 15:19:19 +02:00
Andrew Tridgell
2bcf4385f6
build: use unqualified com port names on windows
...
the qualified names were not working with current versions of python
2013-08-21 15:00:19 +02:00
Lorenz Meier
c57b345e70
merged
2013-08-19 09:44:42 +02:00
Lorenz Meier
3465ee7f90
Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup_new_state_machine_drton
2013-08-19 09:42:22 +02:00
Lorenz Meier
80f38e3dea
Put console and syslog on UART8, added support to nshterm for proper serial port config
2013-08-18 21:00:47 +02:00
Lorenz Meier
b71c0c1f49
Added support for FMUv1 for RGB led and dim led support
2013-08-17 15:46:13 +02:00
Anton Babushkin
f78666e0c8
Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new
...
WIP, TODO fixedwing
2013-08-16 13:23:33 +02:00
Julian Oes
56575eb068
Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
...
Conflicts:
src/drivers/blinkm/blinkm.cpp
src/drivers/px4io/px4io.cpp
src/modules/commander/state_machine_helper.c
src/modules/px4iofirmware/protocol.h
src/modules/px4iofirmware/registers.c
src/modules/systemlib/systemlib.h
src/systemcmds/reboot/reboot.c
2013-08-15 14:04:46 +02:00
Lorenz Meier
0bbc4b7012
Build fixes
2013-08-15 08:42:08 +02:00
px4dev
33863165b2
Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) into fmuv2_bringup
2013-08-14 21:23:00 -07: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
px4dev
56d355414c
Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in the toolchain configuration.
2013-08-13 00:34:11 -07:00
px4dev
5e2d676173
Remove our depdenency on CONFIG_ARCH_BOARD_* coming from <nuttx/config.h>
2013-08-12 21:57:11 -07:00
Lorenz Meier
828626ee01
Merge pull request #347 from jgoppert/md25_dev
...
Segway Controller
2013-08-11 14:23:25 -07:00
Lorenz Meier
66d294b5bf
Fixed to FMUv2 autostart and config
2013-08-11 17:39:10 +02:00
px4dev
b911d37975
Merge a path definition from the mainline.
2013-08-04 19:37:08 -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
px4dev
ce2fa29fe3
Add a missing module -> module makefile dependency
2013-08-03 10:06:34 -07:00
px4dev
c14a71c095
Move NuttX configurations out of the NuttX tree proper. This reduces the diffs we have to carry against the NuttX upstream repo to just our local patches to the NuttX code itself.
2013-08-03 10:06:10 -07: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
1543c99003
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
2013-07-30 11:28:30 +02:00
Lorenz Meier
d14891554e
Merge branch 'config' of github.com:PX4/Firmware
2013-07-30 11:03:45 +02:00
Lorenz Meier
1410625dea
Enabled additional drivers on v2, kill misplaced code in mkblctrl
2013-07-28 16:12:40 +02:00
Lorenz Meier
453687a006
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
2013-07-28 15:42:47 +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
1984e609b6
Merged in RAMTRON update
2013-07-28 14:57:19 +02:00
Lorenz Meier
4e5eb9740b
Fixed led and reboot linker challenges in C++ environments
2013-07-28 14:50:27 +02: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
Julian Oes
da152e148d
Added iirFilter to LSM303D
2013-07-18 16:15:43 +02:00
Lorenz Meier
17445b0fbb
Added led support to FMUv2
2013-07-17 22:54:05 +02:00
Anton Babushkin
c6d184e29d
Merge branch 'master' into seatbelt_multirotor
2013-07-17 19:16:49 +04:00
Lorenz Meier
2f76c81147
More compile fixes
2013-07-16 09:08:05 +02:00