From 39f398559b464dd4e718219664ae7faf8a0a40b7 Mon Sep 17 00:00:00 2001 From: Josh Stillerman Date: Thu, 1 Jul 2021 09:28:55 -0400 Subject: [PATCH] Fix: change wait mode from 'Default' to 'Busy' Default Wait mode does not seem to work in all circumstances. this commit changes it to 'Busy' wait instead. Also: Encode strings for Python3 compatability. --- pydevices/RfxDevices/MARTE2_SUPERVISOR.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py index a9c2ac04a4..3e3640bcfb 100644 --- a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py +++ b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py @@ -499,7 +499,7 @@ def buildConfiguration(self): confText += ' Class = ReferenceContainer\n' confText += ' +IDLE_MDSPLUS_TIMER = {\n' confText += ' Class = LinuxTimer\n' - confText += ' SleepNature = "Default"\n' + confText += ' SleepNature = "Busy"\n' confText += ' Signals = {\n' confText += ' Counter = {\n' confText += ' Type = uint32\n' @@ -582,13 +582,13 @@ def gotorun(self): marteName = self.getNode('name').data() eventString1 = 'StateMachine:GOTORUN' Event.seteventRaw(marteName, np.frombuffer( - eventString1, dtype=np.uint8)) + eventString1.encode(), dtype=np.uint8)) def gotoidle(self): marteName = self.getNode('name').data() eventString1 = 'StateMachine:GOTOIDLE' Event.seteventRaw(marteName, np.frombuffer( - eventString1, dtype=np.uint8)) + eventString1.encode(), dtype=np.uint8)) @@ -599,13 +599,13 @@ def doState(self, state): eventString2 = marteName+':'+'PrepareNextState:'+stateName eventString3 = marteName+':StartNextStateExecution:XX' Event.seteventRaw(marteName, np.frombuffer( - eventString1, dtype=np.uint8)) + eventString1.encode(), dtype=np.uint8)) time.sleep(.1) Event.seteventRaw(marteName, np.frombuffer( - eventString2, dtype=np.uint8)) + eventString2.encode(), dtype=np.uint8)) time.sleep(.1) Event.seteventRaw(marteName, np.frombuffer( - eventString3, dtype=np.uint8)) + eventString3.encode(), dtype=np.uint8)) return 1 def doState1(self): @@ -629,13 +629,13 @@ def suspendMarte(self): eventString2 = marteName+':'+'PrepareNextState:IDLE' eventString3 = marteName+':StartNextStateExecution:XX' Event.seteventRaw(marteName, np.frombuffer( - eventString1, dtype=np.uint8)) + eventString1.encode(), dtype=np.uint8)) time.sleep(0.1) Event.seteventRaw(marteName, np.frombuffer( - eventString2, dtype=np.uint8)) + eventString2.encode(), dtype=np.uint8)) time.sleep(0.1) Event.seteventRaw(marteName, np.frombuffer( - eventString3, dtype=np.uint8)) + eventString3.encode(), dtype=np.uint8)) return 1 def stopMarte(self):