From 6d875f61c9b23e65c543d48f948c4721524e943c Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 16 Oct 2022 20:47:08 +0200 Subject: [PATCH] Update weewx-wdc --- Dockerfile | 4 +- defaults/skin-wdc/skin.conf | 93 ++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ce59cd..10554c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG WEEWX_UID=421 ENV WEEWX_HOME="/home/weewx" ENV WEEWX_VERSION="4.8.0" ENV ARCHIVE="weewx-${WEEWX_VERSION}.tar.gz" -ENV WEEWX_WDC_VERSION="v2.2.1" +ENV WEEWX_WDC_VERSION="v2.3.0" RUN addgroup --system --gid ${WEEWX_UID} weewx \ && adduser --system --uid ${WEEWX_UID} --ingroup weewx weewx @@ -30,7 +30,7 @@ RUN pip install --no-cache-dir --requirement requirements.txt # Download weewx and plugins RUN wget -O "${ARCHIVE}" "http://www.weewx.com/downloads/released_versions/${ARCHIVE}" &&\ - wget -O weewx-MQTTSubscribe.zip https://github.com/bellrichm/WeeWX-MQTTSubscribe/archive/master.zip &&\ + wget -O weewx-MQTTSubscribe.zip https://github.com/bellrichm/WeeWX-MQTTSubscribe/archive/refs/tags/v2.2.2.zip &&\ wget -O weewx-forecast.zip https://github.com/chaunceygardiner/weewx-forecast/archive/master.zip &&\ wget -O weewx-GTS.zip https://github.com/roe-dl/weewx-GTS/archive/master.zip &&\ wget -O weewx-purpleair.zip https://github.com/xslima00/weewx-purpleair/archive/refs/heads/patch-1.zip &&\ diff --git a/defaults/skin-wdc/skin.conf b/defaults/skin-wdc/skin.conf index 03676ab..7a637a7 100644 --- a/defaults/skin-wdc/skin.conf +++ b/defaults/skin-wdc/skin.conf @@ -1,6 +1,6 @@ # configuration file for the weewx-wdc skin SKIN_NAME = Weather Data Center -SKIN_VERSION = 2.2.1 +SKIN_VERSION = 2.3.0 [Extras] # Show a link to the GitHub respository of this skin. Set to False to hide. @@ -34,6 +34,30 @@ SKIN_VERSION = 2.2.1 show_precip = 1 show_obvis = 0 + #[[weewx-DWD]] + # show_text_forecast = True + # text_forecast_VHDL = DWLG + # dwd_link = https://www.dwd.de/DE/wetter/wetterundklima_vorort/sachsen/sac_node.html + # show_pressure_map = True + # show_warning_map = True + # show_text_warnings = True + # show_warnings_on_front = XXX + # show_forecast = True + # mosmix_id = XXXX + # [[[forecast_table_settings]]] + # show_hourly = 1 + # show_date = 1 + # show_outlook = 1 + # show_temp = 1 + # show_dewpoint = 1 + # show_pressure = 1 + # show_wind= 1 + # show_pop = 1 + # show_precip = 1 + # show_cloud_cover = 1 + # show_sun_dur = 1 + # carbon_icons = 0 + [DisplayOptions] layout = 'alternative' climatological_days = rainDays, summerDays, hotDays, desertDays, tropicalNights, stormDays, iceDays, frostDays @@ -42,7 +66,25 @@ SKIN_VERSION = 2.2.1 diagram_tile_observations = temp_min_max_avg, tempdew, outHumidity, barometer, windchill_heatindex, appTemp, wind, windDir, windRose, rain, rainRate, UV, ET, luminosity, radiation, cloudbase, soilTemp1, soilMoist1, lightning_strike_count, pm1_0, pm2_5, pm10_0 stat_tile_winddir_ordinal = True diagram_tile_winddir_ordinal = True + show_min_max_time_day = True + show_min_max_time_yesterday = True + show_min_max_time_week = True + show_min_max_time_month = True windRose_colors = "#f3cec9", "#e7a4b6", "#cd7eaf", "#a262a9", "#6f4d96", "#3d3b72" + windRose_show_beaufort = False + + [[tables]] + [[[day]]] + aggregate_interval = 3600 # 1 hour + [[[week]]] + aggregate_interval = 21600 # 6 hours + [[[month]]] + aggregate_interval = 43200 # 12 hours + [[[year]]] + aggregate_interval = 86400 # 1 day + [[[alltime]]] + aggregate_interval = 86400 # 1 day + [[diagrams]] [[[combined_observations]]] [[[[temp_min_max_avg]]]] @@ -115,11 +157,13 @@ SKIN_VERSION = 2.2.1 [[[windSpeed]]] yScaleMin = 0 [[[windGust]]] + aggregate_type = "max" yScaleMin = 0 [[[radiation]]] curve = "basis" yScaleMin = 0 [[[UV]]] + aggregate_type = "max" curve = "step" yScaleMin = 0 yScaleOffset = 1 @@ -127,8 +171,10 @@ SKIN_VERSION = 2.2.1 color = '#FFCC00' yScaleMin = 0 [[[rain]]] + aggregate_type = "sum" yScaleOffset = 0.25 [[[rainRate]]] + aggregate_type = "max" curve = "linear" yScaleMin = 0 yScaleOffset = 0.25 @@ -136,6 +182,7 @@ SKIN_VERSION = 2.2.1 yScaleMin = 0 yScaleMax = 103 [[[ET]]] + aggregate_type = "sum" yScaleOffset = 0.02 [[[pressure]]] yScaleOffset = 1 @@ -147,8 +194,8 @@ SKIN_VERSION = 2.2.1 color = '#0099CC' yScaleMin = 0 [[[lightning_strike_count]]] - curve = "step" aggregate_type = "sum" + curve = "step" color = '#FF4C00' yScaleMin = 0 [[[pm1_0]]] @@ -164,6 +211,42 @@ SKIN_VERSION = 2.2.1 color = '#00B335' yScaleMin = 0 + [[[day]]] + aggregate_interval = 1800 # 30 minutes + [[[[ET]]]] + aggregate_interval = 7200 # 2 hours + [[[[rain]]]] + aggregate_interval = 7200 # 2 hours + [[[[lightning_strike_count]]]] + aggregate_interval = 7200 # 2 hours + + [[[week]]] + aggregate_interval = 7200 # 2 hours + [[[[ET]]]] + aggregate_interval = 86400 # 1 day + [[[[rain]]]] + aggregate_interval = 86400 # 1 day + [[[[lightning_strike_count]]]] + aggregate_interval = 86400 # 1 day + + [[[month]]] + aggregate_interval = 21600 # 6 hours + [[[[ET]]]] + aggregate_interval = 172800 # 2 days + [[[[rain]]]] + aggregate_interval = 172800 # 2 days + [[[[lightning_strike_count]]]] + aggregate_interval = 172800 # 2 days + + [[[year]]] + aggregate_interval = 172800 # 2 days + [[[[ET]]]] + aggregate_interval = 1555200 # 8 days + [[[[rain]]]] + aggregate_interval = 1555200 # 8 days + [[[[lightning_strike_count]]]] + aggregate_interval = 1555200 # 8 days + [[[heights]]] [[[[classic]]]] height = "220px" @@ -208,6 +291,9 @@ SKIN_VERSION = 2.2.1 [[[day]]] template = index.html.tmpl + # [[[yesterday]]] + # template = yesterday.html.tmpl + [[[week]]] template = week.html.tmpl @@ -230,6 +316,9 @@ SKIN_VERSION = 2.2.1 #[[[about]]] #template = about.html.tmpl #title = About + #[[[DWD]]] + #template = dwd.html.tmpl + #title = Vorhersage vom DWD [Units] [[TimeFormats]]