Skip to content
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

Jump to bottom

Fix py adjust timeout #78

Merged
merged 2 commits into from
Feb 9, 2023
Merged

Fix py adjust timeout #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f20e8
Add missing adjust_timeout to Python code
johnwason Feb 8, 2023
14b7fea
Code formatting
johnwason Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions RobotRaconteurPython/RobotRaconteurPythonUtil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ def ReceivePacketWait(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
:type timeout: float
:return: The received packet
"""
m = self.__innerpipe.ReceivePacketWait(timeout)
m = self.__innerpipe.ReceivePacketWait(adjust_timeout(timeout))
return UnpackMessageElement(m, self.__type, self.__obj, self.__innerpipe.GetNode())

def PeekNextPacketWait(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
Expand All @@ -886,7 +886,7 @@ def PeekNextPacketWait(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
:param timeout: Timeout in seconds to wait for a packet, or -1 for infinite
:return: The received packet
"""
m = self.__innerpipe.PeekNextPacketWait(timeout)
m = self.__innerpipe.PeekNextPacketWait(adjust_timeout(timeout))
return UnpackMessageElement(m, self.__type, self.__obj, self.__innerpipe.GetNode())

def TryReceivePacketWait(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE, peek=False):
Expand All @@ -907,7 +907,8 @@ def TryReceivePacketWait(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE,
:rtype: Tuple[bool,T]
"""
m = RobotRaconteurPython.MessageElement()
r = self.__innerpipe.TryReceivePacketWait(m, timeout, peek)
r = self.__innerpipe.TryReceivePacketWait(
m, adjust_timeout(timeout), peek)
return (r, UnpackMessageElement(m, self.__type, self.__obj, self.__innerpipe.GetNode()))

@property
Expand Down Expand Up @@ -1400,7 +1401,7 @@ def WaitInValueValid(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
:return: Value is valid
:rtype: bool
"""
return self.__innerwire.WaitInValueValid(timeout)
return self.__innerwire.WaitInValueValid(adjust_timeout(timeout))

def WaitOutValueValid(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
"""
Expand All @@ -1414,7 +1415,7 @@ def WaitOutValueValid(self, timeout=RobotRaconteurPython.RR_TIMEOUT_INFINITE):
:return: Value is valid
:rtype: bool
"""
return self.__innerwire.WaitOutValueValid(timeout)
return self.__innerwire.WaitOutValueValid(adjust_timeout(timeout))

@property
def WireValueChanged(self):
Expand Down