diff --git a/bin/weewx/drivers/vantage.py b/bin/weewx/drivers/vantage.py index 161d3a34..b6da456e 100644 --- a/bin/weewx/drivers/vantage.py +++ b/bin/weewx/drivers/vantage.py @@ -1769,7 +1769,7 @@ _loop_map = { 'altimeter' : lambda p, k: float(p[k]) / 1000.0 if p[k] else None, 'bar_calibration' : lambda p, k: float(p[k]) / 1000.0 if p[k] else None, 'bar_offset' : lambda p, k: float(p[k]) / 1000.0 if p[k] else None, - 'bar_reduction' : lambda p, k: float(p[k]) / 1000.0 if p[k] else None, + 'bar_reduction' : lambda p, k: p[k], 'barometer' : lambda p, k: float(p[k]) / 1000.0 if p[k] else None, 'consBatteryVoltage': lambda p, k: float((p[k] * 300) >> 9) / 100.0, 'dayET' : lambda p, k: float(p[k]) / 1000.0, diff --git a/bin/weewx/imagegenerator.py b/bin/weewx/imagegenerator.py index f5cbf6ca..b77b7214 100644 --- a/bin/weewx/imagegenerator.py +++ b/bin/weewx/imagegenerator.py @@ -46,7 +46,7 @@ class ImageGenerator(weewx.reportengine.ReportGenerator): try: self.generic_dict = self.skin_dict['Labels']['Generic'] except KeyError: - self.generic.dict = {} + self.generic_dict = {} # text_dict contains translated text strings self.text_dict = self.skin_dict.get('Texts', {}) self.image_dict = self.skin_dict['ImageGenerator'] diff --git a/docs/changes.txt b/docs/changes.txt index 2b98fbfc..2f403432 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -16,6 +16,14 @@ specified. If windGustDir is missing, extract a value from the accumulators. +Fixed typo that shows itself if no [Labels]/[[Generic]] section is supplied. +Fixes issue #752. + +Fixed calculation of field "bar_reduction" for Vantage type 2 LOOP packets. + +Fix problem that prevents windSpeed and windDir from being displayed in +the RSS feed. Fixes issue #755. + 4.6.2 02/10/2022 Removed diagnostic code that was inadverently left in the titlebar.inc file diff --git a/skins/Seasons/rss.xml.tmpl b/skins/Seasons/rss.xml.tmpl index 06ae51ee..bc35d76c 100644 --- a/skins/Seasons/rss.xml.tmpl +++ b/skins/Seasons/rss.xml.tmpl @@ -5,7 +5,7 @@ #set $timespans = [{"span": $day, "label": $gettext("Daily summary as of")}, {"span": $month, "label": $gettext("Monthly summary as of")}, {"span": $year, "label": $gettext("Yearly summary as of")}] -#set $observations = $to_list($DisplayOptions.get('observations_rss', ['outTemp', 'inTemp', 'barometer', 'wind', 'rain', 'rainRate'])) +#set $observations = $to_list($DisplayOptions.get('observations_rss', ['outTemp', 'inTemp', 'barometer', 'windSpeed', 'rain', 'rainRate'])) #set $obs_type_sum = $to_list($DisplayOptions.get('obs_type_sum', ['rain'])) #set $obs_type_max = $to_list($DisplayOptions.get('obs_type_max', ['rainRate'])) @@ -27,7 +27,7 @@ #for $x in $observations #if $getattr($current, $x).has_data - #if $x == 'wind' + #if $x == 'windSpeed' $obs.label.wind: $current.windSpeed $gettext("from") $current.windDir; #else $obs.label[$x]: $getattr($current, $x); @@ -43,7 +43,7 @@ $obs.label.dateTime: $current.dateTime
#for $x in $observations #if $getattr($current, $x).has_data - #if $x == 'wind' + #if $x == 'windSpeed' $obs.label.wind: $current.windSpeed $gettext("from") $current.windDir; #else $obs.label[$x]: $getattr($current, $x)
@@ -61,7 +61,7 @@ #for $x in $observations #if $getattr($timespan['span'], $x).has_data - #if $x == 'wind' + #if $x == 'windSpeed' $gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir $gettext("at") $timespan['span'].wind.maxtime; #elif $x in $obs_type_sum $obs.label[$x]: $getattr($timespan['span'], $x).sum; @@ -82,7 +82,7 @@ $gettext($timespan['label']) $timespan['span'].dateTime.format("%d %b %Y")
#for $x in $observations #if $getattr($timespan['span'], $x).has_data - #if $x == 'wind' + #if $x == 'windSpeed' $gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir $gettext("at") $timespan['span'].wind.maxtime
#elif $x in $obs_type_sum $obs.label[$x]: $getattr($timespan['span'], $x).sum
diff --git a/skins/Seasons/skin.conf b/skins/Seasons/skin.conf index 5d7658af..00bcb38e 100644 --- a/skins/Seasons/skin.conf +++ b/skins/Seasons/skin.conf @@ -54,7 +54,7 @@ SKIN_VERSION = 4.6.2 observations_stats = outTemp, heatindex, windchill, dewpoint, outHumidity, barometer, windSpeed, rain, rainRate, ET, hail, hailRate, snow, UV, radiation, lightning_strike_count, lightning_distance, inTemp, inHumidity, extraTemp1, extraHumid1, extraTemp2, extraHumid2, extraTemp3, extraHumid3, extraTemp4, extraHumid4, extraTemp5, extraHumid5, extraTemp6, extraHumid6, extraTemp7, extraHumid7, extraTemp8, extraHumid8, leafTemp1, leafTemp2, leafWet1, leafWet2, soilTemp1, soilTemp2, soilTemp3, soilTemp4, soilMoist1, soilMoist2, soilMoist3, soilMoist4, pm1_0, pm2_5, pm10_0, co, co2, nh3, no2, o3, so2 # This list determines which types will appear in the RSS feed. - observations_rss = outTemp, inTemp, barometer, wind, rain, rainRate, windchill, heatindex, dewpoint, outHumidity, inHumidity + observations_rss = outTemp, inTemp, barometer, windSpeed, rain, rainRate, windchill, heatindex, dewpoint, outHumidity, inHumidity # Some observations display a sum rather than min/max values obs_type_sum = rain, ET, hail, snow, lightning_strike_count diff --git a/skins/Standard/index.html.tmpl b/skins/Standard/index.html.tmpl index 6b8870ca..2b249ef9 100644 --- a/skins/Standard/index.html.tmpl +++ b/skins/Standard/index.html.tmpl @@ -298,11 +298,11 @@

- $gettext("footnote1") + $gettext("This station uses a") $station.hardware, - $gettext("footnote2") - $gettext("footnote3") - $gettext("footnote4") + $gettext("controlled by 'WeeWX',") + $gettext("an experimental weather software system written in Python.") + $gettext("Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts.")

$gettext("RSS feed")

$gettext("Smartphone formatted")

diff --git a/skins/Standard/lang/de.conf b/skins/Standard/lang/de.conf index 8b0b4306..bb85ad5b 100644 --- a/skins/Standard/lang/de.conf +++ b/skins/Standard/lang/de.conf @@ -94,11 +94,13 @@ "About this weather station" = "Über diese Wetterstation" "Always down" = "Polarnacht" "Always up" = "Polartag" + "an experimental weather software system written in Python." = "einer experimentellen Wettersoftware geschrieben in Python." "at" = "um" # Time context. E.g., 15.1C "at" 12:22 "Average Wind" = "Durchschn. Wind" "Azimuth" = "Azimut" "Big Page" = "für PC formatiert" "Calendar Year" = "Kalenderjahr" + "controlled by 'WeeWX'," = "gesteuert von 'weewx'," "Current Conditions" = "aktuelle Werte" "Current conditions, and daily, monthly, and yearly summaries" = "Momentanwerte und Tages-, Monats- und Jahreszusammenfassung" "Current Weather Conditions" = "aktuelle Wetterwerte" @@ -107,10 +109,6 @@ "Declination" = "Deklination" "End civil twilight" = "Ende der bürgerlichen Dämmerung" "Equinox" = "Tagundnachtgleiche" - "footnote1" = "Diese Station verwendet" - "footnote2" = "gesteuert von 'weewx'," - "footnote3" = "einer experimentellen Wettersoftware geschrieben in Python." - "footnote4" = "Grundsätze der Entwicklung von Weewx waren Einfachheit, Schnelligkeit und leichte Verständlichkeit durch Anwendung moderner Programmierkonzepte." "from" = "aus" # Direction context. The wind is "from" the NE "Full moon" = "Vollmond" "High Barometer" = "Luftdruck max." @@ -183,6 +181,7 @@ "Sunrise" = "Aufgang" "Sunset" = "Untergang" "This Month" = "Diesen Monat" + "This station uses a" = "Diese Station verwendet" "This Week" = "Diese Woche" "This week's max" = "Maximalwert dieser Woche" "This week's min" = "Minimalwert dieser Woche" @@ -200,6 +199,7 @@ "Weekly Statistics and Plots" = "Wochenstatistiken und -diagramme" "Weekly Weather Summary" = "Wetterübersicht für diese Woche" "WeeWX uptime" = "WeeWX-Laufzeit" + "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." = "Grundsätze der Entwicklung von Weewx waren Einfachheit, Schnelligkeit und leichte Verständlichkeit durch Anwendung moderner Programmierkonzepte." "Year" = "Jahr" "Yearly Statistics and Plots" = "Jahresstatistiken und -diagramme" "Yearly summary" = "Jahreswerte" diff --git a/skins/Standard/lang/en.conf b/skins/Standard/lang/en.conf index b870701f..33fc3675 100644 --- a/skins/Standard/lang/en.conf +++ b/skins/Standard/lang/en.conf @@ -92,12 +92,14 @@ "About this weather station" = "About this weather station" "Always down" = "Always down" "Always up" = "Always up" + "an experimental weather software system written in Python." = "an experimental weather software system written in Python." "at" = "at" # Time context. E.g., 15.1C "at" 12:22 "Average Wind" = "Average Wind" "Azimuth" = "Azimuth" "Big Page" = "Big Page" "Calendar Year" = "Calendar Year" "Click image for expanded radar loop" = "Click image for expanded radar loop" + "controlled by 'WeeWX'," = "controlled by 'WeeWX'," "Current Conditions" = "Current Conditions" "Current conditions, and daily, monthly, and yearly summaries" = "Current conditions, and daily, monthly, and yearly summaries" "Current Weather Conditions" = "Current Weather Conditions" @@ -106,13 +108,8 @@ "Declination" = "Declination" "End civil twilight" = "End civil twilight" "Equinox" = "Equinox" - "footnote1" = "This station uses a" - "footnote2" = "controlled by 'WeeWX'," - "footnote3" = "an experimental weather software system written in Python." - "footnote4" = "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." "from" = "from" # Direction context. The wind is "from" the NE "Full moon" = "Full moon" - "High" = "High" "High Barometer" = "High Barometer" "High Dewpoint" = "High Dewpoint" "High ET" = "High ET" @@ -124,6 +121,7 @@ "High Temperature" = "High Temperature" "High UV" = "High UV" "High Wind" = "High Wind" + "High" = "High" "in" = "in" # Geographic context. E.g., Temperature "in" Boston. "last 30 days" = "last 30 days" "Latitude" = "Latitude" @@ -138,12 +136,12 @@ "Low Temperature" = "Low Temperature" "Low UV" = "Low UV" "Low Wind Chill" = "Low Wind Chill" - "max" = "max" "Max barometer" = "Max barometer" "Max inside temperature" = "Max inside temperature" "Max outside temperature" = "Max outside temperature" "Max rate" = "Max rate" "Max wind" = "Max wind" + "max" = "max" "Min barometer" = "Min barometer" "Min inside temperature" = "Min inside temperature" "Min outside temperature" = "Min outside temperature" @@ -184,6 +182,7 @@ "Sunrise" = "Sunrise" "Sunset" = "Sunset" "This Month" = "This Month" + "This station uses a" = "This station uses a" "This Week" = "This Week" "This week's max" = "This week's max" "This week's min" = "This week's min" @@ -202,6 +201,7 @@ "Weekly Statistics and Plots" = "Weekly Statistics and Plots" "Weekly Weather Summary" = "Weekly Weather Summary" "WeeWX uptime" = "WeeWX uptime" + "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." = "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." "Year" = "Year" "Yearly Statistics and Plots" = "Yearly Statistics and Plots" "Yearly summary" = "Yearly summary" diff --git a/skins/Standard/lang/fr.conf b/skins/Standard/lang/fr.conf index c595e5b7..a7fd0cf1 100644 --- a/skins/Standard/lang/fr.conf +++ b/skins/Standard/lang/fr.conf @@ -94,11 +94,13 @@ "About this weather station" = "A Propos de cette station" "Always down" = "Toujours couché" "Always up" = "Toujours levé" + "an experimental weather software system written in Python." = "un logiciel de système météorologique expérimental écrit en Python." "at" = "à" # Time context. E.g., 15.1C "at" 12:22 "Average Wind" = "Vent Moyen" "Azimuth" = "Azimut" "Big Page" = "Grande Page" "Calendar Year" = "Année Calendaire" + "controlled by 'WeeWX'," = "controllé par 'weewx'," "Current Conditions" = "Conditions Actuelles" "Current conditions, and daily, monthly, and yearly summaries" = "Conditions actuelles, et résumés quotidiens, mensuels et annuels" "Current Weather Conditions" = "Conditions Météo Actuelles" @@ -107,10 +109,6 @@ "Declination" = "Déclinaison" "End civil twilight" = "Crépuscule civil" "Equinox" = "Equinoxe" - "footnote1" = "Cette station utilise un" - "footnote2" = "controllé par 'weewx'," - "footnote3" = "un logiciel de système météorologique expérimental écrit en Python." - "footnote4" = "Weewx a été conçu pour être simple, rapide et facile à comprendre par l'exploitation de concepts logiciel modernes." "from" = "du" # Direction context. The wind is "from" the NE "Full moon" = "Pleine lune" "High Barometer" = "Baromètre Haut" @@ -183,6 +181,7 @@ "Sunrise" = "Lever" "Sunset" = "Coucher" "This Month" = "Ce Mois" + "This station uses a" = "Cette station utilise un" "This Week" = "Cette Semaine" "This week's max" = "Max cette semaine" "This week's min" = "Min cette semaine" @@ -200,6 +199,7 @@ "Weekly Statistics and Plots" = "Graphiques et Statistiques Hebdomadaires" "Weekly Weather Summary" = "Résumé Météo Hebdomadaire" "WeeWX uptime" = "Disponibilité de WeeWX" + "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." = "Weewx a été conçu pour être simple, rapide et facile à comprendre par l'exploitation de concepts logiciel modernes." "Year" = "Année" "Yearly Statistics and Plots" = "Graphiques et Statistiques Annuels" "Yearly summary" = "Résumé annuel" diff --git a/skins/Standard/lang/nl.conf b/skins/Standard/lang/nl.conf index 8fe37bef..00120945 100644 --- a/skins/Standard/lang/nl.conf +++ b/skins/Standard/lang/nl.conf @@ -93,11 +93,13 @@ "About this weather station" = "Over dit weerstation" "Always down" = "Altijd onder" "Always up" = "Altijd op" + "an experimental weather software system written in Python." = "een experimenteel weer software systeem geschreven in Python." "at" = "om" # Time context. E.g., 15.1C "at" 12:22 "Average Wind" = "Gemiddelde Wind" "Azimuth" = "Azimuth" "Big Page" = "Grote Pagina" "Calendar Year" = "Kalender Jaar" + "controlled by 'WeeWX'," = "onder 'weewx'," "Current Conditions" = "Actuele Condities" "Current conditions, and daily, monthly, and yearly summaries" = "Actuele conditions, and dagelijkse, maandelijkse en jaarlijkse samenvattingen" "Current Weather Conditions" = "Actuele Weer Condities" @@ -106,10 +108,6 @@ "Declination" = "Declinatie" "End civil twilight" = "Einde civiele schemering" "Equinox" = "Equinox" - "footnote1" = "Dit station gebruikt" - "footnote2" = "onder 'weewx'," - "footnote3" = "een experimenteel weer software systeem geschreven in Python." - "footnote4" = "Doelstelling van WeeWx is een simpel, snel en makkelijk te begrijpen systeem te zijn door het gebruik van moderne software concepten." "from" = "uit" # Direction context. The wind is "from" the NE "Full moon" = "Volle Maan" "High Barometer" = "Max Barometer" @@ -182,6 +180,7 @@ "Sunrise" = "Zonsopkomst" "Sunset" = "Zonsondergang" "This Month" = "Deze Maand" + "This station uses a" = "Dit station gebruikt" "This Week" = "Deze Week" "This week's max" = "Max deze week" "This week's min" = "Min deze week" @@ -199,9 +198,10 @@ "Weekly Statistics and Plots" = "Wekelijkse Statistieken en Plots" "Weekly Weather Summary" = "Wekelijkse Weersamenvatting" "WeeWX uptime" = "WeeWX uptime" + "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." = "Doelstelling van WeeWx is een simpel, snel en makkelijk te begrijpen systeem te zijn door het gebruik van moderne software concepten." "Year" = "Jaar" - "Yearly summary" = "Jaaroverzicht" "Yearly Statistics and Plots" = "Jaarlijkse Statistieken en Plots" + "Yearly summary" = "Jaaroverzicht" "Yearly Weather Summary as of" = "Jaarlijkse Weersamenvatting van" "Yearly Weather Summary" = "Jaarlijkse Weersamenvatting" diff --git a/skins/Standard/lang/no.conf b/skins/Standard/lang/no.conf index 2550ce02..843a2e45 100644 --- a/skins/Standard/lang/no.conf +++ b/skins/Standard/lang/no.conf @@ -119,12 +119,14 @@ unit_system = metricwx "About this weather station" = "Om denne værstasjonen" "Always down" = "Alltid nede" "Always up" = "Alltid oppe" + "an experimental weather software system written in Python." = "en eksperimentell værprogramvare skrevet i Python." "at" = "" # Time context. E.g., 15.1C "at" 12:22 "Average Wind" = "Gjennomsnittvind" "Azimuth" = "Asimut" "Big Page" = "Formattert for PC" "Calendar Year" = "Kalenderår" "Click image for expanded radar loop" = "Trykk på bildet for lokal værradar" + "controlled by 'WeeWX'," = "kontrollert av 'WeeWX'," "Current Conditions" = "Været nå" "Current conditions, and daily, monthly, and yearly summaries" = "Oppsummering været nå, daglig, månedlig og årlig" "Current Weather Conditions" = "Været nå" @@ -133,13 +135,8 @@ unit_system = metricwx "Declination" = "Deklinasjon" "End civil twilight" = "Slutt skumring" "Equinox" = "Jevndøgn" - "footnote1" = "Denne stasjonen bruker en" - "footnote2" = "kontrollert av 'WeeWX'," - "footnote3" = "en eksperimentell værprogramvare skrevet i Python." - "footnote4" = "
Weewx ble utformet for å være enkel, hurtig og lett å bruke ved hjelp av moderne programmeringsmetoder." "from" = "fra" # Direction context. The wind is "from" the NE "Full moon" = "Fullmåne" - "High" = "Høy" "High Barometer" = "Høyeste lufttrykk" "High Dewpoint" = "Høyeste doggpunkt" "High ET" = "Høyeste fordampning" @@ -151,6 +148,7 @@ unit_system = metricwx "High Temperature" = "Høyeste temperatur" "High UV" = "Høyeste UV" "High Wind" = "Høyeste vind" + "High" = "Høy" "in" = "in" # Geographic context. E.g., Temperature "in" Boston. "last 30 days" = "siste 30 dager" "Latitude" = "Bredde" @@ -165,12 +163,12 @@ unit_system = metricwx "Low Temperature" = "Laveste temperatur" "Low UV" = "Laveste UV" "Low Wind Chill" = "Laveste følte temperatur" - "max" = "maks" "Max barometer" = "Maks lufttrykk" "Max inside temperature" = "Maks innetemperatur" "Max outside temperature" = "Maks utetemperatur" "Max rate" = "Maks regn" "Max wind" = "Maks vind" + "max" = "maks" "Min barometer" = "Min lufttrykk" "Min inside temperature" = "Min innetemperatur" "Min outside temperature" = "Min utetemperatur" @@ -211,6 +209,7 @@ unit_system = metricwx "Sunrise" = "Soloppgang" "Sunset" = "Solnedgang" "This Month" = "Denne måneden" + "This station uses a" = "Denne stasjonen bruker en" "This Week" = "Denne uken" "This week's max" = "Maks denne uken" "This week's min" = "Min denne uken" @@ -229,6 +228,7 @@ unit_system = metricwx "Weekly Statistics and Plots" = "Ukentlig statistikk og plott" "Weekly Weather Summary" = "Ukentlig væroppsummering" "WeeWX uptime" = "WeeWX oppetid" + "Weewx was designed to be simple, fast, and easy to understand by leveraging modern software concepts." = "
Weewx ble utformet for å være enkel, hurtig og lett å bruke ved hjelp av moderne programmeringsmetoder." "Year" = "År" "Yearly Statistics and Plots" = "Årlig statistikk og plott" "Yearly summary" = "Årlig oppsummering"