Commit Graph

549 Commits

Author SHA1 Message Date
Anton Matosov 72274062c1 Renamed servo_gimbal to simply 'gimbal' as HW is behind the scene and doesn't really matter here 2015-03-06 18:57:37 -08:00
Lorenz Meier 8a6698b6e6 drivers/servo_gimbal: Added servo gimbal 2015-03-06 18:57:37 -08:00
Randy Mackay 9a3ea61569 build: add oreoled to px4fmu-v2_default 2015-02-25 15:10:11 +01:00
Lorenz Meier e59aaa771c Rover: Add simple steering controller. 2015-02-19 21:51:53 +01:00
James Goppert d736311982 Added flow position estimator to default apps. 2015-02-11 21:11:23 -05:00
Lorenz Meier 769df2ff47 Toolchain: Add more compiler options, add note about -Wfloat-conversion warning (available with GCC 4.9). Needs work. 2015-02-08 12:17:35 +01:00
Lorenz Meier d441d38677 Merged master into ros 2015-02-02 21:21:51 +01:00
Lorenz Meier 344e969428 FMUv2 test: Enable sensors module 2015-02-01 13:11:24 +01:00
Lorenz Meier a3f577e642 FMUv2: Re-enable missing sensors 2015-02-01 13:11:05 +01:00
Lorenz Meier f51dd7556e FMUv1: Re-enable missing sensors 2015-02-01 13:10:45 +01:00
Thomas Gubler 0dc511a76b remove unintended/leftover changes in fmu2 default makefile 2015-02-01 12:20:54 +01:00
Thomas Gubler 68e35ef0fd remove unintended/leftover changes in test makefile 2015-02-01 12:19:42 +01:00
Thomas Gubler 84ff3c671d Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
	src/drivers/px4fmu/fmu.cpp
2015-02-01 11:06:47 +01:00
Lorenz Meier 1cc4c808a8 Upgrade UAVCAN to multi pub/sub A API 2015-01-29 16:33:53 +01:00
Lorenz Meier cc7a00b96e Disable UAVCAN build until sensors use all new-style API and UAVCAN sensors base class can be reworked to use it consistently 2015-01-29 16:33:53 +01:00
Lorenz Meier 7932e2eda2 Add top to test build 2015-01-29 16:33:52 +01:00
David Sidrane 6606b56364 Updated NuttX submodule with memcpy fix, disabled run time stack checking and added modules back in 2015-01-29 04:49:39 -10:00
Thomas Gubler 1915537281 initial port of multiplatform version of mc_pos_control 2015-01-28 16:32:20 +01:00
Thomas Gubler 856b10cc1a Revert "temporarily re-enable stack checking, disable some modules to make firmware fit"
This reverts commit 27b2701340.
2015-01-28 16:29:25 +01:00
Thomas Gubler 2728889f78 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_attctlposctl 2015-01-28 16:29:14 +01:00
Thomas Gubler 27b2701340 temporarily re-enable stack checking, disable some modules to make firmware fit 2015-01-28 10:21:42 +01:00
Thomas Gubler ee6395c502 enable mc att multiplatform in makefile 2015-01-25 13:38:47 +01:00
Simon Wilks f5a1680fd6 Add landing detector for V1 boards as well. 2015-01-24 14:18:28 +01:00
Thomas Gubler 1ad6e00234 re-enable warnings/errors 2015-01-23 07:16:07 +01:00
Thomas Gubler 8c4fce3654 multiplatform: better publisher base class 2015-01-22 09:30:43 +01:00
Thomas Gubler 52a2a23cc7 Merge remote-tracking branch 'upstream/ros' into ros_messagelayer_merge 2015-01-21 15:50:54 +01:00
Thomas Gubler 1628999361 Revert "Fixes to make GCC 4.9 link"
This reverts commit 85b6907e1d.
2015-01-21 15:44:15 +01:00
David Sidrane 517e1e8d48 Fixed permissions 2015-01-21 14:54:25 +01:00
David Sidrane 4b8feb03cf Match the OS build's CONFIG_ARMV7M_STACKCHECK setting by using actual setting in the exported nuttx config.h file to control each board build setting of ENABLE_STACK_CHECKS in toolchain_gnu-arm-eabi.mk 2015-01-21 14:54:24 +01:00
Pavel Kirienko f6786d0be9 Removing -ffixed-r10 when stack checks aren't enabled 2015-01-21 14:54:24 +01:00
Pavel Kirienko 2ebd7099de Globally configurable stack checks, R10 is always fixed 2015-01-21 14:54:24 +01:00
Pavel Kirienko 4b1782174c INSTRUMENTATIONDEFINES assignment made non-optional 2015-01-21 14:54:24 +01:00
Pavel Kirienko 1d13edcf92 Stack checks made optional: ENABLE_STACK_CHECKS 2015-01-21 14:54:24 +01:00
Pavel Kirienko c2bc298409 Disable instrumentation for the uavcan module 2015-01-21 14:54:24 +01:00
Pavel Kirienko 569c3b7d37 Using -g3 flag instead of -g 2015-01-21 14:54:23 +01:00
Pavel Kirienko d87bb4dfcb Revert "Intrusive changes made for UAVCAN profiling. Will be reverted in the next commit (this one is needed to keep the changes in history)"
This reverts commit 4c301d9dcf180e39186fa6753c7a3d3215b3cfa7.
2015-01-21 14:54:23 +01:00
Pavel Kirienko 6bbacc4271 Intrusive changes made for UAVCAN profiling. Will be reverted in the next commit (this one is needed to keep the changes in history) 2015-01-21 14:54:23 +01:00
Thomas Gubler dcdde8ea88 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
	src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
