Changeset 2613 for trunk

Timestamp:

12/07/03 13:09:00 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• devdrv/macs.cc (modified) (1 diff)
• gui/MGImage.cc (modified) (3 diffs)
• main/MCosy.cc (modified) (4 diffs)
• main/MStarguider.cc (modified) (1 diff)
• tcpip/MDriveCom.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2003/12/07 - Thomas Bretz
+
+   * tcpip/MDriveCom.cc:
+     - log CC-COMMANDS to log-file
+
+   * main/MStarguider.cc:
+     - fixed handling of DISPLAY variable
+
+   * main/MCosy.cc:
+     - undef EXPERT
+     - removed comments before CheckNetwork
+
+   * gui/MGImage.cc:
+     - fixed some image copy algorithm
+     - removed nonsense ==13 check for TryLock
+
+   * devdrv/macs.cc:
+     - shift crew reported problems: changed timeout from 250ms to 400ms
+
+   * stars.txt:
+     - added Capella
+
+   * Makefile:
+     - added 'install'
+
+
+
  2003/11/25 - Thomas Bretz (La Palma)
 
-  * slog:
+   * slog:
     - added this small script to analyze log-files
     

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -383 +383 @@
     //SetNoWait(TRUE);
 
-    StartGuarding(250, 1, kFALSE); // Using PDO1 @ 100ms
+    StartGuarding(400, 1, kFALSE); // Using PDO1 @ 100ms
     //StartGuarding(250, 4);
     //StartHostGuarding();

trunk/MagicSoft/Cosy/gui/MGImage.cc

@@ -87 +87 @@
     while (s<e)
     {
-        //      11111100    11111000      11111100
-        *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xfc)<<11;
+        //      11111100    11111000      11111000
+        *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xf8)<<11;
         s++;
     }
@@ -109 +109 @@
 void MGImage::DrawImg(const byte *buffer)
 {
-    if (fMuxPixmap->TryLock()==13)
+    if (fMuxPixmap->TryLock())
         return;
 
@@ -181 +181 @@
 void MGImage::DrawColImg(const byte *gbuf, const byte *cbuf)
 {
-    if (fMuxPixmap->TryLock()==13)
+    if (fMuxPixmap->TryLock())
         return;
 

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -52 +52 @@
 */
 
-#define EXPERT
-//#undef EXPERT
+//#define EXPERT
+#undef EXPERT
 
 double MCosy::Rad2SE(double rad) const
@@ -1336 +1336 @@
 
             ZdAz dest = *((ZdAz*)mp) * kDeg2Rad;
-            //if (!SetPosition(dest))
-            //    return (void*)0x1234;
+            if (!SetPosition(dest))
+                return (void*)0x1234;
 
             SlaStars sla(fObservatory);
@@ -1353 +1353 @@
         cout << "WM_Position: start." << endl;
         {
-            //if (!CheckNetwork())
-            //    return (void*)0xebb0;
+            if (!CheckNetwork())
+                return (void*)0xebb0;
 
             ZdAz dest = *((ZdAz*)mp);
@@ -1921 +1921 @@
     const ZdAz seist = GetSePos()*2*TMath::Pi()/16384; // [se]
 
-    cout << seist.Zd()*kRad2Deg << " " << seist.Az()*kRad2Deg << endl;
+    //cout << seist.Zd()*kRad2Deg << " " << seist.Az()*kRad2Deg << endl;
 
     ZdAz back = fBending.CorrectBack(seist)*180/TMath::Pi();
 
-    cout << back.Zd() << " " << back.Az() << endl;
+    //cout << back.Zd() << " " << back.Az() << endl;
 
     return back;

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -180 +180 @@
 
     TString disp=gVirtualX->DisplayName();
-    if (disp.First(':')>0)
+    cout << "Display: " << disp << endl;
+    if (disp.First(':')>=0)
         disp=disp(0, disp.First(':'));
 
     if (disp.IsNull() || disp==(TString)"localhost")
     {
-        fInterpol->CheckEntry(IDM_kInterpol1);
-        fIntRate = 1;
+        fInterpol->CheckEntry(IDM_kInterpol5);
+        fIntRate = 5;
     }
     else

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -53 +53 @@
     }
 
-    cout << "CC-COMMAND: Track " << ra << "h " << dec << "deg '" << str << "'" << endl;
+    lout << "CC-COMMAND: Track " << ra << "h " << dec << "deg '" << str 
+<< "'" << endl;
 
     ra *= 15; // h -> deg
@@ -80 +81 @@
     }
 
-    cout << "CC-COMMAND: Move " << zd << "deg " << az << "deg" << endl;
+    lout << "CC-COMMAND: Move " << zd << "deg " << az << "deg" << endl;
 
     ZdAz za(zd, az);
@@ -103 +104 @@
     {
         cout << "MDriveCom - STOP!... start." << endl;
+        lout << "CC-COMMAND: STOP!" << endl;       
         fQueue->PostMsg(WM_STOP);
         cout << "MDriveCom - STOP!... done." << endl;