summaryrefslogtreecommitdiff
path: root/maximus/system
diff options
context:
space:
mode:
authorburet2007-06-15 09:55:32 +0000
committerburet2007-06-15 09:55:32 +0000
commit02bfb83277c2a2ffe19fb7a38a6254607da58484 (patch)
treed6ad9a15da2ed08284fa7617713da148b9958ab0 /maximus/system
parent6362b0250f557d44e16d0c61d4e12b10899484cd (diff)
- Replace NetworkClockEvt pointers by references
- Set specialized SCI msg header correction git-svn-id: svn+ssh://pessac/svn/cesar/trunk@302 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'maximus/system')
-rw-r--r--maximus/system/inc/Station.h2
-rw-r--r--maximus/system/src/Station.cpp27
-rw-r--r--maximus/system/src/SystemSciMsg.cpp4
3 files changed, 31 insertions, 2 deletions
diff --git a/maximus/system/inc/Station.h b/maximus/system/inc/Station.h
index bc8834bfcf..4914b88710 100644
--- a/maximus/system/inc/Station.h
+++ b/maximus/system/inc/Station.h
@@ -183,6 +183,8 @@ private:
void launchEcosProcess ( const char * station_exec );
void initAttributes ( );
+
+ void displayStationStatus ( ) const;
protected:
diff --git a/maximus/system/src/Station.cpp b/maximus/system/src/Station.cpp
index 749cf63b77..a440d020b9 100644
--- a/maximus/system/src/Station.cpp
+++ b/maximus/system/src/Station.cpp
@@ -231,7 +231,9 @@ bool Station::setStationStatus ( const Station_Status status )
//clog << "Station::setStationStatus" << endl;
mStationStatus = status;
- //clog << "\tstation status = " << mStationStatus << endl;
+ //clog << "\tstation status = ";
+ //displayStationStatus();
+ //clog << endl;
return true;
}
@@ -299,6 +301,29 @@ void Station::launchEcosProcess ( const char * station_exec )
}
+void Station::displayStationStatus ( ) const
+{
+ switch (getStationStatus())
+ {
+ case 0:
+ clog << "MAXIMUS_STATION_STATUS_NONE";
+ break;
+ case 1:
+ clog << "MAXIMUS_STATION_STATUS_IDLE";
+ break;
+ case 2:
+ clog << "MAXIMUS_STATION_STATUS_BUSY";
+ break;
+ case 3:
+ clog << "MAXIMUS_STATION_STATUS_DEACTIVATED";
+ break;
+ default:
+ clog << "unknown";
+ break;
+ }
+}
+
+
// protected methods
//
diff --git a/maximus/system/src/SystemSciMsg.cpp b/maximus/system/src/SystemSciMsg.cpp
index 0ebd9907cb..b714fee3ac 100644
--- a/maximus/system/src/SystemSciMsg.cpp
+++ b/maximus/system/src/SystemSciMsg.cpp
@@ -292,8 +292,10 @@ bool SystemSciMsg::setSpecializedSciMsgHeader ( const System_Header * p_speciali
if ( (NULL != p_specialized_sci_msg_header) && (NULL != mpSpecializedSciMsgHeader) )
{
*mpSpecializedSciMsgHeader = *p_specialized_sci_msg_header;
+
+ bSetHeader = setSpecializedSciMsgType (static_cast<System_Type>(getSpecializedSciMsgHeader()->type));
+
displaySpecializedSciMsgHeader();
- bSetHeader = true;
}
else
{