Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
993bba5f
Commit
993bba5f
authored
18 years ago
by
Ruud Overeem
Browse files
Options
Downloads
Patches
Plain Diff
BugID: 679
Introduced setStatte function.
parent
721174ea
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+29
-1
29 additions, 1 deletion
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+3
-0
3 additions, 0 deletions
MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
with
32 additions
and
1 deletion
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+
29
−
1
View file @
993bba5f
...
@@ -59,7 +59,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
...
@@ -59,7 +59,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
itsChildPort
(
0
),
itsChildPort
(
0
),
itsParentControl
(
0
),
itsParentControl
(
0
),
itsParentPort
(
0
),
itsParentPort
(
0
),
itsTimerPort
(
0
)
itsTimerPort
(
0
),
itsState
(
CTState
::
NOSTATE
)
{
{
LOG_TRACE_OBJ_STR
(
cntlrName
<<
" construction"
);
LOG_TRACE_OBJ_STR
(
cntlrName
<<
" construction"
);
...
@@ -88,6 +89,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
...
@@ -88,6 +89,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
registerProtocol
(
CONTROLLER_PROTOCOL
,
CONTROLLER_PROTOCOL_signalnames
);
registerProtocol
(
CONTROLLER_PROTOCOL
,
CONTROLLER_PROTOCOL_signalnames
);
registerProtocol
(
PA_PROTOCOL
,
PA_PROTOCOL_signalnames
);
registerProtocol
(
PA_PROTOCOL
,
PA_PROTOCOL_signalnames
);
setState
(
CTState
::
CREATED
);
}
}
...
@@ -106,6 +109,20 @@ ObservationControl::~ObservationControl()
...
@@ -106,6 +109,20 @@ ObservationControl::~ObservationControl()
// ...
// ...
}
}
//
// setState(CTstateNr)
//
void
ObservationControl
::
setState
(
CTState
::
CTstateNr
newState
)
{
itsState
=
newState
;
if
(
itsPropertySet
)
{
CTState
cts
;
itsPropertySet
->
setValue
(
string
(
PVSSNAME_FSM_STATE
),
GCFPVString
(
cts
.
name
(
newState
)));
}
}
//
//
// handlePropertySetAnswer(answer)
// handlePropertySetAnswer(answer)
...
@@ -167,6 +184,17 @@ void ObservationControl::handlePropertySetAnswer(GCFEvent& answer)
...
@@ -167,6 +184,17 @@ void ObservationControl::handlePropertySetAnswer(GCFEvent& answer)
break
;
break
;
}
}
// case F_SUBSCRIBED:
// case F_UNSUBSCRIBED:
// case F_PS_CONFIGURED:
// case F_EXTPS_LOADED:
// case F_EXTPS_UNLOADED:
// case F_MYPS_ENABLED:
// case F_MYPS_DISABLED:
// case F_VGETRESP:
// case F_VCHANGEMSG:
// case F_SERVER_GONE:
default
:
default
:
break
;
break
;
}
}
...
...
This diff is collapsed.
Click to expand it.
MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+
3
−
0
View file @
993bba5f
...
@@ -88,6 +88,7 @@ private:
...
@@ -88,6 +88,7 @@ private:
ObservationControl
(
const
ObservationControl
&
);
ObservationControl
(
const
ObservationControl
&
);
ObservationControl
&
operator
=
(
const
ObservationControl
&
);
ObservationControl
&
operator
=
(
const
ObservationControl
&
);
void
setState
(
CTState
::
CTstateNr
newState
);
void
_connectedHandler
(
GCFPortInterface
&
port
);
void
_connectedHandler
(
GCFPortInterface
&
port
);
void
_disconnectedHandler
(
GCFPortInterface
&
port
);
void
_disconnectedHandler
(
GCFPortInterface
&
port
);
boost
::
shared_ptr
<
ACC
::
APS
::
ParameterSet
>
boost
::
shared_ptr
<
ACC
::
APS
::
ParameterSet
>
...
@@ -121,6 +122,8 @@ private:
...
@@ -121,6 +122,8 @@ private:
GCFTimerPort
*
itsTimerPort
;
GCFTimerPort
*
itsTimerPort
;
CTState
::
CTstateNr
itsState
;
// ParameterSet variables
// ParameterSet variables
string
itsTreePrefix
;
string
itsTreePrefix
;
uint32
itsInstanceNr
;
uint32
itsInstanceNr
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment