1
0
mirror of https://github.com/craigerl/aprsd.git synced 2024-12-20 16:41:13 -05:00

Fix Rain reporting in WeatherPacket send.

Made a fix for a rain setting of 1.04 inches, the packet
has to be r104 instead of r001
This commit is contained in:
Hemna 2022-12-22 09:42:30 -05:00
parent 4a65f52939
commit bbcd7c8a5b

View File

@ -294,6 +294,7 @@ class WeatherPacket(GPSPacket):
symbol: str = "_" symbol: str = "_"
wind_gust: float = 0.00 wind_gust: float = 0.00
temperature: float = 0.00 temperature: float = 0.00
# in inches. 1.04 means 1.04 inches
rain_1h: float = 0.00 rain_1h: float = 0.00
rain_24h: float = 0.00 rain_24h: float = 0.00
rain_since_midnight: float = 0.00 rain_since_midnight: float = 0.00
@ -312,7 +313,9 @@ class WeatherPacket(GPSPacket):
Where: CSE/SPD is wind direction and sustained 1 minute speed Where: CSE/SPD is wind direction and sustained 1 minute speed
t is in degrees F t is in degrees F
r is Rain per last 60 minutes r is Rain per last 60 minutes
1.04 inches of rain will show as r104
p is precipitation per last 24 hours (sliding 24 hour window) p is precipitation per last 24 hours (sliding 24 hour window)
P is precip per last 24 hours since midnight P is precip per last 24 hours since midnight
b is Baro in tenths of a mb b is Baro in tenths of a mb
@ -341,11 +344,11 @@ class WeatherPacket(GPSPacket):
# Temperature in degrees F # Temperature in degrees F
f"t{self.temperature:03.0f}", f"t{self.temperature:03.0f}",
# 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*100: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}", f"p{self.rain_24h*100:03.0f}",
# Rainfall (in hundredths of an inch) since midnigt # Rainfall (in hundredths of an inch) since midnigt
f"P{self.rain_since_midnight:03.0f}", f"P{self.rain_since_midnight*100:03.0f}",
# Humidity # Humidity
f"h{self.humidity:02d}", f"h{self.humidity:02d}",
# Barometric pressure (in tenths of millibars/tenths of hPascal) # Barometric pressure (in tenths of millibars/tenths of hPascal)