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

462 Commits

Author SHA1 Message Date
Thomas Gubler e7313683cd Merge remote-tracking branch 'upstream/master' into swissfang 2014-09-30 15:40:11 +02:00
Thomas Gubler cc05f0f185 Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang 
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
 2014-09-30 15:38:27 +02:00
Lorenz Meier 47f151d4ce Deactivate FrSky telem by default 2014-09-30 15:19:06 +02:00
Lorenz Meier 47dcf88271 Flash optimization 2014-09-30 15:18:30 +02:00
Lorenz Meier 772c5f745c Make space on FMUv1 2014-09-17 16:37:10 -05:00
Don Gagne deda5d0a04 Upgraded unit test framework 2014-09-13 19:59:44 -07:00
Thomas Gubler cf601c09bf swissfang: don't build MC apps on FMU1 2014-09-07 12:21:49 +02:00
Don Gagne 81275e624e Added mavlink_ftp unit test 2014-09-02 15:32:33 -07:00
Lorenz Meier 47e39841df Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang 2014-08-26 09:37:56 +02:00
Julian Oes 73ecbbe13d config_px4fmu-v2_default: include px4flow driver by default 2014-08-25 11:12:01 +02:00
Lorenz Meier e5f5f5e2cc Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul 2014-08-21 15:05:48 +02:00
Lorenz Meier 01f1c90c26 Make some space on FMUv1 2014-08-17 20:48:51 +02:00
Lorenz Meier b0b2f34992 Merged master 2014-08-09 12:22:28 +02:00
Lorenz Meier ae2de67501 Revert "Remove old TECS implementation - we can really only decently flight-test and support one." 
This reverts commit 503ded0539.

Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2014-07-29 11:24:11 +02:00
Luis Rodrigues 034d0a6a61 driver for the TeraRangerOne I2C ranger finder 2014-07-23 18:19:49 +02:00
Lorenz Meier a7d2963e2b Enable UAVCAN 2014-07-23 08:27:45 +02:00
Lorenz Meier 1b5d4e5bd4 Comment out uavcan due to build breakage, will go back in ASAP 2014-07-22 17:42:34 +02:00
Lorenz Meier 086fc7f758 Merge pull request #1128 from PX4/uavcan 
Basic UAVCAN support
 2014-07-22 06:48:49 +02:00
Lorenz Meier e696ed5509 Merged master 2014-07-15 22:07:03 +02:00
Pavel Kirienko 56649bd10a Merge branch 'master' into uavcan 2014-07-08 19:51:19 +04:00
Lorenz Meier 369c7d277f Board config cleanup for external bus support 2014-07-08 13:50:00 +02:00
akdslr 1b555f2d2e LL40LS driver: Added new driver to the config make files 2014-07-08 12:03:18 +02:00
Lorenz Meier 512584ed75 Merge pull request #1145 from DonLakeFlyer/MoreWarnings 
Fix compiler warnings
 2014-07-08 07:32:36 +02:00
Don Gagne 680ebf29c3 Fix compiler warnings 2014-07-07 15:11:46 -07:00
Lorenz Meier 6a8990b3ba Merged master 2014-07-07 18:49:36 +02:00
Lorenz Meier 4c2cc65ca6 Cleaning up sub modules 2014-07-07 17:18:54 +02:00
Lorenz Meier 1492323f03 Merged master into uavcan 2014-07-06 15:47:34 +02:00
Lorenz Meier 4f06e9bdc9 Move a seldomly used module to test config 2014-07-06 15:16:39 +02:00
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Lorenz Meier e78d496e92 Enable new lookup lib 2014-06-28 12:51:22 +02:00
Lorenz Meier 503ded0539 Remove old TECS implementation - we can really only decently flight-test and support one. 2014-06-28 12:35:04 +02:00
Lorenz Meier 474de62ebb Enable matlab bridge in test setup 2014-06-10 15:12:23 +02:00
Lorenz Meier 436cefd88c make launch detector more flash efficient 2014-06-01 12:13:48 +02:00
Lorenz Meier 6341737384 Merge branch 'master' of github.com:PX4/Firmware into pca8574 2014-05-29 11:26:18 +02:00
Lorenz Meier e710e2a2d1 Allow any GCC 4.7 subversion 2014-05-23 12:38:29 +02:00
Julian Oes 04a25fcf14 makefiles: check for correct arm-none-eabi-gcc version 2014-05-22 13:58:12 +02:00
Lorenz Meier 19ebe076cd Fix aerocore config 2014-05-15 14:38:16 +02:00
Lorenz Meier ba51ab2545 Merge branch 'ekf_params' of github.com:PX4/Firmware 2014-05-15 13:14:25 +02:00
Ash Charles e5508a1aa0 Add Gumstix AeroCore device 
Based on the work of Andrew Smith [1], add board configuration and device
drivers to support the Gumstix AeroCore (previously Aerodroid) board [2]. The
AeroCore is an autopilot board based on a STM32F427 similar to the FMUv2.

