- fixed a bug in pause handling of environment controller.

- added code to triple axis MAD emulation layer
2000-12-21 07:55:04 +00:00
parent 513e2701f0
commit d3b8f38ced
15 changed files with 399 additions and 24 deletions
--- a/sinqhmdriv.c
+++ b/sinqhmdriv.c
@@ -313,6 +313,19 @@
        pInternal->iLastHMError = status;
        return HWFault;
     }
+
+     /*
+       When SICS was interrupted while the measurement was paused
+       the inhibit flag may still be set. We clear this here in order to 
+       fix this bug.
+     */
+     status = SINQHMContinueDAQ(pInternal->pMaster);
+     if( (status < 0) && (status != DAQ_INHIBIT) )
+     {
+        pInternal->iLastHMError = status;
+        return HWFault;
+     }
+
     
     /* start the El737 counter */
     pCountInt = pInternal->pCounter->pDes->GetInterface(pInternal->pCounter,