2015-01-21 14:41:03 +01:00
Thomas Gubler cadcad6ffb messagelayer prototype for nuttx 2015-01-21 14:27:01 +01:00
Thomas Gubler 7c3223b860 added a messageplayer prototype for ros 2015-01-21 14:26:22 +01:00
Lorenz Meier d1eac3510b DELETE DURING REBASE: Remove some apps to make space 2015-01-21 13:40:10 +01:00
Lorenz Meier 85b6907e1d Fixes to make GCC 4.9 link 2015-01-21 13:39:36 +01:00
Lorenz Meier f176147d2a Allow GCC 4.9.3 2015-01-21 11:06:57 +01:00
Lorenz Meier e8e4a3b5da Allow GCC 4.9.3 2015-01-21 11:04:56 +01:00
Johan Jansen 9ea086bf2d Astyle: Run astyle to fix code formatting 2015-01-15 14:37:51 +01:00
Johan Jansen 10a2dd8a34 LandDetector: Merged fixedwing and multicopter into one module handling both algorithms 2015-01-15 14:37:51 +01:00
Johan Jansen 642063c3b8 LandDetector: Added crude land detectors for multicopter and fixedwing 2015-01-15 14:37:50 +01:00
Thomas Gubler b2366aaa22 Merge remote-tracking branch 'upstream/master' into ros 2015-01-09 08:07:00 +01:00
Lorenz Meier adbe7246b7 Temporarily disable HoTT support 2015-01-09 07:09:58 +01:00
Thomas Gubler 0893f9fd96 remove uavcan from multiplatform build, problems with linking 2015-01-06 19:13:39 +01:00
Thomas Gubler 3436abdf0b add multiplatform makefile to work around flash size issues 2015-01-06 11:10:52 +01:00
Thomas Gubler 87650e49e1 Revert "turn off werror for now"
This reverts commit 1fe70a845d.
2015-01-05 16:50:14 +01:00
Thomas Gubler 683b06321c Revert "uavcan gives compile errors, disable for now"
This reverts commit 941ff05720.
2015-01-05 16:33:57 +01:00
Thomas Gubler 5876ff11ec mc att control multiplatform alongside normal mc att control 2015-01-05 16:12:22 +01:00
Thomas Gubler 941ff05720 uavcan gives compile errors, disable for now 2015-01-05 15:58:38 +01:00
Thomas Gubler 1fe70a845d turn off werror for now 2015-01-05 15:22:43 +01:00
Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
2015-01-05 10:02:07 +01:00
Andrew Tridgell c9e795156f makefiles: make it easier to use ccache for build on windows 2014-12-31 11:43:32 +01:00
Andrew Tridgell 6bc6739676 makefiles: removed stray spaces 2014-12-31 11:43:21 +01:00
Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitmodules
2014-12-29 08:00:12 +01:00
Lorenz Meier e952324fbf Rework HoTT into a proper library, which fixes parallel build breakage 2014-12-26 20:25:31 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitignore
	src/lib/uavcan