[1] https://github.com/smithandrewc/Firmware
[2] https://store.gumstix.com/index.php/products/585/

Signed-off-by: Ash Charles <ashcharles@gmail.com>
 2014-05-13 09:41:41 -07:00
Lorenz Meier de5bdbb863 Merged master into uavcan 2014-05-07 14:28:23 +02:00
Lorenz Meier 6a6feaf96c Merged master 2014-05-07 14:14:31 +02:00
Pavel Kirienko 7d7a375dd1 Fixed hardcoded include path 2014-05-06 19:42:40 +04:00
Pavel Kirienko 7813566e66 Initial UAVCAN integration. The library compiles successfully, CAN driver appears to be working properly. There is one hardcoded path in the module makefile that needs to be fixed; plus the compilation will likely fail unless arch/math.h contains log2l() 2014-05-06 19:30:45 +04:00
Lorenz Meier 55cae08cf3 Merge pull request #868 from ufoncz/versioncmd 
Versioncmd
 2014-05-03 03:42:00 -07:00
Thomas Gubler 3424a65e32 update comment in makefile 2014-05-02 14:28:47 +02:00
Thomas Gubler de87d6df69 do not copy hidden files to ROMFS 2014-05-02 14:26:30 +02:00
Lorenz Meier af1af1e22d Port expander driver first hacky version 2014-04-29 18:38:30 +02:00
ufoncz bd5a0cef1a ver command ready including hwcmp which replaces hw_ver, removed hw_ver 
updated all scripts to use new ver hwcmp command
q
 2014-04-27 17:42:45 +02:00
ufoncz 5ea1105451 changed dir from version to ver to keep it shorter 
added "hw_ver compare" as command option so we can replace hw_ver in future
 2014-04-27 15:12:05 +02:00
Lorenz Meier 5ad3ff95bf Merged master into ekf_params 2014-04-26 15:19:21 +02:00
Lorenz Meier eb520e7dcd Merge pull request #849 from PX4/compile_pedantic 
Compile pedantic
 2014-04-26 12:22:13 +02:00
Julian Oes dcf1dbb7f4 warnings: don't spam with warning for missing field initializer 2014-04-26 11:48:43 +02:00
ufoncz 08e5ed5a1d added version nsh command, it can replace hw_ver 
sss
 2014-04-25 21:14:12 +02:00
Lorenz Meier 27755806d5 More pedantic warnings 2014-04-21 21:30:57 +02:00
Lorenz Meier 7b61c927f0 Renamed FW filter to EKF to express its generic properties, switched multicopters over to this filter for first tests. 2014-04-19 16:13:13 +02:00
Julian Oes 5d3660b6a9 Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_drop_paul 
Conflicts:
	src/modules/uORB/topics/vehicle_command.h
 2014-03-30 13:40:06 +02:00
