Skip to content

Fix: change wait mode from 'Default' to 'Busy' #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GabrieleManduchi merged 1 commit into from
Jul 1, 2021
Merged

Fix: change wait mode from 'Default' to 'Busy' #2336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pydevices/RfxDevices/MARTE2_SUPERVISOR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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))



Expand All @@ -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):
Expand All @@ -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):
Expand Down