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

235 Commits

Author SHA1 Message Date
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
Lorenz Meier bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
px4dev dca9019f75 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 2013-07-14 13:04:44 -07:00
Lorenz Meier 319eb18ab5 Merged 2013-07-14 11:32:04 +02:00
px4dev 95f59f521d Add builtin command dependency on module makefiles, since they can also create / remove commands 2013-07-11 23:23:58 -07: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
px4dev b4029dd824 Pull v2 pieces up to build with the merge 2013-07-07 17:53:55 -07:00
px4dev 43f1843cc7 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 2013-07-07 12:22:56 -07:00
px4dev 9fe257c4d1 A very slender config just for test builds. 2013-07-07 12:13:40 -07:00
Simon Wilks 6d2f14e125 Refactoring of the hott telemetry driver and added functionality to read from a HoTT sensor. 2013-07-04 08:33:19 +02:00
Lorenz Meier 3eb115c821 Merge pull request #7 from skelly/l3gd20h_support 
Enabled MS5611, nsh on USB by default.
 2013-07-02 11:06:53 -07:00
px4dev 90c458cb61 Checkpoint: interface abstraction for px4io driver 2013-06-25 23:08:34 -07:00
Sam Kelly b1f3a5c92b Enabled MS5611 by default on FMUv2. 2013-06-25 14:01:27 -07:00
Julian Oes 9b6c9358ed First try for an ESC calibration tool 2013-06-20 01:13:49 +02:00
Lorenz Meier 92e0687022 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-17 08:44:07 +02:00
Anton Babushkin 4c6cf3037d Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor 2013-06-15 11:49:14 +04:00
samuezih b789e01a0f Add PX4Flow board modules and corresponding ORB msgs. 2013-06-14 17:31:46 +02:00
Lorenz Meier f28cec350c Hotfix: Excluded sdlog app from standard build, still keeping code in place for now 2013-06-13 12:44:11 +02:00
Lorenz Meier 9444def5f8 Merge branch 'master' into fmuv2_bringup 2013-06-10 15:01:44 +02:00
Anton Babushkin afb34950a3 Merge branch 'master' into seatbelt_multirotor 2013-06-10 16:21:10 +04:00
Lorenz Meier 048967fb6f merged 2013-06-07 21:33:49 +02:00
Lorenz Meier 5a9e52a287 Merge branch 'master' of github.com:PX4/Firmware 2013-06-07 21:16:40 +02:00
Lorenz Meier 66879e6ff6 Hotfix: Make maxoptimization configurable from the shell via MAXOPTIMIZATION=-O0 V=1 make archives 2013-06-07 21:16:31 +02:00
Lorenz Meier ebc12eebd0 Merged 2013-06-07 13:04:49 +02:00
px4dev 4302f76402 Hotfix: fix building firmware parallel 2013-06-06 22:49:49 -07:00
Lorenz Meier 34b6a91860 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-06 19:22:34 +02:00
Lorenz Meier 2aa16dc447 Hotfix: Disable instrumentation on IO 2013-06-06 19:12:10 +02:00
Lorenz Meier 6015809d89 Merged 2013-06-06 17:37:41 +02:00
Lorenz Meier 382c9a69e4 Removed big RAM consumer (inactive filter) 2013-06-06 17:13:10 +02:00
Lorenz Meier 106f4910be Merge pull request #284 from limhyon/master 
Nonlinear complementary SO(3) filter has been implemented.
 2013-06-06 04:39:39 -07:00
px4dev 971e810301 Adjust upload target name for v1.x FMU 2013-06-02 00:11:56 +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
Anton Babushkin b344f23daf Merge branch 'master' into sdlog2 2013-06-01 13:34:49 +04:00
Lorenz Meier 5375bb5b86 Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now 2013-06-01 01:04:32 +02:00
Anton Babushkin 234b9c8f67 Merge branch 'master' into seatbelt_multirotor 2013-05-28 19:04:29 +04:00
Hyon Lim (Retina) 13faf0d555 Merge remote-tracking branch 'upstream/master' 
- Mikrokopter BLCTRL seems to be updated
 - HMC5883L calibration problem has been corrected.
    (This is because of RAM mis allocation?)
    See https://groups.google.com/forum/?fromgroups#!topic/px4users/yTYJiDBBKfo
 - Fixed wing control updated
    https://groups.google.com/forum/?fromgroups#!topic/px4users/s7owpvZN8UI
 - GPIO module has been removed.
 - STM32 DRV updated
 2013-05-28 11:09:58 +10:00
