From 972a1cc573bd1a0e356376d0c8d044164754ddeb Mon Sep 17 00:00:00 2001 From: freeHackOfJeff Date: Tue, 26 Mar 2019 22:04:17 +0800 Subject: [PATCH] Tools: rtk code consolidation --- modules/tools/record_play/rtk_player.py | 6 +++--- modules/tools/record_play/rtk_recorder.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/tools/record_play/rtk_player.py b/modules/tools/record_play/rtk_player.py index 5850bfbd66..383629f824 100644 --- a/modules/tools/record_play/rtk_player.py +++ b/modules/tools/record_play/rtk_player.py @@ -60,7 +60,7 @@ class RtkPlayer(object): self.logger.info("Load record file from: %s" % record_file) try: file_handler = open(record_file, 'r') - except: + except IOError: self.logger.error("Cannot find file: " + record_file) file_handler.close() sys.exit(0) @@ -185,7 +185,7 @@ class RtkPlayer(object): self.sequence_num = self.sequence_num + 1 self.logger.debug( - "publish_planningmsg: before adjust start: self.start = %s, self.end=%s" + "publish_planningmsg: before adjust start: self.start=%s, self.end=%s" % (self.start, self.end)) if self.replan or self.sequence_num <= 1 or not self.automode: self.logger.info( @@ -209,7 +209,7 @@ class RtkPlayer(object): self.end = len(self.data) - 1 self.logger.debug( - "publish_planningmsg: after adjust start: self.start = %s, self.end=%s" + "publish_planningmsg: after adjust start: self.start=%s, self.end=%s" % (self.start, self.end)) planningdata.total_path_length = self.data['s'][self.end] - \ diff --git a/modules/tools/record_play/rtk_recorder.py b/modules/tools/record_play/rtk_recorder.py index 63c075a8ee..36fd453817 100644 --- a/modules/tools/record_play/rtk_recorder.py +++ b/modules/tools/record_play/rtk_recorder.py @@ -135,13 +135,13 @@ class RtkRecord(object): cargear = self.chassis.gear_location if abs(carspeed) >= speed_epsilon: - if self.startmoving == False: + if self.startmoving is False: self.logger.info( "carspeed !=0 and startmoving is False, Start Recording") self.startmoving = True if self.startmoving: - self.cars = self.cars + carspeed * 0.01 + self.cars += carspeed * 0.01 self.write( "%s, %s, %s, %s, %s, %s, %s, %.4f, %s, %s, %s, %s, %s, %s\n" % (carx, cary, carz, carspeed, caracceleration, self.carcurvature, -- GitLab