From 198df9c82ef94c17f8fe240957fbef1a796f8712 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sat, 1 Jun 2013 15:14:53 +0200
Subject: All apps compiling and linked (listed in NSH help), but not executing
 yet

---
 Images/px4fmu-v1.prototype            | 12 ++++++++++++
 Images/px4fmu.prototype               | 12 ------------
 Images/px4io-v1.prototype             | 12 ++++++++++++
 Images/px4io.prototype                | 12 ------------
 ROMFS/px4fmu_common/init.d/rcS        |  7 ++++++-
 makefiles/config_px4fmu-v1_default.mk |  3 ++-
 6 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 Images/px4fmu-v1.prototype
 delete mode 100644 Images/px4fmu.prototype
 create mode 100644 Images/px4io-v1.prototype
 delete mode 100644 Images/px4io.prototype

diff --git a/Images/px4fmu-v1.prototype b/Images/px4fmu-v1.prototype
new file mode 100644
index 000000000..da88f8490
--- /dev/null
+++ b/Images/px4fmu-v1.prototype
@@ -0,0 +1,12 @@
+{
+    "board_id": 5, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4FMU board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4FMU",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
diff --git a/Images/px4fmu.prototype b/Images/px4fmu.prototype
deleted file mode 100644
index da88f8490..000000000
--- a/Images/px4fmu.prototype
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "board_id": 5, 
-    "magic": "PX4FWv1", 
-    "description": "Firmware for the PX4FMU board", 
-    "image": "", 
-    "build_time": 0, 
-    "summary": "PX4FMU",
-    "version": "0.1",
-    "image_size": 0,
-    "git_identity": "",
-    "board_revision": 0
-}
diff --git a/Images/px4io-v1.prototype b/Images/px4io-v1.prototype
new file mode 100644
index 000000000..d00b7e5d9
--- /dev/null
+++ b/Images/px4io-v1.prototype
@@ -0,0 +1,12 @@
+{
+    "board_id": 7, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4IO board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4IO",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
diff --git a/Images/px4io.prototype b/Images/px4io.prototype
deleted file mode 100644
index d00b7e5d9..000000000
--- a/Images/px4io.prototype
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "board_id": 7, 
-    "magic": "PX4FWv1", 
-    "description": "Firmware for the PX4IO board", 
-    "image": "", 
-    "build_time": 0, 
-    "summary": "PX4IO",
-    "version": "0.1",
-    "image_size": 0,
-    "git_identity": "",
-    "board_revision": 0
-}
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               )
-- 
cgit v1.2.3