px4dev eab01a2efd Hotfix: Generate map files for modules as well for more in-depth memory-use debugging. 2013-05-26 20:51:20 +02:00
Lorenz Meier fba92f357c Merge pull request #267 from DrTon/gpio_led 
gpio_led app added: drive LEDs by GPIO_EXT1 pin of PX4FMU
 2013-05-26 09:00:41 -07:00
Anton Babushkin e211352604 sdlog2 logger app added. New flexible log format, compatible with APM. 2013-05-25 22:16:43 +04:00
Anton Babushkin f8900f002c Merge branch 'master' into seatbelt_multirotor 2013-05-24 12:52:02 +04:00
px4dev f30695e1df Hotfix: fix section attribute for the ROMFS, moving it back into .rodata where it belongs. 2013-05-23 23:58:59 +02:00
px4dev 318d2baba0 Reinstate mapfile generation. 2013-05-23 23:58:25 +02:00
Hyon Lim (Retina) cd7b0f7aab I missed to add build command 2013-05-23 16:20:38 +10:00
px4dev 2135628254 Hotfix: dependency scanning for modules was totally broken. Fix it so that changes to depended headers correctly cause modules to be rebuilt. 2013-05-23 00:08:35 +02:00
Lorenz Meier cb1fbecd09 Merged master from main repo 2013-05-22 12:25:13 +02:00
Lorenz Meier 03eac33a3d Merge branch 'master' of github.com:cvg/Firmware_Private into fmuv2_bringup 2013-05-22 12:16:41 +02:00
px4dev 5576e321fa Use the new prebuilt-library support to wrap the ARM CMSIS DSP library, and update to the version shipped with CMSIS 3.0 r3p2 2013-05-20 00:30:43 +02:00
px4dev 3a1c9f14f6 Teach the PX4 build system how to handle pre-built libraries. 2013-05-20 00:26:41 +02:00
px4dev b7d430e3c0 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 
Fix px4iov2 build issue by selecting the correct NuttX config.
 2013-05-19 21:51:35 +02:00
Anton Babushkin 2f280bb4ca Merge branch 'master' into gpio_led 2013-05-17 12:48:46 +04:00
Anton Babushkin c21ba6c500 position_estimator_inav added to config_px4fmu_default.mk 2013-05-17 12:32:07 +04:00
px4dev 0c43315c1e Hotfix: better error messages for missing modules 2013-05-13 22:20:08 -07:00
Lorenz Meier f8c199062a Merge branch 'master' of github.com:PX4/Firmware 2013-05-13 08:34:18 +02:00
Lorenz Meier 1ff6c80866 More example fixes 2013-05-13 08:28:36 +02:00
px4dev edb0e01dfd HOTFIX: simplify symbol names going into the ROMFS object, hopefully this avoids inconsistent symbol naming on Windows. 2013-05-12 14:04:57 -07:00
Lorenz Meier 6ea204c813 Added fixed wing controller example 2013-05-12 20:08:09 +02:00
px4dev 0ee738e9c9 Fix ROMFS dependency scan, add a warning if ROMFS_ROOT appears to be empty. 2013-05-12 10:51:25 -07:00
px4dev 196ee8b16f Change the way modules are built so that object paths are relative and use vpath for locating sources (so source paths are also shorter). 
Add some basic documentation for the build system files while we're at it.
 2013-05-11 11:32:05 -07:00
Anton Babushkin 9a9e41f7a2 Merge branch 'master' into gpio_led 2013-05-09 22:41:09 +04:00
Lorenz Meier 614bbb1510 Merged ETS airspeed driver 2013-05-09 15:58:23 +02:00
Lorenz Meier 3152dae3dc Merged with master 2013-05-09 15:52:36 +02:00
Lorenz Meier b944962a73 Merge branch 'export-build' of github.com:PX4/Firmware into export-build 2013-05-09 15:45:45 +02:00
Lorenz Meier 296a19072d Enabled leds on FMU again 2013-05-09 15:39:54 +02:00