From 2347657d081d9ac05cc023047e2dde47f961d277 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Wed, 23 Jun 2010 15:00:46 +0200
Subject: [PATCH] [Positioning] Clean config files

Delete access_points.cfg and accesspoints.cfg.
Delete owlps-positioning.conf, add owlps-positioning.cfg.
minips.cfg becomes minipc.csv.
---
 owlps-positioning/cfg/access_points.cfg       |  5 ----
 owlps-positioning/cfg/accesspoints.cfg        |  3 ---
 .../cfg/{minipc.cfg => minipc.csv}            |  3 ++-
 owlps-positioning/cfg/owlps-positioning.cfg   | 24 +++++++++++++++++++
 owlps-positioning/cfg/owlps-positioning.conf  |  9 -------
 5 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 owlps-positioning/cfg/access_points.cfg
 delete mode 100644 owlps-positioning/cfg/accesspoints.cfg
 rename owlps-positioning/cfg/{minipc.cfg => minipc.csv} (80%)
 create mode 100644 owlps-positioning/cfg/owlps-positioning.cfg
 delete mode 100644 owlps-positioning/cfg/owlps-positioning.conf

diff --git a/owlps-positioning/cfg/access_points.cfg b/owlps-positioning/cfg/access_points.cfg
deleted file mode 100644
index 2efb7ba..0000000
--- a/owlps-positioning/cfg/access_points.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#mac@;x;y;z;antenna;power
-00:09:5b:42:ed:5b;4.50;22.00;0.00;5.00;20.00
-00:13:10:1f:77:5f;1.50;5.50;3.00;2.00;20.00
-00:18:39:c5:c3:26;25.00;20.00;0.00;2.00;20.00
-
diff --git a/owlps-positioning/cfg/accesspoints.cfg b/owlps-positioning/cfg/accesspoints.cfg
deleted file mode 100644
index 67326ba..0000000
--- a/owlps-positioning/cfg/accesspoints.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-00:09:5b:42:ed:5b;3.50;22.50;0.00;2462000000;5.0;20.0
-00:13:10:1f:77:5f;1.70;4.70;3.00;2462000000;2.1;20.0
-00:18:39:c5:c3:26;27.0;20.0;0.00;2462000000;2.1;20.0
diff --git a/owlps-positioning/cfg/minipc.cfg b/owlps-positioning/cfg/minipc.csv
similarity index 80%
rename from owlps-positioning/cfg/minipc.cfg
rename to owlps-positioning/cfg/minipc.csv
index 643786b..0422be5 100644
--- a/owlps-positioning/cfg/minipc.cfg
+++ b/owlps-positioning/cfg/minipc.csv
@@ -1,7 +1,8 @@
 # Fichier de configuration pour les AP.
 # Chaque ligne est de la forme :
 #   MAC;X;Y;Z;Fréquence d'émission (Hz);Gain d'antenne (dBi);Puissance d'émission (dBm)
-# Les lignes vides ou commençant par un # sont ignorées. Les commentaires doivent obligatoirement être en début de ligne.
+# Les lignes vides ou commençant par un # sont ignorées. Les
+# commentaires doivent obligatoirement être en début de ligne.
 
 # mini5 (Laseldi) 
 00:13:CE:95:E1:6F;4.93;25.81;3.55;2417000000;5.0;20.0
diff --git a/owlps-positioning/cfg/owlps-positioning.cfg b/owlps-positioning/cfg/owlps-positioning.cfg
new file mode 100644
index 0000000..e296162
--- /dev/null
+++ b/owlps-positioning/cfg/owlps-positioning.cfg
@@ -0,0 +1,24 @@
+# Sample configuration file for OWLPS Positioning
+
+[data-input]
+
+topology-medium = CSV
+areas-csv-file = cfg/topo.csv
+waypoints-csv-file = cfg/waypoints.csv
+
+reference-points-medium = CSV
+reference-points-csv-file = csv/toutes_1ppp.csv
+
+[input]
+
+medium = CSV
+csv-file = csv/divagation9_timestamp+mobile.csv
+
+[positioning]
+
+#algorithm = FRBHMBasic
+
+[output]
+
+medium = CSV
+csv-file = /tmp/out.log
diff --git a/owlps-positioning/cfg/owlps-positioning.conf b/owlps-positioning/cfg/owlps-positioning.conf
deleted file mode 100644
index 670ff77..0000000
--- a/owlps-positioning/cfg/owlps-positioning.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[server]
-port = 9902
-mobile-port = 9903
-
-[db]
-name = owlps_db
-host = 172.20.105.4
-user = jgraeffly
-passwd = owlps