Changeset 11773

Timestamp:

08/04/11 13:23:18 (13 years ago)

Author:

ogrimm

Message:

Fix for reset button detection

Location:

fact/BIASctrl

Files:

• Crate.cc (modified) (2 diffs)
• User.cc (modified) (2 diffs)

fact/BIASctrl/Crate.cc

@@ -186 +186 @@
 
   if (Data.size() == 3) {
+        ResetHit = false;
     ErrorCount = 0;
         return 1;
@@ -217 +218 @@
         OC[i][j] = Data[Count] & 128;
         Present[i][j] = (Data[Count+2] & 0x70) == 0 ? true : false;
-        ResetHit = Data[Count+2] & 128;
+        if (!ResetHit) ResetHit = (Data[Count+2] & 0x80) == 0 ? false : true;
         Count += 3;
   }

fact/BIASctrl/User.cc

@@ -615 +615 @@
 
       if (Crates[i]->ResetHit) {
-        Message(INFO, "Manual reset of board %d, setting voltages to zero and issuing system reset", i);
+        Message(INFO, "Manual reset of crate %d, setting voltages to zero and issuing system reset", i);
                 Crates[i]->GlobalSet(0);
                 Crates[i]->SystemReset();
@@ -621 +621 @@
 
       if (!Crates[i]->WrapOK) {
-        Message(ERROR, "Wrap counter mismatch of board %d", i);
+        Message(ERROR, "Wrap counter mismatch of crate %d", i);
       }