aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-01-22 09:20:19 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-01-22 09:20:19 +0100
commit1868343db65c173b6c66e2725823542e747154c8 (patch)
treef12971b08325e90ed3ea41b0a1422d38eedc0120
parentaeccede16852460a33cc8e1e7b6bb60f75f8c17a (diff)
downloadpx4-firmware-1868343db65c173b6c66e2725823542e747154c8.tar.gz
px4-firmware-1868343db65c173b6c66e2725823542e747154c8.tar.bz2
px4-firmware-1868343db65c173b6c66e2725823542e747154c8.zip
Enable CU term in FMUv2 config
-rw-r--r--makefiles/config_px4fmu-v1_default.mk3
-rw-r--r--makefiles/config_px4fmu-v2_default.mk15
-rw-r--r--makefiles/config_px4fmu-v2_test.mk3
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig6
4 files changed, 17 insertions, 10 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 18be47065..0010d4b8b 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -152,4 +152,5 @@ endef
# command priority stack entrypoint
BUILTIN_COMMANDS := \
$(call _B, sercon, , 2048, sercon_main ) \
- $(call _B, serdis, , 2048, serdis_main )
+ $(call _B, serdis, , 2048, serdis_main ) \
+ $(call _B, cu, , 2048, cu_main )
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index 3abebd82f..a48b3115e 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -27,15 +27,15 @@ MODULES += drivers/l3gd20
MODULES += drivers/hmc5883
MODULES += drivers/ms5611
MODULES += drivers/mb12xx
-# MODULES += drivers/sf0x
+MODULES += drivers/sf0x
MODULES += drivers/ll40ls
-# MODULES += drivers/trone
+MODULES += drivers/trone
MODULES += drivers/gps
MODULES += drivers/hil
-# MODULES += drivers/hott
-# MODULES += drivers/hott/hott_telemetry
-# MODULES += drivers/hott/hott_sensors
-# MODULES += drivers/blinkm
+MODULES += drivers/hott
+MODULES += drivers/hott/hott_telemetry
+MODULES += drivers/hott/hott_sensors
+MODULES += drivers/blinkm
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
@@ -163,4 +163,5 @@ endef
# command priority stack entrypoint
BUILTIN_COMMANDS := \
$(call _B, sercon, , 2048, sercon_main ) \
- $(call _B, serdis, , 2048, serdis_main )
+ $(call _B, serdis, , 2048, serdis_main ) \
+ $(call _B, cu, , 2048, cu_main )
diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk
index 11b62e0a0..f5d90afe6 100644
--- a/makefiles/config_px4fmu-v2_test.mk
+++ b/makefiles/config_px4fmu-v2_test.mk
@@ -91,4 +91,5 @@ endef
# command priority stack entrypoint
BUILTIN_COMMANDS := \
$(call _B, sercon, , 2048, sercon_main ) \
- $(call _B, serdis, , 2048, serdis_main )
+ $(call _B, serdis, , 2048, serdis_main ) \
+ $(call _B, cu, , 2048, cu_main )
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index d21e179c1..2aeef89b5 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -1249,7 +1249,11 @@ CONFIG_NSH_ARCHINIT=y
#
# CU Minimal Terminal
#
-# CONFIG_SYSTEM_CUTERM is not set
+CONFIG_SYSTEM_CUTERM=y
+CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE="/dev/ttyS0"
+CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD=57600
+CONFIG_SYSTEM_CUTERM_STACKSIZE=2048
+CONFIG_SYSTEM_CUTERM_PRIORITY=100
#
# FLASH Program Installation