[canmet] Update README.org

2013-canmet/README.org

@@ -81,7 +81,7 @@ wireless card. The gain of these antennas at 2.4 GHz is 3 dBi.
 
 The mobile terminal is a MikroTik RouterBoard 411AH powered by a
 portable car battery booster kit that provides 110 V AC power plugs (and
-is freaking heavy!).
+is freaking heavy!). The operating system is OpenWrt 12.09.
 
 *** Capture points
 
@@ -91,30 +91,39 @@ different models:
 - CP5 and CP6: RouterBoard 411
 (There is no CP4.)
 
+Like the mobile terminal, they all run OpenWrt 12.09.
+
 *** Aggregation server
 
 Lenovo ThinkPad X200 running Debian GNU/Linux unstable (Linux 3.9).
 
 ** Position of the capture points
 
+FIXME (cf. Position des bornes)
+
+CP1, CP2 and CP5 are powered by a 24 V PoE (Power over Ethernet) switch
+located next to CP1; CP3 and CP6 are powered by two PoE injectors
+located next to CP3.
+
+CP2 sits on top of a plastic door with a wooden frame; its antenna is
+20 cm south of the door.
+
 CP3 is put on a block of concrete, its antenna is at 0.70 m above the
 floor, in vertical position, in direction of the ceiling. The other
 capture points are attached to the ceiling and have their antennas in
 vertical position, in the direction of the ground.
 
-The capture points' coordinates are given in the OwlPS Positioner's
+Ground coordinates:
+- CP1: 128.25;142.40
+- CP2: 160.85;78.30
+- CP3: 177.90;18.15
+- CP5: 72.10;122
+- CP6: 121.80;-21.10
+
+The capture points' coordinates are also given in the OwlPS Positioner's
 configuration file [[./owlps-config/listeners-rb.csv]], and you can also
 visuazise their positions on the map [[./figures/canmet70.svg]].
 
-FIXME (cf. Position des bornes)
-
-CP2 sits on top of a plastic door with a wooden frame; its antenna is
-20 cm south of the door.
-
-CP1, CP2 and CP5 are powered by a 24 V PoE (Power over Ethernet) switch
-located next to CP1; CP3 and CP6 are powered by two PoE injectors
-located next to CP3.
-
 ** Network set up
 
 The capture points and the aggregation server are connected through an
@@ -225,14 +234,36 @@ The complete command used to launch OwlPS Client is the following:
 
 ** TODO Measurement points
 
+For simplicity's sake, we defined a bunch of measurement points that
+can be used in the description of the scenarios. They are named after
+their proximity to the capture points.
+
+- North tunnel:
+  - MP1 :: next to CP1 (s07_t02): 127;141
+  - MP11 :: east of CP1, line of sight: 155.50;158.50
+  - MP12 :: east of CP1, 10 m north: 155.50;168.50
+  - MP51 :: west intersection: 2;85.50
+  - MP52 :: between CP5 and the west intersection: 47.50;99.50
+- East tunnel:
+  - MP3 :: next to CP3: 184;18.50
+  - MP31 :: water tank: 198;24
+  - MP22 :: between CP2 and CP3: 173;48
+- South tunnel:
+  - MP6 :: next to CP6: 121.80;-21.50
+  - MP61 :: emergency exit, at 2 m from the end of the tunnel, 49 m from
+            CP6, middle of the tunnel (about 1.10 m from each side):
+            75.50;-34.50
+  - MP62 :: west ore loading point near the exit: 94.50;-29.50
+
 
 * Scenarios
 
 Scenarios are divided in three series, and the scenario number starts
-with the series number:
+ewith the series number:
 - Series 0 :: the client terminal is static, with no operator in the
               measurement area.
-- Series 1 :: ditto, but in unfavourable locations.
+- Series 1 :: ditto, but in unfavourable locations (uncovered areas,
+              deep recesses, etc.).
 - Series 2 :: the client terminal is carried by a human operator, which
               can be either static or in motion.
 - Series 3 :: the client terminal is attached to a vehicle.
@@ -397,8 +428,8 @@ mounted on a small mine transporter of the following dimensions:
 The terminal is attached at 1.70 m above the ground level, and is at
 0.30 m from the left side of the vehicle.
 
-The vehicle starts from the the nearest ore loading point from the
-emergency exit (it was to big to go at the very end of the tunnel). It
-then follows almost the same path as in scenario 22, stopping next to
-each capture point in the same way. After CP5, the vehicle continues to
-the west intersection.
+Since it is too big to go at the very end of the tunnel near the
+emergency exit, the vehicle starts from the last ore loading point (the
+nearest from the emergency exit). It then follows almost the same path
+as in scenario 22, stopping next to each capture point in the same
+way. After CP5, the vehicle continues to the west intersection.