Julian Oes 33d65eae97 Merge remote-tracking branch 'px4/master' into bottle_drop 2014-03-29 11:16:15 +01:00
Lorenz Meier ed197b5b59 Merged beta_mavlink2 / master 2014-03-16 12:12:28 +01:00
Anton Babushkin 955bd402d2 Merge branch 'master' into beta_mavlink2 2014-03-15 09:47:02 +04:00
Lorenz Meier 89e6b3f606 Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder 2014-03-12 20:38:39 +01:00
Lorenz Meier caef8d115c Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2 2014-03-12 20:35:20 +01:00
Lorenz Meier db04e00060 Merge pull request #712 from PX4/fetch_log 
Log fetcher utility
 2014-03-12 20:32:58 +01:00
Lorenz Meier 5a39a4cbd4 Merged mavlink_beta2 2014-03-11 17:53:42 +01:00
Lorenz Meier 4d8524f508 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-03-11 12:51:34 +01:00
Lorenz Meier a6d9b7e864 Merged stack size changes 2014-03-10 19:06:54 +01:00
Lorenz Meier 368c2390cf Merge pull request #673 from PX4/romfs_prune 
ROMFS: ignore comments and newlines in startup files, text in mixer files
 2014-03-10 19:01:23 +01:00
Lorenz Meier 008efff42e Added support for driver rangefinder 2014-03-08 20:00:06 +01:00
Anton Babushkin cb8bd1a3ad dumpfile command and fetch_log.py tool implemented to fetch logs via nsh console on USB 2014-03-08 21:05:13 +04:00
Julian Oes 873fa4cb40 Merge remote-tracking branch 'px4/master' into bottle_drop 
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
 2014-03-07 10:38:31 +01:00
Anton Babushkin 967f81bfab mavlink_onboard removed 2014-02-28 23:43:52 +04:00
Julian Oes a61a89f339 ROMFS: ignore comments and newlines in startup files, text in mixer files 2014-02-17 00:25:30 +01:00
Lorenz Meier 8016032a40 Merged beta into paul_estimator 2014-02-16 17:07:02 +01:00
Anton Babushkin 4b567ef631 gpio_led: bugs fixed, PX4FMUv2 support added 2014-02-11 23:59:02 +01:00
Lorenz Meier 4d9f0ccac4 Merge branch 'master' into paul_estimator 2014-02-11 09:55:29 +01:00
Lorenz Meier 1b978293d9 Merged master into beta 2014-02-11 08:24:18 +01:00
Lorenz Meier 773f70a9df Merged origin/master into pubsub_cleanup 2014-02-09 16:04:32 +01:00
Lorenz Meier a0e691fa49 Merge branch 'master' into paul_estimator 2014-02-05 14:48:59 +01:00
marco 9defc6cb23 mkblctrl fmuv2 support added 2014-02-02 14:26:17 +01:00
Lorenz Meier 2908ffb092 Trim down FMUv1 config, remove not commonly used modules from default set 2014-02-01 15:46:51 +01:00
Lorenz Meier d2b183c05b merge master 2014-01-31 09:51:59 +01:00
Anton Babushkin 55f845888b px4fmu-v2_test makefile fixed, CMSIS added 2014-01-23 22:41:56 +01:00
Anton Babushkin 6c07a5c2cf makefile for backside removed 2014-01-23 11:49:23 +01:00
Lorenz Meier f8c5a6cc50 Merged master into logging 2014-01-20 13:19:49 +01:00
Anton Babushkin 42f4f45979 mc_att_control_vector renamed to mc_att_control 2014-01-19 10:44:57 +01:00
Anton Babushkin a863b07f8c Merge branch 'autostart_cleanup' into navigator_new_vector 2014-01-17 23:14:24 +01:00
Anton Babushkin 63b7159cda Merge branch 'navigator_new' into navigator_new_vector 2014-01-17 14:37:48 +01:00
Thomas Gubler 73546b6645 Merge remote-tracking branch 'upstream/master' into navigator_new 
Conflicts:
	makefiles/config_px4fmu-v1_backside.mk
	src/modules/commander/commander.cpp
	src/modules/sdlog2/sdlog2.c
 2014-01-17 09:50:22 +01:00
