Changeset 8870 for trunk/MagicSoft/Cosy

Timestamp:

02/22/08 11:44:52 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• aposs/Magic.m (modified) (8 diffs)
• devdrv/macs.cc (modified) (2 diffs)
• main/MStarguider.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2008/02/22 Thomas Bretz (La Palma)
+
+   * aposs/Magic.m:
+     - added a trigger on the falling and rising edge of the door-lock
+       switch which will stop the telescope and refuse any movement 
+       command
+     - changed version number from 0.69 to 0.70
+     - move the arbitrary factor 4 from cosy to aposs
+
+
 
  2008/02/21 Thomas Bretz (La Palma)

trunk/MagicSoft/Cosy/aposs/Magic.m

@@ -10 +10 @@
 /*                                                                         */
 kVERSION    = 0   /*                                                       */
-kSUBVERSION = 69  /*                                                       */
+kSUBVERSION = 70  /*                                                       */
 /*                                                                         */
 /*  HISTORY:                                                               */
+/*                                                                         */
+/*   * V0.70:                                                              */
+/*       - Implemented switch off of motor in case of Input 6 has a        */
+/*         falling edge                                                    */
+/*       - moved the arbitrary factor 4 for the tracking speed from        */
+/*         cosy to here                                                    */
 /*                                                                         */
 /*   * V0.69:                                                              */
@@ -323 +329 @@
 kIoModule = 4*256                    
 
+ON INT -(kIoModule+6) GOSUB DOOR_STATUS_CHANGED
+ON INT  (kIoModule+6) GOSUB DOOR_STATUS_CHANGED
+
 /*-------------------------------------------------------------------------*/
 /* Init                                                                    */
@@ -337 +346 @@
    canlo = 1
 
-         brake = 0
+   brake = 0
    RF    = 0     
    
@@ -354 +363 @@
          emcy  = in (kIoModule+2)
          vltg  = in (kIoModule+3)
-         mode  = in (kIoModule+4)   
+         mode  = in (kIoModule+4)
+         door  = in (kIoModule+6)
          ready = in 1
 
-         if (ready==0) and (RF==1) then
+         if (door==0) then
+            preop = kTRUE
+         endif
+
+         if (preop==kTRUE) then
+            print "Door open!"
+            gosub reset
+         elseif (ready==0) and (RF==1) then
             print "DKC not ready, but RF set... setting RF=AH=0!"
             gosub reset
@@ -465 +482 @@
       PRINT "Setting Idx:", idx, "/", subidx, " to ", sdoval
 */
-      if (idx==0x1000 and subidx==1 and sdoval==1) then
-         preop = kFALSE
+      if (idx==0x1000 and subidx==1) then
+         if (sdoval==1) then
+            if (door==0) then
+               canlo = 1
+            else
+               preop = kFALSE
+            endif
+         elseif
+            preop = kTRUE
+         endif
       elseif (idx==0x1003 and subidx==0 and sdoval==0) then
          i = 9
@@ -558 +583 @@
             endif
          elseif (subidx == 1) then
-            CVEL sdoval
+            /* It is unclear where this arbitraty factor comes from */
+            CVEL sdoval/4
          endif 
       elseif (idx == 0x3007) then
@@ -696 +722 @@
          sdoval = AXEND
       elseif (idx == 0x2002) then
-         sdoval = AVEL
+         sdoval = AVEL*4
       elseif (idx == 0x2003) then
          if (subidx==0) then
@@ -784 +810 @@
 /*-------------------------------------------------------------------------*/
    SUBPROG PROC_PDO1
-      CANOUT pdo1 AXEND APOS
+      CANOUT pdo1 (AXEND|(preop<<9)) APOS
+   RETURN
+
+/*-------------------------------------------------------------------------*/
+/* FENCE OPENED                                                            */
+/*-------------------------------------------------------------------------*/
+   SUBPROG DOOR_STATUS_CHANGED
+      preop = kTRUE
    RETURN
 

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -486 +486 @@
     // FIXME! Not statically linked!
     //if (fSoftVersion<0x00000044) // 00.68
-    if (fSoftVersion<0x00000045) // 00.69
+    if (fSoftVersion<0x00000046) // 00.69
     {
         gLog << err << GetNodeName() << " - Software Version " << 0.01*fSoftVersion << " too old!" << endl;
@@ -515 +515 @@
 
     // REMOVE THIS AND LET CC START THE NODE
-    StartNode();
+    // StartNode();
 
     gLog << inf2 << "- " << GetNodeName() << ": Checking armed status." << endl;

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -616 +616 @@
     //fClient.ExitLoop();
     //    cout << "FIXME: ExitLoop not called!!!!!!" << endl;
+    fGetter->ExitLoop();
     gSystem->ExitLoop();
 }
@@ -2023 +2024 @@
             if (fCosy)
             {
-                MDriveCom &com = *fCosy->GetDriveCom();
-                com.SendStargReport(fStatus, fD, fSao->GetZdAz(),
-                                    sgcenter, numstars, rc, bright,
-                                    time.GetMjd(), 0, 0);    // Report
+                MDriveCom *com = fCosy->GetDriveCom();
+                if (com)
+                    com->SendStargReport(fStatus, fD, fSao->GetZdAz(),
+                                         sgcenter, numstars, rc, bright,
+                                         time.GetMjd(), 0, 0);    // Report
             }