From ac1bf2588750bbb2328b63e9cd8904056b15d378 Mon Sep 17 00:00:00 2001 From: MiyashitaT Date: Mon, 21 Jun 2021 18:10:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?read=E3=81=AE=E6=9D=A1=E4=BB=B6=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GpsData.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GpsData.py b/GpsData.py index cb2a185..fd1dc41 100644 --- a/GpsData.py +++ b/GpsData.py @@ -61,7 +61,7 @@ def run_gps(self): def read(self): try: - if self.gps.clean_sentences > 20: + if self.gps.parsed_sentences > 0: h = ( self.gps.timestamp[0] if self.gps.timestamp[0] < 24 From 537b7229da0c7c219f9bd7344a5f863af1670b3d Mon Sep 17 00:00:00 2001 From: MiyashitaT Date: Mon, 21 Jun 2021 18:27:43 +0900 Subject: [PATCH 2/2] =?UTF-8?q?try=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GpsData.py | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/GpsData.py b/GpsData.py index fd1dc41..e91083d 100644 --- a/GpsData.py +++ b/GpsData.py @@ -60,30 +60,27 @@ def run_gps(self): self.gps.update(x) def read(self): - try: - if self.gps.parsed_sentences > 0: - h = ( - self.gps.timestamp[0] - if self.gps.timestamp[0] < 24 - else self.gps.timestamp[0] - 24 - ) - self.timestamp[0] = h - self.timestamp[1] = self.gps.timestamp[1] - self.timestamp[2] = self.gps.timestamp[2] - t = self.timestamp - self.timestamp_string = "%2d:%02d:%04.1f" % (t[0], t[1], t[2]) - self.latitude = self.gps.latitude[0] - self.longitude = self.gps.longitude[0] - self.altitude = self.gps.altitude - self.course = self.gps.course - self.speed = copy.deepcopy(self.gps.speed) - self.satellites_used = copy.deepcopy(self.gps.satellites_used) - self.satellite_data = copy.deepcopy(self.gps.satellite_data) - return True - else: - return False - except: - print("Erro during reading from GPS") + if self.gps.parsed_sentences > 0: + h = ( + self.gps.timestamp[0] + if self.gps.timestamp[0] < 24 + else self.gps.timestamp[0] - 24 + ) + self.timestamp[0] = h + self.timestamp[1] = self.gps.timestamp[1] + self.timestamp[2] = self.gps.timestamp[2] + t = self.timestamp + self.timestamp_string = "%2d:%02d:%04.1f" % (t[0], t[1], t[2]) + self.latitude = self.gps.latitude[0] + self.longitude = self.gps.longitude[0] + self.altitude = self.gps.altitude + self.course = self.gps.course + self.speed = copy.deepcopy(self.gps.speed) + self.satellites_used = copy.deepcopy(self.gps.satellites_used) + self.satellite_data = copy.deepcopy(self.gps.satellite_data) + return True + else: + return False def print(self): t = self.timestamp