hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2024-12-20 16:41:13 -05:00
Code Issues Projects Releases Wiki Activity

Fix some WeatherPacket formatting

Browse Source
This commit is contained in:
Hemna 2022-12-19 21:27:05 -05:00
parent a1188d29d4
commit f19043ecd9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aprsd/packets/core.py
View File

@ -348,12 +348,14 @@ class WeatherPacket(GPSPacket):
""" """
time_zulu = self._build_time_zulu() time_zulu = self._build_time_zulu()
course = "%03u" % self.course
contents = [ contents = [
f"{self.from_call}>{self.to_call},WIDE2-1:", f"{self.from_call}>{self.to_call},WIDE2-1:",
f"@{time_zulu}z{self.latitude}{self.symbol_table}", f"@{time_zulu}z{self.latitude}{self.symbol_table}",
f"{self.longitude}{self.symbol}", f"{self.longitude}{self.symbol}",
# Add CSE = Course # Add CSE = Course
f"{self.course}", f"{course}",
# Speed = sustained 1 minute wind speed in mph # Speed = sustained 1 minute wind speed in mph
f"{self.symbol_table}", f"{self.speed:03.0f}", f"{self.symbol_table}", f"{self.speed:03.0f}",
# wind gust (peak wind speed in mph in the last 5 minutes) # wind gust (peak wind speed in mph in the last 5 minutes)
@ -363,6 +365,8 @@ class WeatherPacket(GPSPacket):
# Rainfall (in hundredths of an inch) in the last hour # Rainfall (in hundredths of an inch) in the last hour
f"r{self.rain_1h:03.0f}", f"r{self.rain_1h:03.0f}",
# Rainfall (in hundredths of an inch) in last 24 hours # Rainfall (in hundredths of an inch) in last 24 hours
f"p{self.rain_24h:03.0f}",
# Rainfall (in hundredths of an inch) since midnigt
f"P{self.rain_since_midnight:03.0f}", f"P{self.rain_since_midnight:03.0f}",
# Humidity # Humidity
f"h{self.humidity:02d}", f"h{self.humidity:02d}",
@ -372,6 +376,7 @@ class WeatherPacket(GPSPacket):
if self.comment: if self.comment:
contents.append(self.comment) contents.append(self.comment)
self.raw = "".join(contents) self.raw = "".join(contents)