diff options
| author | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-08 19:51:19 +0400 |
|---|---|---|
| committer | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-08 19:51:19 +0400 |
| commit | 56649bd10a414a91237dd11142b33851b2a9015c (patch) | |
| tree | aab55ec53ce8013d8e482eba9a9d75c9cc476446 /makefiles | |
| parent | 664795c9db9a0d938cbe7221aed87755ca8de7bf (diff) | |
| parent | 0054eb23d857844ebae34a7d198fc60e538ccd3c (diff) | |
| download | px4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.tar.gz px4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.tar.bz2 px4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.zip | |
Merge branch 'master' into uavcan
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 | ||||
| -rw-r--r-- | makefiles/setup.mk | 1 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 6 |
4 files changed, 7 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 0852c93ad..fe2a4e9db 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -33,7 +33,6 @@ MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm -MODULES += drivers/roboclaw MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 66b2157ed..66d9efbf8 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -25,6 +25,7 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/pca8574 +MODULES += drivers/roboclaw MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests diff --git a/makefiles/setup.mk b/makefiles/setup.mk index a5271c656..4bfa7a087 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -46,6 +46,7 @@ export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src)/ export PX4_LIB_DIR = $(abspath $(PX4_BASE)/src/lib)/ export PX4_MK_DIR = $(abspath $(PX4_BASE)/makefiles)/ export NUTTX_SRC = $(abspath $(PX4_BASE)/NuttX/nuttx)/ +export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink/include/mavlink/v1.0)/ export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/NuttX/apps)/ export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink)/ export UAVCAN_DIR = $(abspath $(PX4_BASE)/uavcan)/ diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 173c20186..71c7fb49f 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -139,7 +139,11 @@ ARCHWARNINGS = -Wall \ -Werror=format-security \ -Werror=array-bounds \ -Wfatal-errors \ - -Wformat=1 + -Wformat=1 \ + -Werror=unused-but-set-variable \ + -Werror=unused-variable \ + -Werror=double-promotion \ + -Werror=reorder # -Wcast-qual - generates spurious noreturn attribute warnings, try again later # -Wconversion - would be nice, but too many "risky-but-safe" conversions in the code # -Wcast-align - would help catch bad casts in some cases, but generates too many false positives |