From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sat, 30 Apr 2016 15:46:48 +0000 (+0200)
Subject: fiasco:ned-configs: Replace ned configs for the ferret launch
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/1cfbbea7dc3846d2e027b31369b092bfe3dd062f

fiasco:ned-configs: Replace ned configs for the ferret launch
---

diff --git a/build/l4/ferret-mm.cfg b/build/l4/ferret-mm.cfg
deleted file mode 100644
index d9f98cd..0000000
--- a/build/l4/ferret-mm.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-local L4 = require("L4");
-
-local ld = L4.default_loader;
-local ferret = ld:new_channel();
-local sensordir = ld:new_channel();
-local monitor = ld:new_channel();
-
-ld:start(
-	{ 
-		caps = {
-			ferret=ferret:svr(),
-			sensordir=sensordir:svr(),
-			monitor=monitor:svr() 
-		},
-		log = {"ferret_sensors_dir", "yellow" }
-	},
-	"rom/ferret_sensor_dir"
-);
-
-ld:start(
-        {
-                caps = { ferret=sensordir },
-                log = { "fer_scalar_demo", "green" }
-        },
-
-        "rom/fer_scalar_demo"
-);
-
-
-ld:start(
-	{ 
-		caps = { ferret=sensordir },
-	  	log = { "fer_merge_mon", "red" }
-	},
-
-	"rom/fer_merge_mon -d 10 -i 100 --nogui -s 10:1:0 -s 10:2:0 -s 10:3:0 -s 10:4:0"
-);
diff --git a/build/l4/ferret-list.cfg b/build/l4/ned-confs/ferret-list.cfg
similarity index 100%
rename from build/l4/ferret-list.cfg
rename to build/l4/ned-confs/ferret-list.cfg
diff --git a/build/l4/ned-confs/ferret-mm.cfg b/build/l4/ned-confs/ferret-mm.cfg
new file mode 100644
index 0000000..17c91e7
--- /dev/null
+++ b/build/l4/ned-confs/ferret-mm.cfg
@@ -0,0 +1,55 @@
+local L4 = require("L4");
+
+local ld = L4.default_loader;
+local ferret = ld:new_channel();
+local sensordir = ld:new_channel();
+
+ld:start(
+	{ 
+		caps = {
+			ferret=ferret:svr(),
+			sensordir=sensordir:svr(),
+		},
+		log = {"ferret_sensors_dir", "yellow" }
+	},
+	"rom/ferret_sensor_dir"
+);
+
+ld:start(
+        {
+                caps = { ferret=sensordir },
+                log = { "fer_scalar_demo", "green" }
+        },
+
+        "rom/fer_scalar_demo"
+);
+
+--ld:start(
+--        {
+--                caps = { ferret=sensordir },
+--                log = { "fer_list_demo", "magenta" }
+--        },
+--
+--        "rom/fer_list_demo"
+--);
+
+
+-- ld:start(
+--	{ 
+--		caps = { ferret=sensordir },
+--	  	log = { "fer_merge_mon", "red" }
+--	},
+--
+--	"rom/fer_merge_mon -v -d 10 -i 100 --nogui -s 10:1:0 -s 10:2:0 -s 10:3:0 -s 10:4:0"
+--
+--);
+
+ld:start(
+        {
+                caps = { ferret=sensordir },
+                log = { "fer_simple_mon", "red" }
+        },
+
+        "rom/fer_simple_mon"
+);
+	
diff --git a/build/l4/ferret-scalar.cfg b/build/l4/ned-confs/ferret-scalar.cfg
similarity index 100%
rename from build/l4/ferret-scalar.cfg
rename to build/l4/ned-confs/ferret-scalar.cfg