Index: /nodes/CNodeAJSoft/wleiden.conf
===================================================================
--- /nodes/CNodeAJSoft/wleiden.conf	(revision 6566)
+++ /nodes/CNodeAJSoft/wleiden.conf	(revision 6567)
@@ -67,5 +67,5 @@
 
 POLAR=Ver
-ANTENNA=omni
+ANTENNA=double waveguide
 GAIN=6dBi
 DIRECTION=omni
@@ -140,14 +140,4 @@
 EW2
 
-$config{'wi2:0'}=sprintf <<EW20;  # Link naar Meca
-TYPE=wireless
-IP=172.16.1.77/30
-DESC=Link naar Meca
-SDESC=2meca
-SPEED=11534336
-POINT_TO_POINT=172.16.1.78
-
-EW20
-
 
 $config{'wi3'}=sprintf <<EW3;
Index: /nodes/CNodeAMWaterT1/wleiden.conf
===================================================================
--- /nodes/CNodeAMWaterT1/wleiden.conf	(revision 6566)
+++ /nodes/CNodeAMWaterT1/wleiden.conf	(revision 6567)
@@ -3,5 +3,5 @@
 #
 # config CNodeAMWaterT1
-$location="Aalsmeer Watertoren Node1";
+$location="Watertoren, Kudelstaartseweg,1431GA, Aalsmeer";
 $master_ip='172.25.90.1';  
 $gw_open='closed';
@@ -17,7 +17,7 @@
 $status='up';
 
-# edugis x,y 107030,471206 = 52gr 15min NB  4gr 45min EL
-$X='111307';
-$Y='453344';
+# edugis x,y 11200, 474279 = 52.25486gr  NB  4.75744 gr EL
+$X='11200';
+$Y='474279';
 
 $AGGREGATE=22;
Index: /nodes/CNodeAMWaterT2/wleiden.conf
===================================================================
--- /nodes/CNodeAMWaterT2/wleiden.conf	(revision 6567)
+++ /nodes/CNodeAMWaterT2/wleiden.conf	(revision 6567)
@@ -0,0 +1,105 @@
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeAMWaterT2
+$location="Watertoren, Kudelstaartseweg,1431GA, Aalsmeer";
+$master_ip='172.25.94.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='AMwtrt2';
+$release="5.0-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+$labelpos='right';
+
+$status='up';
+
+edugis x,y 11200, 474279 = 52.25486gr  NB  4.75744 gr EL
+$X='11200';
+$Y='474279';
+
+$AGGREGATE=22;
+
+$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+TYPE=ethernet
+IP=172.25.94.65/29
+
+DESC=Ethernet poort 0 van watertoren 2
+SDESC=eth
+SPEED=10240000000
+
+DHCP=no
+
+
+ED0
+
+$config{'sis1'}=sprintf <<ED1;  # ethernet poort 1 naar node watertoren 1 
+TYPE=ethernet
+IP=172.16.2.122/30
+
+DESC=Ethernet naar watertoren 1
+SDESC=2wtrt2
+SPEED=10240000000
+
+DHCP=no
+
+POINT_TO_POINT=172.16.2.121
+
+
+ED1
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI voor Watertoren
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=APwatertoren  voor de westeinderplas
+SDESC=apamwtrtrn
+SPEED=11534336
+
+DHCP=10-60
+
+
+MODE=master
+ESSID=ap.AMWaterTrn.wleiden.net
+CHANNEL=5
+
+POLAR=Horz
+ANTENNA=omni
+GAIN=5dBi
+DIRECTION=40
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=17
+
+EW0
+
+#$config{'wi1'}=sprintf <<EW1;  # link naar onbekend
+#TYPE=wireless
+#IP=172.16.1.209/30
+#DESC=Link naar onbekend
+#SDESC=2onbekend
+#SPEED=11534336
+#POINT_TO_POINT=172.16.1.210
+
+
+#SPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.1.210
+
+#MODE=master
+#ESSID=il-no.amonbekend.wleiden.net
+#CHANNEL=9
+
+#POLAR=Vert
+#ANTENNA=SD15
+#GAIN=15dBi
+#DIRECTION=280
+#BEAMWIDTH=40
+#CABLE=1
+#HEIGTH=17
+#DHCP=no
+
+#EW1
+
+
Index: /nodes/CNodeDirkLos1/wleiden.conf
===================================================================
--- /nodes/CNodeDirkLos1/wleiden.conf	(revision 6566)
+++ /nodes/CNodeDirkLos1/wleiden.conf	(revision 6567)
@@ -21,5 +21,5 @@
 # edugis x,y 92299,464748
 $X='092299';
-$Y='464748*';
+$Y='464748';
 
 $config{'sis0'}=sprintf <<EE0;  # Local ethernet naar DirkLos2 met PoE
Index: /nodes/CNodeDirkLos2/wleiden.conf
===================================================================
--- /nodes/CNodeDirkLos2/wleiden.conf	(revision 6566)
+++ /nodes/CNodeDirkLos2/wleiden.conf	(revision 6567)
@@ -22,5 +22,5 @@
 # edugis x,y 92299,464748
 $X='092299';
-$Y='464748*';
+$Y='464748';
 
 $config{'sis0'}=sprintf <<SIS0;  # Local ethernet naar Hogeschool met PoE voeding vanuit ketelhuis
Index: /nodes/CNodeRudi/wleiden.conf
===================================================================
--- /nodes/CNodeRudi/wleiden.conf	(revision 6566)
+++ /nodes/CNodeRudi/wleiden.conf	(revision 6567)
@@ -105,26 +105,26 @@
 EW2
 
-#$config{'wi3'}=sprintf <<EW3;
-#TYPE=wireless
-#IP=172.16.0.186/30
-#DESC=Link naar Lijtweg1
-#SDESC=2lijtweg1
-#SPEED=11534336
-#POINT_TO_POINT=172.16.0.185
-#
-#MODE=managed
-#ESSID=il-o.lijtweg1.wleiden.net
-#
-#POLAR=Vert
-#ANTENNA=SD15
-#GAIN=13dBi
-#DIRECTION=210
-#BEAMWIDTH=35
-#CABLE=1
-#HEIGTH=9
-#
-#DHCP=no
-#
-#EW3
+$config{'wi3'}=sprintf <<EW3;
+TYPE=wireless
+IP=172.16.0.186/30
+DESC=Link naar Lijtweg1
+SDESC=2lijtweg1
+SPEED=11534336
+POINT_TO_POINT=172.16.0.185
+
+MODE=managed
+ESSID=il-o.lijtweg1.wleiden.net
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=210
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=9
+
+DHCP=no
+
+EW3