aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-06-01 15:14:53 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-06-01 15:14:53 +0200
commit198df9c82ef94c17f8fe240957fbef1a796f8712 (patch)
tree5725545be76678826c71a84ce51a7dab88eab6c9
parent63d460160c17bedd006b7a3d06a903924b705afb (diff)
downloadpx4-firmware-198df9c82ef94c17f8fe240957fbef1a796f8712.tar.gz
px4-firmware-198df9c82ef94c17f8fe240957fbef1a796f8712.tar.bz2
px4-firmware-198df9c82ef94c17f8fe240957fbef1a796f8712.zip
All apps compiling and linked (listed in NSH help), but not executing yet
-rw-r--r--Images/px4fmu-v1.prototype (renamed from Images/px4fmu.prototype)0
-rw-r--r--Images/px4io-v1.prototype (renamed from Images/px4io.prototype)0
-rwxr-xr-xROMFS/px4fmu_common/init.d/rcS7
-rw-r--r--makefiles/config_px4fmu-v1_default.mk3
4 files changed, 8 insertions, 2 deletions
diff --git a/Images/px4fmu.prototype b/Images/px4fmu-v1.prototype
index da88f8490..da88f8490 100644
--- a/Images/px4fmu.prototype
+++ b/Images/px4fmu-v1.prototype
diff --git a/Images/px4io.prototype b/Images/px4io-v1.prototype
index d00b7e5d9..d00b7e5d9 100644
--- a/Images/px4io.prototype
+++ b/Images/px4io-v1.prototype
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index c0a70f7dd..0efcc5db9 100755
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -69,7 +69,12 @@ else
then
echo "[init] USB interface connected"
else
- echo "[init] No USB connected"
+ if [ -f /dev/ttyACM0 ]
+ echo "[init] NSH via USB"
+ then
+ else
+ echo "[init] No USB connected"
+ fi
fi
fi
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 37a05c90f..4fc61e97d 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -129,4 +129,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, sysinfo, , 2048, sysinfo_main )