From ccb3039dd3c9f27c08cf14b08f87779b18dc0e67 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Sun, 29 Dec 2019 13:48:44 +0000 Subject: [PATCH] Client: Fix bugs --- Drone/copter_client.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Drone/copter_client.py b/Drone/copter_client.py index 7328f4c..0e20082 100644 --- a/Drone/copter_client.py +++ b/Drone/copter_client.py @@ -729,7 +729,7 @@ class Telemetry: @classmethod def get_battery(cls, ros_telemetry): if ros_telemetry is None: - return float(nan), float(nan) + return float('nan'), float('nan') battery_v = ros_telemetry.voltage @@ -787,8 +787,16 @@ class Telemetry: def update_telemetry_slow(self): self.animation_id = animation.get_id() self.git_version = self.get_git_version() - self.calibration_status = get_calibration_status() - self.system_status = get_sys_status() + try: + self.calibration_status = get_calibration_status() + self.system_status = get_sys_status() + except rospy.ServiceException: + rospy.logdebug("Some service is unavailable") + self.selfcheck = ["WAIT_ROS"] + except AttributeError as e: + rospy.logdebug(e) + except rospy.TransportException as e: + rospy.logdebug(e) self.battery = self.get_battery(self.ros_telemetry) def update(self):