Merge branch 'main' into dwd-mqtt

Daveiano · Feb 21, 2024 · a9f3184 · a9f3184
2 parents 0160f16 + e5e0c68
commit a9f3184
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/readme.md b/readme.md
@@ -28,7 +28,7 @@ Logs are in /var/log/syslog.
 ```
 docker volume create weewx-db
 docker volume create weewx-html
-docker run -d --restart unless-stopped -p 9877:9877 --name weewx -v weewx-db:/home/weewx/archive -v weewx-html:/home/weewx/public_html weewx
+docker run -d --restart unless-stopped -p 9877:9877 --name weewx -v weewx-db:/home/weewx-data/archive -v weewx-html:/home/weewx-data/public_html weewx
 ```
 
 Run nginx with weewx generated files: `docker run -it --rm -d -p 8080:80 --name web -v weewx-html:/usr/share/nginx/html nginx`

diff --git a/src/skin.conf b/src/skin.conf
@@ -1,6 +1,6 @@
 # configuration file for the weewx-wdc skin
 SKIN_NAME = Weather Data Center
-SKIN_VERSION = 3.4.0
+SKIN_VERSION = 3.5.0-beta1
 
 # For instructions, see https://github.com/Daveiano/weewx-wdc/wiki/Custom-data-bindings
 [ObservationBindings]
@@ -80,6 +80,9 @@ SKIN_VERSION = 3.4.0
     radar_html = '<a href="https://www.dwd.de/DE/leistungen/radarbild_film/radarbild_film.html"><img src="https://www.dwd.de/DWD/wetter/radar/radfilm_sac_akt.gif" alt="Radar" loading="lazy" /></a>'
     forecast_radar_heading = "Forecast & Recent radar by DWD / Allsky cam"
 
+    # Open the radar and external images/videos in a modal.
+    open_radar_and_externals_modal = False
+
     # Set to True to have the Forecast tile and the radar/externals tile to have the same width.
     # Default is forecast = 2/3 and radar tile = 1/3.
     forecast_radar_equal_width = False
@@ -160,6 +163,7 @@ SKIN_VERSION = 3.4.0
         show_moon = 1
         show_pop = 1
         show_precip = 1
+        show_precip_detail = 1
 
     [[weewx-DWD]]
        show_text_forecast = True
@@ -190,6 +194,9 @@ SKIN_VERSION = 3.4.0
     # 'alternative' or 'classic'.
     layout = 'alternative'
 
+    # 'auto', 'light' or 'dark'.
+    default_theme = 'auto'
+
     # Date/Time localization for charts. Available locales: de-DE, en-US, en-GB, it-IT, nl-NL.
     # If not set, the value from weewx.conf (reports section) will be used. If lang = en, then en-US will be used (sorry GB!).
     #date_time_locale = en-US
@@ -219,13 +226,20 @@ SKIN_VERSION = 3.4.0
     show_min_max_time_week = False
     show_min_max_time_month = False
 
+    # Color the outTemp stat tile based on the temperature. Only available for alternative layout.
+    outTemp_stat_tile_color = True
+    outTemp_stat_tile_color_transparency = 0.35
+    outTemp_stat_tile_color_min = -20
+    outTemp_stat_tile_color_max = 40
+
     # windDir as oridnals (N, E, S, W).
     stat_tile_winddir_ordinal = True
     diagram_tile_winddir_ordinal = True
 
     # Windrose.
     windRose_colors = "#f3cec9", "#e7a4b6", "#cd7eaf", "#a262a9", "#6f4d96", "#3d3b72"
     windRose_show_beaufort = True
+    windRose_legend_show_units = True
 
     # Climatogram on year and statistics pages.
     climatogram_enable_stats = True
@@ -263,6 +277,7 @@ SKIN_VERSION = 3.4.0
         color_scheme = interpolateRdBu
         invert_color_scheme = 1
         show_min_max = 1
+        hide_tick_unit = 0
         [[[day]]]
             aggregate_interval = 21600 # 6 hours
             [[[[outTemp]]]]
@@ -294,6 +309,17 @@ SKIN_VERSION = 3.4.0
         load5 = 2
         load15 = 2
 
+    # For instructions, see https://github.com/Daveiano/weewx-wdc/wiki/Configuration#stat_tables
+    [[stat_tables]]
+        [[[tables_outtemp]]]
+            observation = "outTemp"
+            label = "Temperature Stat Table"
+            aggregate_types = "min", "avg", "max"
+        [[[tables_rain]]]
+            observation = "rain"
+            label = "Rain Stat Table"
+            aggregate_types = "sum", "avg"
+
     [[tables]]
         #[[[Rounding]]]
             #outTemp = 3
@@ -415,18 +441,18 @@ SKIN_VERSION = 3.4.0
                 markerValue = 0
                 markerColor = "#00BFFF"
                 [[[[[obs]]]]]
-                    [[[[[[outTemp_min]]]]]]
+                    [[[[[[outTemp_max]]]]]]
                         observation = "outTemp"
-                        aggregate_type = "min"
-                        color = "#0198E1"
+                        aggregate_type = "max"
+                        color = "#8B0000"
                     [[[[[[outTemp_average]]]]]]
                         observation = "outTemp"
                         aggregate_type = "avg"
                         color = "#666666"
-                    [[[[[[outTemp_max]]]]]]
+                    [[[[[[outTemp_min]]]]]]
                         observation = "outTemp"
-                        aggregate_type = "max"
-                        color = "#8B0000"
+                        aggregate_type = "min"
+                        color = "#0198E1"
 
             [[[[tempdew]]]]
                 label = 'Temperature / Dewpoint'
@@ -968,7 +994,7 @@ SKIN_VERSION = 3.4.0
         daily_archive = %Y-%m-%d
 
 [CopyGenerator]
-    copy_once = dist/main.js, dist/main.css, plotly-custom-build.min.js, dist/live-updates.js, favicon.ico, icon-192x192.png, icon-256x256.png, icon-384x384.png, icon-512x512.png, service-worker.js, dist/assets
+    copy_once = dist/main.js, dist/main.css, plotly-custom-build.min.js, dist/live-updates.js, dist/colored-temperature.js, favicon.ico, icon-192x192.png, icon-256x256.png, icon-384x384.png, icon-512x512.png, service-worker.js, dist/assets
     copy_always = dwd/SchilderLZ.jpg, dwd/bwk_bodendruck_weu_ana.png, dwd/bwk_bodendruck_na_ana.png
 
 [Generators]