aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-15 20:04:11 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-15 20:04:11 +0100
commit352dea675435794d90f75d4a3c013d2afc439933 (patch)
tree4e23817b56131b7a5f4287a2ecef925755fe6b36
parent84ad289e0ae8d2bd32cba5c22a27a35132b5c863 (diff)
downloadpx4-firmware-352dea675435794d90f75d4a3c013d2afc439933.tar.gz
px4-firmware-352dea675435794d90f75d4a3c013d2afc439933.tar.bz2
px4-firmware-352dea675435794d90f75d4a3c013d2afc439933.zip
Remove outdated configs, clean up pwm limit compilation
-rw-r--r--makefiles/config_px4fmu-v1_backside.mk145
-rw-r--r--makefiles/config_px4fmu-v1_test.mk49
-rw-r--r--src/drivers/px4fmu/module.mk3
-rw-r--r--src/modules/systemlib/module.mk3
4 files changed, 3 insertions, 197 deletions
diff --git a/makefiles/config_px4fmu-v1_backside.mk b/makefiles/config_px4fmu-v1_backside.mk
deleted file mode 100644
index ba26ef28f..000000000
--- a/makefiles/config_px4fmu-v1_backside.mk
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# Makefile for the px4fmu_default configuration
-#
-
-#
-# Use the configuration's ROMFS.
-#
-ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common
-ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v1_default.bin
-
-#
-# Board support modules
-#
-MODULES += drivers/device
-MODULES += drivers/stm32
-MODULES += drivers/stm32/adc
-MODULES += drivers/stm32/tone_alarm
-MODULES += drivers/led
-MODULES += drivers/px4io
-MODULES += drivers/px4fmu
-MODULES += drivers/boards/px4fmu-v1
-MODULES += drivers/ardrone_interface
-MODULES += drivers/l3gd20
-MODULES += drivers/bma180
-MODULES += drivers/mpu6000
-MODULES += drivers/hmc5883
-MODULES += drivers/ms5611
-MODULES += drivers/gps
-MODULES += drivers/hil
-MODULES += drivers/blinkm
-MODULES += drivers/rgbled
-MODULES += drivers/roboclaw
-MODULES += drivers/airspeed
-MODULES += drivers/ets_airspeed
-MODULES += drivers/meas_airspeed
-MODULES += modules/sensors
-
-#
-# System commands
-#
-MODULES += systemcmds/mtd
-MODULES += systemcmds/bl_update
-MODULES += systemcmds/boardinfo
-MODULES += systemcmds/i2c
-MODULES += systemcmds/mixer
-MODULES += systemcmds/param
-MODULES += systemcmds/perf
-MODULES += systemcmds/preflight_check
-MODULES += systemcmds/pwm
-MODULES += systemcmds/esc_calib
-MODULES += systemcmds/reboot
-MODULES += systemcmds/top
-MODULES += systemcmds/tests
-MODULES += systemcmds/config
-MODULES += systemcmds/nshterm
-
-#
-# General system control
-#
-MODULES += modules/commander
-MODULES += modules/navigator
-MODULES += modules/mavlink
-MODULES += modules/mavlink_onboard
-MODULES += modules/gpio_led
-
-#
-# Estimation modules (EKF/ SO3 / other filters)
-#
-MODULES += modules/att_pos_estimator_ekf
-
-#
-# Vehicle Control
-#
-MODULES += modules/fixedwing_backside
-
-#
-# Logging
-#
-MODULES += modules/sdlog2
-
-#
-# Unit tests
-#
-#MODULES += modules/unit_test
-#MODULES += modules/commander/commander_tests
-
-#
-# Library modules
-#
-MODULES += modules/systemlib
-MODULES += modules/systemlib/mixer
-MODULES += modules/controllib
-MODULES += modules/uORB
-
-#
-# Libraries
-#
-LIBRARIES += lib/mathlib/CMSIS
-MODULES += lib/mathlib
-MODULES += lib/mathlib/math/filter
-MODULES += lib/ecl
-MODULES += lib/external_lgpl
-MODULES += lib/geo
-MODULES += lib/conversion
-
-#
-# Demo apps
-#
-#MODULES += examples/math_demo
-# Tutorial code from
-# https://pixhawk.ethz.ch/px4/dev/hello_sky
-#MODULES += examples/px4_simple_app
-
-# Tutorial code from
-# https://pixhawk.ethz.ch/px4/dev/daemon
-#MODULES += examples/px4_daemon_app
-
-# Tutorial code from
-# https://pixhawk.ethz.ch/px4/dev/debug_values
-#MODULES += examples/px4_mavlink_debug
-
-# Tutorial code from
-# https://pixhawk.ethz.ch/px4/dev/example_fixedwing_control
-#MODULES += examples/fixedwing_control
-
-# Hardware test
-#MODULES += examples/hwtest
-
-#
-# Transitional support - add commands from the NuttX export archive.
-#
-# In general, these should move to modules over time.
-#
-# Each entry here is <command>.<priority>.<stacksize>.<entrypoint> but we use a helper macro
-# to make the table a bit more readable.
-#
-define _B
- $(strip $1).$(or $(strip $2),SCHED_PRIORITY_DEFAULT).$(or $(strip $3),CONFIG_PTHREAD_STACK_DEFAULT).$(strip $4)
-endef
-
-# command priority stack entrypoint
-BUILTIN_COMMANDS := \
- $(call _B, sercon, , 2048, sercon_main ) \
- $(call _B, serdis, , 2048, serdis_main ) \
- $(call _B, sysinfo, , 2048, sysinfo_main )
diff --git a/makefiles/config_px4fmu-v1_test.mk b/makefiles/config_px4fmu-v1_test.mk
deleted file mode 100644
index 4ba93fa74..000000000
--- a/makefiles/config_px4fmu-v1_test.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Makefile for the px4fmu_default configuration
-#
-
-#
-# Use the configuration's ROMFS.
-#
-ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_test
-ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v1_default.bin
-
-#
-# Board support modules
-#
-MODULES += drivers/device
-MODULES += drivers/stm32
-MODULES += drivers/stm32/adc
-MODULES += drivers/stm32/tone_alarm
-MODULES += drivers/led
-MODULES += drivers/boards/px4fmu-v1
-MODULES += drivers/px4io
-MODULES += systemcmds/perf
-MODULES += systemcmds/reboot
-MODULES += systemcmds/tests
-MODULES += systemcmds/nshterm
-MODULES += systemcmds/mtd
-
-#
-# Library modules
-#
-MODULES += modules/systemlib
-MODULES += modules/systemlib/mixer
-MODULES += modules/uORB
-
-#
-# Transitional support - add commands from the NuttX export archive.
-#
-# In general, these should move to modules over time.
-#
-# Each entry here is <command>.<priority>.<stacksize>.<entrypoint> but we use a helper macro
-# to make the table a bit more readable.
-#
-define _B
- $(strip $1).$(or $(strip $2),SCHED_PRIORITY_DEFAULT).$(or $(strip $3),CONFIG_PTHREAD_STACK_DEFAULT).$(strip $4)
-endef
-
-# command priority stack entrypoint
-BUILTIN_COMMANDS := \
- $(call _B, sercon, , 2048, sercon_main ) \
- $(call _B, serdis, , 2048, serdis_main )
diff --git a/src/drivers/px4fmu/module.mk b/src/drivers/px4fmu/module.mk
index d918abd57..05bc7a5b3 100644
--- a/src/drivers/px4fmu/module.mk
+++ b/src/drivers/px4fmu/module.mk
@@ -3,5 +3,4 @@
#
MODULE_COMMAND = fmu
-SRCS = fmu.cpp \
- ../../modules/systemlib/pwm_limit/pwm_limit.c
+SRCS = fmu.cpp
diff --git a/src/modules/systemlib/module.mk b/src/modules/systemlib/module.mk
index 8c6c300d6..3953b757d 100644
--- a/src/modules/systemlib/module.mk
+++ b/src/modules/systemlib/module.mk
@@ -51,5 +51,6 @@ SRCS = err.c \
mavlink_log.c \
rc_check.c \
otp.c \
- board_serial.c
+ board_serial.c \
+ pwm_limit/pwm_limit.c