fixed false waitsrq detection with NI-VISA/NI488.2 15.5

buha · Feb 9, 2017 · 3311591 · 3311591
1 parent 3dd139c
commit 3311591
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/design.py b/design.py
@@ -234,7 +234,7 @@ def retranslateUi(self, MainWindow):
         self.commandEdit.setPlaceholderText(_translate("MainWindow", "Example: F, Ft ..."))
         self.queryButton.setText(_translate("MainWindow", "ibwrt | ibrd"))
         self.queryResponseButton.setText(_translate("MainWindow", "ibwrt | ibrsp"))
-        self.versionLabel.setText(_translate("MainWindow", "v0.2.1"))
+        self.versionLabel.setText(_translate("MainWindow", "v0.2.0-19-g3dd139c"))
         self.writeButton.setText(_translate("MainWindow", "ibwrt"))
         self.readButton.setText(_translate("MainWindow", "ibrd"))
         self.serialPollButton.setText(_translate("MainWindow", "ibrsp"))

diff --git a/telhacks.py b/telhacks.py
@@ -60,5 +60,7 @@ def wait_for_srq(self, timeout=25000):
             # instead of redoing a serial poll (as the original pyvisa does)
             if rsp.timed_out == False:
                 break
+            else:
+                raise VisaIOError(constants.StatusCode.error_timeout)
 
-        #self.discard_events(constants.VI_EVENT_SERVICE_REQ, constants.VI_QUEUE)
+        self.disable_event(constants.VI_EVENT_SERVICE_REQ, constants.VI_QUEUE)