diff --git a/script/local.py b/script/local.py index c34d973..2ed9dbb 100644 --- a/script/local.py +++ b/script/local.py @@ -150,15 +150,15 @@ class Interlock: """ self.msg_default = array('B',[0x32,0,0x69,0,0x99,0x88,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0]) - def _msgRead(): + def _msgRead(self): self.msg_default[16] = 0 return self.msg_default - def _msgWrite(): + def _msgWrite(self): self.msg_default[16] = 1 return self.msg_default - def _msgReset(): + def _msgReset(self): self.msg_default[16] = 2 return self.msg_default diff --git a/script/tests/tests.properties b/script/tests/tests.properties index e2733a9..aeccc00 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Tue Oct 17 14:48:38 CEST 2017 +#Tue Oct 17 14:49:13 CEST 2017 customPanel= showEnabledTestsOnly=true listFilter=rps-test diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py index 47a32a6..f69ab22 100644 --- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py +++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py @@ -15,11 +15,11 @@ def startTest(testName, DEVICE, params): ret = 'Test failed' status = False # put the whole custom code under try/catch. - # get the path of this script: - testPath = inspect.getfile(inspect.currentframe()) - # init the testing tool class: - test = TestingTool(testName, testPath, DEVICE, params) try: + # get the path of this script: + testPath = inspect.getfile(inspect.currentframe()) + # init the testing tool class: + test = TestingTool(testName, testPath, DEVICE, params) ################ END OF Init ##################### ######### WRITE YOUR CODE HERE BELOW ############# @@ -84,7 +84,9 @@ def startTest(testName, DEVICE, params): # now try with data from real device: this part will most probably fail: correct the PV names with existing ones. try: - + ilk = Interlock() + ilk.masterReset() + ilk.setInterlockMode(mode) # set up connection to channels. "type" of data can be "d" (= double), "l" (= long). rpsChannel = Channel(channel , type='d') except: