Changeset 2615 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

12/07/03 14:48:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MCeCoCom.cc (modified) (3 diffs)
• MCeCoCom.h (modified) (2 diffs)
• MDriveCom.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -26 +26 @@
     str.Remove(0, len);
 
-    fT.SetTimer(y, m, d, h, min, s, ms/1000.);
+    fT.Set(y, m, d, h, min, s, ms);
 
     // Remove the 30 tokens of the subsystem status
@@ -88 +88 @@
 bool MCeCoCom::Send(const char *str)
 {
-    Timer t;
+    MTime t;
     t.Now();
+
+    UShort_t y1, y2, ms1, ms2;
+    Byte_t mon1, mon2, d1, d2, h1, h2, m1, m2, s1, s2;
+
+    t.GetDate(y1, mon1, d1);
+    t.GetTime(h1, m1, s1, ms1);
+
+    fT.GetDate(y2, mon2, d2);
+    fT.GetTime(h2, m2, s2, ms2);
 
     const char *msg =
@@ -96 +105 @@
              "%02d %04d %02d %02d %02d %02d %02d %03d "
              "%s\n", (const char*)fCommand,
-             fStatus, t.Year(), t.Month(), t.Day(), t.H(), t.M(), t.S(), t.MilliSec(),
-             fComStat, fT.Year(), fT.Month(), fT.Day(), fT.H(), fT.M(), fT.S(), fT.MilliSec(),
+             fStatus,  y1, mon1, d1, h1, m1, s1, ms1,
+             fComStat, y2, mon2, d2, h2, m2, s2, ms2,
              str);
 

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -10 +10 @@
 #endif
 
-#ifndef COSY_Timer
-#include "timer.h"
+#ifndef MARS_MTime
+#include "MTime.h"
 #endif
 
@@ -25 +25 @@
 
     TString fCommand;     // report string of the current system
-    Timer   fT;           // time of last report received
+    MTime   fT;           // time of last report received
     char    fStatus;      // current status of this system
     int     fCCStatus;    // global status of CC

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -4 +4 @@
 
 #include "coord.h"
-#include "Slalib.h"
+#include "MAstro.h"
 #include "MCosy.h"
 
@@ -24 +24 @@
     str.Remove(0, len);
 
-    ret = Slalib::Dms2Deg(d, m, s, sgn);
+    ret = MAstro::Dms2Deg(d, m, s, sgn);
     return true;
 }
@@ -137 +137 @@
     UShort_t d, m, s;
 
-    Slalib::Deg2Dms(deg, sgn, d, m, s);
+    MAstro::Deg2Dms(deg, sgn, d, m, s);
 
     str += Form("%c %03d %02d %03d ", sgn, d, m, s);
@@ -161 +161 @@
         SetStatus(4);
 
-    Timer t;
+    MTime t;
     t.Now();