Skip to content
Snippets Groups Projects
Commit 518cae47 authored by Arno Schoenmakers's avatar Arno Schoenmakers
Browse files

Bug 1581: Intermediate merge of release branch MAC-20101005-1_0-release-branch with trunk

parent 0818b873
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in
+ 1
− 1
View file @ 518cae47
...@@ -8,7 +8,7 @@ OTDBpassword = boskabouter ...@@ -8,7 +8,7 @@ OTDBpassword = boskabouter
OTDBpollInterval = 5s OTDBpollInterval = 5s
# startup periods of Observations # startup periods of Observations
QueuePeriod = 6m QueuePeriod = 3m
ClaimPeriod = 2m ClaimPeriod = 2m
# manage lists of observations # manage lists of observations
......
MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in
+ 1
− 1
View file @ 518cae47
...@@ -25,5 +25,5 @@ BeamServer.BeamformerGain=8000 ...@@ -25,5 +25,5 @@ BeamServer.BeamformerGain=8000
# #
# Set name for various configuration files # Set name for various configuration files
# #
BeamServer.HBADeltasFile=HBADeltas.conf BeamServer.HBADeltasFile=iHBADeltas.conf
BeamServer.HBAElementDelaysFile=HBADelays.conf BeamServer.HBAElementDelaysFile=HBADelays.conf
MAC/Deployment/data/StaticMetaData/MAC+IP.dat
+ 1
− 1
View file @ 518cae47
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# node IP MAC # node IP MAC
#----------------------------------------------- #-----------------------------------------------
R00-M0-N00-J00 10.170.0.1 00:14:5E:7D:33:75 R00-M0-N00-J00 10.170.0.1 00:14:5E:7D:33:75
R00-M0-N00-J01 10.170.0.2 00:14:5E:7D:33.76 R00-M0-N00-J01 10.170.0.2 00:14:5E:7D:33:76
R00-M0-N01-J00 10.170.0.5 00:14:5E:7D:95:B0 R00-M0-N01-J00 10.170.0.5 00:14:5E:7D:95:B0
R00-M0-N01-J01 10.170.0.6 00:14:5E:7D:95:B1 R00-M0-N01-J01 10.170.0.6 00:14:5E:7D:95:B1
R00-M0-N02-J00 10.170.0.9 00:14:5E:7D:1B:A9 R00-M0-N02-J00 10.170.0.9 00:14:5E:7D:1B:A9
......
MAC/Deployment/data/StaticMetaData/TBBConnections.dat
+ 36
− 53
View file @ 518cae47
...@@ -6,23 +6,21 @@ ...@@ -6,23 +6,21 @@
# $Id: $ # $Id: $
# #
# Station Board DestinationNode # Station Board DestinationNode
CS001 TBB_0 lse004 CS001 TBB_0 lse005
CS002 TBB_0 lse004 CS002 TBB_0 lse004
CS003 TBB_0 lse004 CS003 TBB_0 lse005
CS004 TBB_0 lse004 CS004 TBB_0 lse006
CS005 TBB_0 lse004 CS005 TBB_0 lse004
CS006 TBB_0 lse004 CS006 TBB_0 lse005
CS007 TBB_0 lse004 CS007 TBB_0 lse006
CS008 TBB_0 lse004
CS009 TBB_0 lse004
CS010 TBB_0 lse004 CS010 TBB_0 lse004
CS011 TBB_0 lse004 CS011 TBB_0 lse006
CS012 TBB_0 lse004 CS012 TBB_0 lse005
CS013 TBB_0 lse004 CS013 TBB_0 lse005
CS014 TBB_0 lse004 CS014 TBB_0 lse004
CS015 TBB_0 lse004 CS015 TBB_0 lse004
CS016 TBB_0 lse004 CS016 TBB_0 lse004
CS017 TBB_0 lse004 CS017 TBB_0 lse006
CS018 TBB_0 lse004 CS018 TBB_0 lse004
CS019 TBB_0 lse004 CS019 TBB_0 lse004
CS020 TBB_0 lse004 CS020 TBB_0 lse004
...@@ -30,23 +28,20 @@ CS021 TBB_0 lse004 ...@@ -30,23 +28,20 @@ CS021 TBB_0 lse004
CS022 TBB_0 lse004 CS022 TBB_0 lse004
CS023 TBB_0 lse004 CS023 TBB_0 lse004
CS024 TBB_0 lse004 CS024 TBB_0 lse004
CS025 TBB_0 lse004 CS026 TBB_0 lse005
CS026 TBB_0 lse004
CS027 TBB_0 lse004
CS028 TBB_0 lse004 CS028 TBB_0 lse004
CS029 TBB_0 lse004 CS029 TBB_0 lse004
CS030 TBB_0 lse004 CS030 TBB_0 lse006
CS031 TBB_0 lse004 CS031 TBB_0 lse006
CS032 TBB_0 lse004 CS032 TBB_0 lse006
# #
CS101 TBB_0 lse004 CS101 TBB_0 lse004
CS102 TBB_0 lse004
CS103 TBB_0 lse004 CS103 TBB_0 lse004
CS201 TBB_0 lse004 CS201 TBB_0 lse004
CS301 TBB_0 lse004 CS301 TBB_0 lse006
CS302 TBB_0 lse004 CS302 TBB_0 lse004
CS401 TBB_0 lse004 CS401 TBB_0 lse005
CS501 TBB_0 lse004 CS501 TBB_0 lse005
# Test stations # Test stations
RS005 TBB_0 LIST001 RS005 TBB_0 LIST001
CS099 TBB_0 LIST001 CS099 TBB_0 LIST001
...@@ -54,57 +49,45 @@ CS099 TBB_0 LIST001 ...@@ -54,57 +49,45 @@ CS099 TBB_0 LIST001
# Remote Stations # Remote Stations
# #
RS104 TBB_0 lse005 RS104 TBB_0 lse005
RS105 TBB_0 lse005 RS106 TBB_0 lse004
RS106 TBB_0 lse005
RS107 TBB_0 lse005 RS107 TBB_0 lse005
RS108 TBB_0 lse005
RS109 TBB_0 lse005
# #
RS202 TBB_0 lse005
RS203 TBB_0 lse005
RS204 TBB_0 lse005
RS205 TBB_0 lse005 RS205 TBB_0 lse005
RS206 TBB_0 lse005 RS206 TBB_0 lse005
RS207 TBB_0 lse005 RS207 TBB_0 lse005
RS208 TBB_0 lse005 RS208 TBB_0 lse004
RS209 TBB_0 lse005
RS210 TBB_0 lse005 RS210 TBB_0 lse005
# #
RS303 TBB_0 lse005 RS306 TBB_0 lse004
RS304 TBB_0 lse005 RS307 TBB_0 lse004
RS305 TBB_0 lse005
RS306 TBB_0 lse005
RS307 TBB_0 lse005
RS308 TBB_0 lse005 RS308 TBB_0 lse005
RS309 TBB_0 lse005 RS309 TBB_0 lse005
RS310 TBB_0 lse005 RS310 TBB_0 lse005
RS311 TBB_0 lse004
# #
RS402 TBB_0 lse005
RS403 TBB_0 lse005
RS404 TBB_0 lse005 RS404 TBB_0 lse005
RS405 TBB_0 lse005 RS406 TBB_0 lse006
RS406 TBB_0 lse005 RS407 TBB_0 lse006
RS407 TBB_0 lse005
RS408 TBB_0 lse005 RS408 TBB_0 lse005
RS409 TBB_0 lse005 RS409 TBB_0 lse006
RS410 TBB_0 lse005 RS410 TBB_0 lse006
RS411 TBB_0 lse004
RS412 TBB_0 lse004
RS413 TBB_0 lse004
# #
RS502 TBB_0 lse005 RS503 TBB_0 lse004
RS503 TBB_0 lse005
RS504 TBB_0 lse005
RS505 TBB_0 lse005
RS506 TBB_0 lse005 RS506 TBB_0 lse005
RS507 TBB_0 lse005 RS507 TBB_0 lse005
RS508 TBB_0 lse005 RS508 TBB_0 lse006
RS509 TBB_0 lse005 RS509 TBB_0 lse004
# #
# European stations # European stations
# #
DE601 TBB_0 lse006 DE601 TBB_0 lse004
DE602 TBB_0 lse006 DE602 TBB_0 lse005
DE603 TBB_0 lse006 DE603 TBB_0 lse004
DE604 TBB_0 lse006 DE604 TBB_0 lse005
DE605 TBB_0 lse006 DE605 TBB_0 lse005
FR606 TBB_0 lse006 FR606 TBB_0 lse006
SE607 TBB_0 lse006 SE607 TBB_0 lse006
UK608 TBB_0 lse006 UK608 TBB_0 lse006
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment