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

Bug 1680: Automatic checkin of merge of branch MAC-20110418-1_0-release-branch... 

Bug 1680: Automatic checkin of merge of branch MAC-20110418-1_0-release-branch (svn-17856 - svn-17871) in trunk
parent baf60760
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+ 6
− 0
View file @ ad6aff4a
......@@ -803,6 +803,12 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event)
LOG_INFO_STR ("Received unknown command " << command << ". Ignoring it.");
}
// When datapoint does not concern the observation itself, where are done
string observationDPname(itsObsDPname+".");
if (!strstr(dpEvent.DPname.c_str(), observationDPname.c_str())) {
return;
}
// Change of claim_period?
if (strstr(dpEvent.DPname.c_str(), PN_OBS_CLAIM_PERIOD) != 0) {
uint32 newVal = ((GCFPVInteger*) (dpEvent.value._pValue))->getValue();
......
MAC/Deployment/data/StaticMetaData/MAC+IP.dat
+ 1
− 2
View file @ ad6aff4a
......@@ -202,8 +202,7 @@ R02-M1-N14-J00 10.170.2.185 00:14:5E:7D:23:DB
R02-M1-N14-J01 10.170.2.186 00:14:5E:7D:23:DC
R02-M1-N15-J00 10.170.2.189 00:14:5E:7D:1D:51
R02-M1-N15-J01 10.170.2.190 00:14:5E:7D:1D:52
LIST001 10.181.0.1 00:19:B9:D8:E4:C7
LIST002 10.181.0.2 00:19:B9:D8:E4:B3
R00-BG3-DE601 10.170.0.29 00:12:F2:C6:BB:00
R00-BG1-DE602 10.170.0.182 00:12:F2:C6:C1:00
R00-BG1-DE603 10.170.0.38 00:12:F2:C6:C1:00
......
MAC/Deployment/data/StaticMetaData/Storage+MAC.dat
+ 1
− 1
View file @ ad6aff4a
......@@ -107,7 +107,7 @@ locus077 00:00:00:00:00:00 10.135.255.2
locus078 00:00:00:00:00:00 10.135.255.3
locus079 00:00:00:00:00:00 10.135.255.4
locus080 00:00:00:00:00:00 10.135.255.5
locus081 00:00:00:00:00:00 10.135.255.6
locus081 00:02:c9:0e:37:fe 10.135.255.6
locus082 00:00:00:00:00:00 10.135.255.7
locus083 00:00:00:00:00:00 10.135.255.8
locus084 00:00:00:00:00:00 10.135.255.9
......
MAC/Deployment/data/StaticMetaData/TBBConnections.dat
+ 73
− 73
View file @ ad6aff4a
......@@ -6,88 +6,88 @@
# $Id: $
#
# Station Board DestinationNode
CS001 TBB_0 lse005
CS002 TBB_0 lse004
CS003 TBB_0 lse005
CS004 TBB_0 lse006
CS005 TBB_0 lse004
CS006 TBB_0 lse005
CS007 TBB_0 lse006
CS010 TBB_0 lse004
CS011 TBB_0 lse006
CS012 TBB_0 lse005
CS013 TBB_0 lse005
CS014 TBB_0 lse004
CS015 TBB_0 lse004
CS016 TBB_0 lse004
CS017 TBB_0 lse006
CS018 TBB_0 lse004
CS019 TBB_0 lse004
CS020 TBB_0 lse004
CS021 TBB_0 lse004
CS022 TBB_0 lse004
CS023 TBB_0 lse004
CS024 TBB_0 lse004
CS026 TBB_0 lse005
CS028 TBB_0 lse004
CS029 TBB_0 lse004
CS030 TBB_0 lse006
CS031 TBB_0 lse006
CS032 TBB_0 lse006
CS001 TBB_0 locus081
CS002 TBB_0 locus081
CS003 TBB_0 locus081
CS004 TBB_0 locus081
CS005 TBB_0 locus081
CS006 TBB_0 locus081
CS007 TBB_0 locus081
CS010 TBB_0 locus081
CS011 TBB_0 locus081
CS012 TBB_0 locus081
CS013 TBB_0 locus081
CS014 TBB_0 locus081
CS015 TBB_0 locus081
CS016 TBB_0 locus081
CS017 TBB_0 locus081
CS018 TBB_0 locus081
CS019 TBB_0 locus081
CS020 TBB_0 locus081
CS021 TBB_0 locus081
CS022 TBB_0 locus081
CS023 TBB_0 locus081
CS024 TBB_0 locus081
CS026 TBB_0 locus081
CS028 TBB_0 locus081
CS029 TBB_0 locus081
CS030 TBB_0 locus081
CS031 TBB_0 locus081
CS032 TBB_0 locus081
#
CS101 TBB_0 lse004
CS103 TBB_0 lse004
CS201 TBB_0 lse004
CS301 TBB_0 lse006
CS302 TBB_0 lse004
CS401 TBB_0 lse005
CS501 TBB_0 lse005
CS101 TBB_0 locus081
CS103 TBB_0 locus081
CS201 TBB_0 locus081
CS301 TBB_0 locus081
CS302 TBB_0 locus081
CS401 TBB_0 locus081
CS501 TBB_0 locus081
# Test stations
RS005 TBB_0 LIST001
CS099 TBB_0 LIST001
RS005 TBB_0 locus081
CS099 TBB_0 locus081
#
# Remote Stations
#
RS104 TBB_0 lse005
RS106 TBB_0 lse004
RS107 TBB_0 lse005
RS104 TBB_0 locus081
RS106 TBB_0 locus081
RS107 TBB_0 locus081
#
RS205 TBB_0 lse005
RS206 TBB_0 lse005
RS207 TBB_0 lse005
RS208 TBB_0 lse004
RS210 TBB_0 lse005
RS205 TBB_0 locus081
RS206 TBB_0 locus081
RS207 TBB_0 locus081
RS208 TBB_0 locus081
RS210 TBB_0 locus081
#
RS306 TBB_0 lse004
RS307 TBB_0 lse004
RS308 TBB_0 lse005
RS309 TBB_0 lse005
RS310 TBB_0 lse005
RS311 TBB_0 lse004
RS306 TBB_0 locus081
RS307 TBB_0 locus081
RS308 TBB_0 locus081
RS309 TBB_0 locus081
RS310 TBB_0 locus081
RS311 TBB_0 locus081
#
RS404 TBB_0 lse005
RS406 TBB_0 lse006
RS407 TBB_0 lse006
RS408 TBB_0 lse005
RS409 TBB_0 lse006
RS410 TBB_0 lse006
RS411 TBB_0 lse004
RS412 TBB_0 lse004
RS413 TBB_0 lse004
RS404 TBB_0 locus081
RS406 TBB_0 locus081
RS407 TBB_0 locus081
RS408 TBB_0 locus081
RS409 TBB_0 locus081
RS410 TBB_0 locus081
RS411 TBB_0 locus081
RS412 TBB_0 locus081
RS413 TBB_0 locus081
#
RS503 TBB_0 lse004
RS506 TBB_0 lse005
RS507 TBB_0 lse005
RS508 TBB_0 lse006
RS509 TBB_0 lse004
RS503 TBB_0 locus081
RS506 TBB_0 locus081
RS507 TBB_0 locus081
RS508 TBB_0 locus081
RS509 TBB_0 locus081
#
# European stations
#
DE601 TBB_0 lse004
DE602 TBB_0 lse005
DE603 TBB_0 lse004
DE604 TBB_0 lse005
DE605 TBB_0 lse005
FR606 TBB_0 lse006
SE607 TBB_0 lse006
UK608 TBB_0 lse006
DE601 TBB_0 locus081
DE602 TBB_0 locus081
DE603 TBB_0 locus081
DE604 TBB_0 locus081
DE605 TBB_0 locus081
FR606 TBB_0 locus081
SE607 TBB_0 locus081
UK608 TBB_0 locus081
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