Skip to content

Commit ce7384d

Browse files
committed
fix bug
1 parent 8835474 commit ce7384d

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

pymycobot/mercurychassis.py

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -120,32 +120,36 @@ def cancel_navigation(self):
120120
command = {"movebaseCancel": True}
121121
self._sock.sendall(json.dumps(command).encode())
122122

123-
def getRobotVersion(self):
124-
""""""
125-
command = {"getRobotVersion": True}
123+
def get_software_version(self):
124+
"""Get the base server version number"""
125+
command = {"getSoftWareVersion": True}
126126
self._sock.sendall(json.dumps(command).encode())
127127
while True:
128-
data = self.move_end.get("getRobotVersion", None)
129-
if data:
130-
return self.move_end["getRobotVersion"]["return"]
131-
132-
def getSystemVersion(self):
133-
command = {"getSystemVersion": True}
128+
if self.move_end:
129+
data = self.move_end.get("getSoftWareVersion", None)
130+
if data:
131+
return self.move_end["getSoftWareVersion"]["return"]
132+
133+
def get_base_ros_version(self):
134+
"""Get the base ROS project version number"""
135+
command = {"getBaseROSVersion": True}
134136
self._sock.sendall(json.dumps(command).encode())
135137
while True:
136-
data = self.move_end.get("getSystemVersion", None)
137-
if data:
138-
return self.move_end["getSystemVersion"]["return"]
138+
if self.move_end:
139+
data = self.move_end.get("getBaseROSVersion", None)
140+
if data:
141+
return self.move_end["getBaseROSVersion"]["return"]
139142

140-
def batteryState(self):
143+
def get_battery_state(self):
141144
"""Get battery level
142145
"""
143146
command = {"batteryState": True}
144147
self._sock.sendall(json.dumps(command).encode())
145148
while True:
146-
data = self.move_end.get("batteryState", None)
147-
if data:
148-
return self.move_end["batteryState"]["return"]
149+
if self.move_end:
150+
data = self.move_end.get("batteryState", None)
151+
if data:
152+
return self.move_end["batteryState"]["return"]
149153

150154

151155

0 commit comments

Comments
 (0)