Lorenz Meier 352dea6754 Remove outdated configs, clean up pwm limit compilation 2014-01-15 20:04:11 +01:00
Anton Babushkin 7b60761bf5 Merge branch 'master' into autostart_cleanup 2014-01-14 15:52:46 +01:00
Anton Babushkin 97e4522c76 Merge branch 'master' into navigator_new_vector 2014-01-14 15:45:49 +01:00
Lorenz Meier 58d78e57b7 Build the sensors as part of the test binary 2014-01-14 15:41:12 +01:00
Lorenz Meier 1e0f292566 Disabling EEPROM and old RAMTRON driver 2014-01-14 08:57:32 +01:00
Anton Babushkin 7bcddd192f Merge branch 'navigator_new' into navigator_new_vector 2014-01-13 13:07:25 +01:00
Lorenz Meier 0d3a743f75 Merge branch 'master' into paul_estimator 
ssage aborts
 2014-01-12 12:27:17 +01:00
Lorenz Meier 0bcdfa18c7 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-01-12 12:27:12 +01:00
Lorenz Meier 5a0c635369 Added mtd tool 2014-01-11 21:01:07 +01:00
Thomas Gubler f224374ed3 Merge remote-tracking branch 'upstream/master' into navigator_new 2014-01-11 00:49:30 +01:00
Anton Babushkin f5501a0508 Merge branch 'master' into autostart_cleanup 2014-01-10 16:23:51 +01:00
Anton Babushkin 8d7620c3cb Merge branch 'master' into navigator_new_vector 2014-01-08 15:44:24 +01:00
Lorenz Meier ab407a82ba Merge branch 'master' into mount_tests 2014-01-07 22:42:09 +01:00
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +01:00
Lorenz Meier 4f95ce3dc2 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-07 07:57:58 +01:00
Anton Babushkin 300d891d76 Merge branch 'navigator_new' into navigator_new_vector 2014-01-06 08:08:35 +01:00
Lorenz Meier 7b2f0d758c Merge pull request #578 from kroimon/frsky_telemetry 
Add FrSky telemetry support
 2014-01-05 09:05:14 -08:00
Lorenz Meier 018e42733a Merge branch 'master' of github.com:PX4/Firmware into navigator_new 2014-01-05 15:19:39 +01:00
Lorenz Meier ba4f881f80 Do not require suffixed constants 2014-01-05 01:49:54 +01:00
Lorenz Meier 64a22fc011 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-05 01:49:35 +01:00
Lorenz Meier 366af8da80 Do not require suffixed constants 2014-01-05 01:49:21 +01:00
Lorenz Meier c8801ae3b7 Merged master 2014-01-05 01:48:07 +01:00
Lorenz Meier 7590d91cf2 Improved mount test 2014-01-04 17:05:52 +01:00
Lorenz Meier 05649eb09c Create test config for FMUv1 2014-01-04 17:05:19 +01:00
Lorenz Meier 7fa36a22d7 Fixed tests config 2014-01-04 14:05:23 +01:00
Lorenz Meier 93a0c2de56 Trimming down number of apps to save flash space 2014-01-04 13:51:20 +01:00
Stefan Rado 0ce7886249 Merge branch 'master' into frsky_telemetry 2014-01-02 01:37:09 +01:00
Anton Babushkin 5dda4dc993 Merge branch 'master' into navigator_new_vector fix 2014-01-01 18:19:02 +04:00
Lorenz Meier ffe5c88d98 Added new estimator framework, actual estimation code not yet present 2014-01-01 13:18:21 +01:00
Lorenz Meier 26d26a9b37 Removed fp suffix warning 2014-01-01 13:17:47 +01:00
Lorenz Meier 09b0de21f3 Deleted backside config to cut down build times 2014-01-01 13:17:24 +01:00
Thomas Gubler 3000d08b05 Merge remote-tracking branch 'upstream/master' into navigator_new_fw 
Conflicts:
	makefiles/config_px4fmu-v2_logging.mk
 2014-01-01 12:36:42 +01:00
