Changeset 1959 for trunk

Timestamp:

04/14/03 17:54:32 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• base/timer.cc (modified) (1 diff)
• candrv/nodedrv.cc (modified) (3 diffs)
• devdrv/macs.cc (modified) (11 diffs)
• gui/MGStarguider.cc (modified) (6 diffs)
• videodev/Filter.cc (modified) (1 diff)
• videodev/Filter.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2003/04/13 - Thomas Bretz
+
+   * base/timer.cc:
+     - added cast to _suseconds_t
+   
+   * candrv/nodedrv.cc:
+     - set starting timeout
+   
+   * devdrv/macs.cc:
+     - after requsting error[0] check Zombie-status
+     - Software version 0.66 --> 0.68
+     - added all known MACS error messages
+
+   * gui/MGStarguider.cc, videodev/Filter.[h,cc]:
+     - added stretching of the picture
+
+
+
  2003/04/12 - Thomas Bretz
 

trunk/MagicSoft/Cosy/base/timer.cc

@@ -30 +30 @@
 {
     tv->tv_sec  = fSecs;
-    tv->tv_usec = fMs;
+    tv->tv_usec = (__suseconds_t)fMs;
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -501 +501 @@
     fTimeout->Reset();
 
-//    Timer t;
-//    fTimeoutTime = t.Now() + (fGuardTime*fLifeTimeFactor/1000.);
+    Timer t;
+    fTimeoutTime = t.Now() + (fGuardTime*fLifeTimeFactor/1000.);
+    //cout << GetNodeName() << ": " << fmod(fTimeoutTime*10000, 10000)/10 << endl;
 
     fTimeout->TurnOn();
@@ -583 +584 @@
     if (now > fTimeoutTime)
     {
-        cout << "==out==> " << fmod(now*1000, 10000)/10 << " > " << fmod(fTimeoutTime*10000, 10000)/10 << endl;
+        cout << GetNodeName() << ": " << "==out==> " << fmod(now*1000, 10000)/10 << " > " << fmod(fTimeoutTime*10000, 10000)/10 << endl;
         //cout << "ERROR - " << GetNodeName() << " didn't respond in timeout window." << endl;
         //lout << "ERROR - " << GetNodeName() << " didn't respond in timeout window." << endl;
@@ -609 +610 @@
     Timer t(tv);
     fTimeoutTime = t + (fGuardTime*fLifeTimeFactor/1000.);
+    //cout << GetNodeName() << ": " << fmod(fTimeoutTime*10000, 10000)/10 << endl;
 }
 

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -44 +44 @@
 void Macs::HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv)
 {
+  // cout << "SdoRx: Idx=0x"<< hex << idx << "/" << (int)subidx;
+  // cout << ", val=0x" << val << endl;
     switch (idx)
     {
@@ -127 +129 @@
 void Macs::HandleSDOOK(WORD_t idx, BYTE_t subidx, timeval_t *tv)
 {
+//    cout << "Node #" << dec << (int)GetId() << ": Sdo=" << hex << idx  << "/" << (int)subidx << " set." << endl;
     switch (idx)
     {
@@ -201 +204 @@
 }
 
-
 void Macs::ReqVelRes()
 {
@@ -243 +245 @@
         SetZombie();
     }
+    if (IsZombieNode())
+        return;
 
     StopHostGuarding();
@@ -252 +256 @@
     RequestSDO(0x100a);
     WaitForSdo(0x100a);
-    if (IsZombieNode())
-        return;
-
     // FIXME! Not statically linked!
-    if (fSoftVersion<0x00000042) // 00.66
+    if (fSoftVersion<0x00000044) // 00.68
     {
         lout << GetNodeName() << " - Software Version too old!" << endl;
@@ -272 +273 @@
     WaitForSdo(0x3000);
 
-//    SetHome(250000);
-
-//    lout << "- Requesting SDO 0x2001 of " << (int)GetId() << endl;
-//    RequestSDO(0x2001);
-//    WaitForSdo(0x2001);
-
     SetPDO1On(FALSE); // this is a workaround for the Macs
     SetPDO1On(TRUE);
@@ -283 +278 @@
     SetNoWait(TRUE);
 
-    //    StartGuarding(500, 2);
-    //    StartHostGuarding();
+//    StartGuarding(250, 4);
+//    StartHostGuarding();
 }
 
@@ -301 +296 @@
 
     SetNoWait(FALSE);
+
+    StopHostGuarding();
+    StopGuarding();
 
     //
@@ -506 +504 @@
     switch (errnum)
     {
+    case 3:
+        lout << "Axis does not existing." << endl;
+        return;
+    case 5:
+        lout << "Error not cleared (while trying to move axis)" << endl;
+        return;
     case 6:
         //
@@ -515 +519 @@
         SetError(0);
         return;
-
     case 8:
         lout << "Control deviation overflow." << endl;
         return;
-
     case 9:
         lout << "Zero index not found." << endl;
         return;
-
+    case 10:
+        lout << "Unknown command, syntax error." << endl;
+        lout << "Please recompile and reload program." << endl;
+        return;
     case 11:
     case 25:
@@ -540 +545 @@
         {
         case 11:
-            lout << " software endswitch activated." << endl;
+            lout << " software";
             break;
         case 25:
-            lout << " hardware endswitch activated." << endl;
+            lout << " hardware";
             break;
         }
-        return;
-
+        lout << " endswitch activated." << endl;
+        return;
+    case 12:
+        lout << "Wrong parameter number used in SET command." << endl;
+        return;
+    case 14:
+        lout << " Too many LOOP calls." << endl;
+        return;
+    case 16:
+        lout << "Parameter in EEPROM broken (means: EEPROM broken, or saving not finished)" << endl;
+        lout << "Please use APOSS to 'Reset' the MACS and reload the parameters." << endl;
+        return;
+    case 17:
+        lout << "Program in EEPROM broken (means: EEPROM broken, or saving not finished)" << endl;
+        lout << "Please use APOSS to delete all Programs restore the programs." << endl;
+        return;
+    case 18:
+        lout << "Reset by CPU (reset called by Watch-dog cause of CPU halted)" << endl;
+        lout << "Possible reasons: short under-/overvoltage or shortcut." << endl;
+        return;
+    case 19:
+        lout << "User break (autostart program stopped by user)" << endl;
+        return;
+    case 51:
+        lout << "Too many (>=10) GOSUB calls." << endl;
+        return;
+    case 52:
+        lout << "Too many RETURN calls." << endl;
+        return;
+    case 62:
+        lout << "Error veryfiing EEPROM after access (Try again savaing parameters or program)" << endl;
+        return;
+    case 70:
+        lout << "Error in DIM call (call to DIM doesn't fit existing DIM call)" << endl;
+        return;
     case 71:
         lout << "Array out of bound." << endl;
         return;
-
+    case 79:
+        lout << "Timeout waiting for index (WAITNDX)." << endl;
+        return;
     case 84:
         lout << "Too many (>12) ON TIME calls." << endl;
+        return;
+    case 87:
+        lout << "Out of memory for variables - Check APOSS predifined number of" << endl;
+        lout << "variables and try deleting the array by doing a 'Reset' from APOSS." << endl;
+        return;
+    case 89:
+        lout << "CAN I/O error (REOPEN=" << dec << errinf << " " << (errinf==0?"OK":"ERR") << ")" << endl;
         return;
 

trunk/MagicSoft/Cosy/gui/MGStarguider.cc

@@ -56 +56 @@
     IDM_kPNG,
     IDM_kOnce,
+    IDM_kStretch,
     IDM_kUseFileRaDec,
     IDM_kContinous,
@@ -204 +205 @@
     fDisplay->AddEntry("Sao &Catalog", IDM_kCatalog);
     fDisplay->AddEntry("Starguider",   IDM_kStarguider);
+    fDisplay->AddEntry("Stretch",      IDM_kStretch);
     fDisplay->DisableEntry(IDM_kStarguider);
+    fDisplay->CheckEntry(IDM_kStretch);
     fDisplay->Associate(this);
     fList->Add(fDisplay);
@@ -637 +640 @@
             case IDM_kStarguider:
                 Toggle(fDisplay, IDM_kStarguider);
+                gSystem->Unlink("tracking_error.txt");
                 return kTRUE;
 
@@ -648 +652 @@
                     fDisplay->DisableEntry(IDM_kStarguider);
                 }
+                return kTRUE;
+
+            case IDM_kStretch:
+                Toggle(fDisplay, IDM_kStretch);
                 return kTRUE;
 
@@ -928 +936 @@
     pos1 -= pos0;
 
-    ofstream fout2("tracking_error.txt");
+    ofstream fout2("tracking_error.txt", ios::app);
     fout2 << setprecision(10) << fSao->GetMjd()-52000 << " " << -pos1.Alt() << " " << pos1.Az() << endl;
 
@@ -1017 +1025 @@
         return;
 
-    cout << "Img: " << n << endl;
+    //cout << "Img: " << n << endl;
 
     byte c[768*576];
     for (int i=0; i<768*576; i++)
         c[i] = (byte)(myimg[i]/fIntRate+.5);
+
+    if (fDisplay->IsEntryChecked(IDM_kStretch))
+        Filter::Stretch(c);
 
     if (!fWritePictures->IsEntryEnabled(IDM_kStart) &&

trunk/MagicSoft/Cosy/videodev/Filter.cc

@@ -203 +203 @@
 }
 
+void Filter::Stretch(byte *img)
+{
+    const int offset = 10;
+
+    int max;
+    int min;
+
+    /*const float mean =*/Mean(img, offset, &min, &max);
+
+    for (int x=0; x<768; x++)
+        for (int y=0; y<576; y++)
+        {
+            img[y*768+x] -= min;
+            img[y*768+x] *= 255/(max-min);
+        }
+}

trunk/MagicSoft/Cosy/videodev/Filter.h

@@ -29 +29 @@
 public:
     static void Execute(byte *img);
+    static void Stretch(byte *img);
 
     ClassDef(Filter, 0)