2014-12-25 09:48:15 +01:00
Daniel Agar d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
James Goppert 97fdc69473 Added aerocore upload target. 2014-12-18 15:21:29 -05:00
Thomas Gubler 16618f1ada Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/examples/subscriber/subscriber_params.c
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
	src/modules/uORB/topics/vehicle_attitude_setpoint.h
	src/platforms/px4_middleware.h
2014-12-18 12:11:05 +01:00
Thomas Gubler 851415e48e Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
2014-12-16 10:23:41 +01:00
Thomas Gubler e1ff89ad61 add nuttx platform to fmuv1 makefile 2014-12-16 10:11:59 +01:00
Thomas Gubler 9520983e08 lots' of header juggling and small changes to make mc att control compile for NuttX and ROS 2014-12-16 08:24:51 +01:00
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
Lorenz Meier ef450cc447 Enable examples by default to ensure they get maintained on API changes 2014-12-12 14:08:41 +01:00
Thomas Gubler 76457e63c5 add nuttx platform to default makefile 2014-12-10 12:38:54 +01:00
Thomas Gubler 52c35a8e20 solve conflict for definiton of FILE 2014-12-06 15:36:58 +01:00
Thomas Gubler c2e2b3d52f make param wrapper macros compatible for px4 and ros, needs cleanup 2014-12-03 17:04:15 +01:00
tumbili 34cf39e1ec added vtol attitude control module to FMU makefile 2014-12-03 09:52:29 +01:00
Thomas Gubler 244c1cb583 enable systemcmds in test build 2014-11-28 11:34:52 +01:00
Thomas Gubler 2760d64a00 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-11-28 09:47:29 +01:00
Lorenz Meier 22a247ca67 Disable the BlinkM driver, code style fixes for other disabled drivers 2014-11-27 23:19:53 +01:00
Lorenz Meier 32835757de Remove uncommon modules from FMU-v2 build 2014-11-26 08:24:11 +01:00
Lorenz Meier 6200a3e3a5 Added TeraRanger one sensor 2014-11-26 07:56:54 +01:00
Thomas Gubler c37ff71e62 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
2014-11-24 07:41:26 +01:00
Don Gagne f3f7f08e0d Parameter xml metadata in .px4 2014-11-18 17:20:50 -08:00
Lorenz Meier 97a1410ec9 Toolchain: Allow GCC 4.7 and 4.8 variants 2014-11-17 15:14:17 +01:00
Lorenz Meier d4a5f345aa Remove unneeded apps from build 2014-11-15 13:50:38 +01:00
Lorenz Meier f36f54c621 Restructuring of generic middleware support files, wrapping of the main ROS calls, skeletons for publishers / subscribers 2014-11-09 11:57:34 +01:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Lorenz Meier 3239ba1570 Merge pull request #1360 from DonLakeFlyer/UnitTestFramework
Upgraded unit test framework
2014-10-05 12:33:21 +02:00
Thomas Gubler c5a1ddd8f2 re-enable MC apps on FMUV1 2014-09-30 15:42:56 +02:00
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