Anton Babushkin 35e62a13f8 Use new controllers in logging build 2013-12-30 14:05:38 +04:00
Lorenz Meier 9a54c7c64d Removed special logging config to cut down build times 2013-12-30 00:53:12 +01:00
Thomas Gubler cf33f2a627 Merge branch 'launchdetection' into navigator_new_fw 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2013-12-29 19:50:30 +01:00
Stefan Rado 810f33c3f3 Merge branch 'master' into frsky_telemetry 2013-12-28 21:25:45 +01:00
Anton Babushkin 7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Julian Oes 40f2d581bf Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator 
Conflicts:
	src/drivers/px4fmu/fmu.cpp
	src/modules/dataman/dataman.c
	src/modules/dataman/dataman.h
	src/modules/mavlink/orb_listener.c
	src/modules/mavlink/waypoints.c
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_mission.cpp
	src/modules/navigator/navigator_mission.h
	src/modules/uORB/topics/mission.h
 2013-12-27 00:04:32 +01:00
Anton Babushkin e1f949163b makefiles and rc scripts fixed to use new attitude and position controllers 2013-12-26 23:06:36 +04:00
Anton Babushkin 26daae0b0a Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:41:23 +04:00
Anton Babushkin 1e4bb764a6 Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:31:12 +04:00
Anton Babushkin 5a2da77758 Merge branch 'master' into mathlib_new 2013-12-23 18:16:28 +04:00
Thomas Gubler 24e2676131 add dataman to config_px4fmu-v2_logging.mk 2013-12-23 12:13:25 +01:00
Thomas Gubler 68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups 
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
 2013-12-23 11:13:42 +01:00
Lorenz Meier 8c518aa237 Useful bits for high-rate logging 2013-12-20 14:25:35 +01:00
Anton Babushkin a83e3cd222 New mathlib, WIP 2013-12-18 19:33:47 +04:00
Anton Babushkin 7cbb4cfdb8 Merge branch 'master' into vector_control2 2013-12-16 12:47:40 +04:00
Lorenz Meier b63d4809de Enabled MPU6K and updated startup script to start all sensors 2013-12-15 19:35:23 +01:00
Thomas Gubler c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups 
Conflicts:
	src/drivers/px4io/px4io.cpp
 2013-12-13 21:07:27 +01:00
Anton Babushkin deac4eefc6 Merge branch 'master' into vector_control2 2013-12-13 21:15:21 +04:00
Julian Oes 07a3f5694c Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigator 2013-11-29 12:39:29 +01:00
Hyon Lim b3f1adc54b SO3 estimator code has been cleaned 2013-11-29 02:35:49 +09:00
Hyon Lim bcd745fb0d SO(3) estimator and quaternion receive by mavlink implemented 2013-11-29 02:05:15 +09:00
Stefan Rado 5f18ce506d Add FrSky telemetry application. 
This daemon emulates an FrSky sensor hub by periodically sending data packets to an attached FrSky receiver.
 2013-11-24 13:39:02 +01:00
Julian Oes bc583838b7 Navigator: only whitespace fixes 2013-11-18 15:59:14 +01:00
Julian Oes c8942d0b34 Makefiles: fix compilation for backside 2013-11-18 15:58:45 +01:00
Julian Oes 29578a5604 Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip 2013-11-18 13:00:09 +01:00
Anton Babushkin d736ed181f Merge branch 'master' into vector_control 2013-11-16 16:10:57 +04:00
Thomas Gubler ebbe4d2235 initial wip version of launchdetector 2013-11-15 22:43:07 +01:00
James Goppert ba3681d3a0 Updated backside controller/ added backside config. 2013-11-14 12:34:51 -05:00
Anton Babushkin 550c611a6e Add mc_att_control_vector to apps list 2013-11-08 23:01:13 +04:00
Juchli D 56f1ea9266 Added Bottle Drop app 2013-11-05 13:25:49 +01:00
Jean Cyr 1cf9f72f62 Add data manager module and fence support to navigator 
- Add function to geo.c to determine if global position is inside fence
- Add navigator support/commands for maintaining fence coords.
- Add data manager module to support persistence fence storage. Can
store other data, but only used for fence at this time.
- Add unit tests for data manager
 2013-11-03 12:40:13 -05:00