Ver código fonte

Added Outside Humidity Graphs and bug fixes

Added outside humidity graphs. Fixed a formatting bug with the high wind speed and direction. Commented out graphics that weren't needed by my station like radiation and pond temp in skin.conf
Josh Smith 8 anos atrás
pai
commit
a67563a5f2
5 arquivos alterados com 65 adições e 49 exclusões
  1. 1 0
      index.html.tmpl
  2. 3 2
      month.html.tmpl
  3. 57 45
      skin.conf
  4. 2 1
      week.html.tmpl
  5. 2 1
      year.html.tmpl

+ 1 - 0
index.html.tmpl

@@ -429,6 +429,7 @@
                     <img src="daywinddir.png" alt="Hi Wind" />
 		    <img src="daywindvec.png" alt="Wind Vector" />
                     <img src="daytempchill.png" alt="heatchill" />
+		    <img src="dayouthumid.png" alt="Outside Humidity" />
 		    <img src="daybarometer.png" alt="barometer"/>
                     <img src="dayinside.png" alt="Inside" />
 		    <img src="dayinhumid.png" alt="Inside Humidity" />

+ 3 - 2
month.html.tmpl

@@ -102,7 +102,7 @@
                         <tr><td>Low Barometer</td><td>$month.barometer.min</td><td>$month.barometer.mintime</td></tr>
                         <tr><td>Rain Total</td><td>$month.rain.sum</td><td></td></tr>
                         <tr><td>High Rain Rate</td><td>$month.rainRate.max</td><td>$month.rainRate.maxtime</td></tr>
-                        <tr><td>High Wind Speed</td><td>$month.wind.max $month.wind.gustdir</td><td>$month.wind.maxtime</td></tr>
+                        <tr><td>High Wind Speed</td><td>$month.wind.max <br>$month.wind.gustdir</td><td>$month.wind.maxtime</td></tr>
                         <tr><td>Average Wind</td><td>$month.wind.avg</td><td></td></tr>
                         <tr><td>RMS Wind</td><td>$month.wind.rms</td><td></td></tr>
                         <tr><td>Vector Average Speed</td><td>$month.wind.vecavg</td><td></td></tr>
@@ -143,7 +143,7 @@
                         <tr><td>Low Barometer</td><td>$year.barometer.min</td><td>$year.barometer.mintime</td></tr>
                         <tr><td>Rain Total</td><td>$year.rain.sum</td><td></td></tr>
                         <tr><td>High Rain Rate</td><td>$year.rainRate.max</td><td>$year.rainRate.maxtime</td></tr>
-                        <tr><td>High Wind Speed</td><td>$year.wind.max $year.wind.gustdir</td><td>$year.wind.maxtime</td></tr>
+                        <tr><td>High Wind Speed</td><td>$year.wind.max <br>$year.wind.gustdir</td><td>$year.wind.maxtime</td></tr>
                         <tr><td>Average Wind</td><td>$year.wind.avg</td><td></td></tr>
                         <tr><td>RMS Wind</td><td>$year.wind.rms</td><td></td></tr>
                         <tr><td>Vector Average Speed</td><td>$year.wind.vecavg</td><td></td></tr>
@@ -183,6 +183,7 @@
                     <img src="monthwindvec.png" alt="Wind Vector" />
 		    <img src="monthtempchill.png" alt="heatchill" />
 		    <img src="monthbarometer.png" alt="barometer"/>
+		    <img src="monthouthumid.png" alt="Outside Humidity" />
 		    <img src="monthinside.png" alt="Inside" />
 		    <img src="monthinhumid.png" alt="Inside Humidity" />
                     #if $month.UV.has_data

+ 57 - 45
skin.conf

@@ -525,14 +525,17 @@
             [[[[rain]]]]
                 aggregate_type = sum
                 aggregate_interval = 3600
-                label = Rain (hourly total)
-                
-        [[[dayrx]]]
-            [[[[rxCheckPercent]]]]
+                label = Rain (Hourly Total)
+        
+        [[[dayouthumid]]]
+            [[[[outHumidity]]]]
+
+        #[[[dayrx]]]
+        #    [[[[rxCheckPercent]]]]
         
-        [[[daypond]]]
-            yscale = None, None, 0.5
-            [[[[extraTemp1]]]]
+        #[[[daypond]]]
+        #    yscale = None, None, 0.5
+        #    [[[[extraTemp1]]]]
         
         [[[daywind]]]
             [[[[windSpeed]]]]
@@ -557,12 +560,12 @@
 	[[[dayinhumid]]]
             [[[[inHumidity]]]]
 
-        [[[dayradiation]]]
-            [[[[radiation]]]]
+        #[[[dayradiation]]]
+        #    [[[[radiation]]]]
 
-        [[[dayuv]]]
-            yscale = 0, 16, 1
-            [[[[UV]]]]
+        #[[[dayuv]]]
+        #    yscale = 0, 16, 1
+        #    [[[[UV]]]]
             
     [[week_images]]
         x_label_format = %d
@@ -584,14 +587,17 @@
             [[[[rain]]]]
                 aggregate_type = sum
                 aggregate_interval = 86400
-                label = Rain (daily total)
+                label = Rain (Daily Total)
+
+	[[[weekouthumid]]]
+            [[[[outHumidity]]]]
         
-        [[[weekpond]]]
-            yscale = None, None, 0.5
-            [[[[extraTemp1]]]]
+        #[[[weekpond]]]
+        #    yscale = None, None, 0.5
+        #    [[[[extraTemp1]]]]
         
-        [[[weekrx]]]
-            [[[[rxCheckPercent]]]]
+        #[[[weekrx]]]
+        #    [[[[rxCheckPercent]]]]
         
         [[[weekwind]]]
             [[[[windSpeed]]]]
@@ -616,12 +622,12 @@
 	[[[weekinhumid]]]
             [[[[inHumidity]]]]
 
-        [[[weekradiation]]]
-            [[[[radiation]]]]
+        #[[[weekradiation]]]
+        #    [[[[radiation]]]]
 
-        [[[weekuv]]]
-            yscale = 0, 16, 1
-            [[[[UV]]]]
+        #[[[weekuv]]]
+        #    yscale = 0, 16, 1
+        #    [[[[UV]]]]
 
     [[month_images]]
         x_label_format = %d
@@ -644,14 +650,17 @@
             [[[[rain]]]]
                 aggregate_type = sum
                 aggregate_interval = 86400
-                label = Rain (daily total)
+                label = Rain (Daily Total)
+
+	[[[monthouthumid]]]
+            [[[[outHumidity]]]]
         
-        [[[monthpond]]]
-            yscale = None, None, 0.5
-            [[[[extraTemp1]]]]
+        #[[[monthpond]]]
+        #    yscale = None, None, 0.5
+        #    [[[[extraTemp1]]]]
         
-        [[[monthrx]]]
-            [[[[rxCheckPercent]]]]
+        #[[[monthrx]]]
+        #    [[[[rxCheckPercent]]]]
         
         [[[monthwind]]]
             [[[[windSpeed]]]]
@@ -676,12 +685,12 @@
 	[[[monthinhumid]]]
             [[[[inHumidity]]]]
 
-        [[[monthradiation]]]
-            [[[[radiation]]]]
+        #[[[monthradiation]]]
+        #    [[[[radiation]]]]
             
-        [[[monthuv]]]
-            yscale = 0, 16, 1
-            [[[[UV]]]]
+        #[[[monthuv]]]
+        #    yscale = 0, 16, 1
+        #    [[[[UV]]]]
 
     [[year_images]]
         x_label_format = %m/%d
@@ -723,14 +732,17 @@
                 aggregate_type = sum
                 # aggregate_interval = 2629800 # Magic number: the length of a nominal month
                 aggregate_interval = 604800    # == 1 week
-                label = Rain (weekly total)
+                label = Rain (Weekly Total)
+
+	[[[yearouthumid]]]
+            [[[[outHumidity]]]]
 
-        [[[yearpond]]]
-            yscale = None, None, 0.5
-            [[[[extraTemp1]]]]
+        #[[[yearpond]]]
+        #    yscale = None, None, 0.5
+        #    [[[[extraTemp1]]]]
         
-        [[[yearrx]]]
-            [[[[rxCheckPercent]]]]
+        #[[[yearrx]]]
+        #    [[[[rxCheckPercent]]]]
         
         [[[yearwinddir]]]
             yscale = 0.0, 360.0, 45.0
@@ -750,12 +762,12 @@
 	[[[yearinhumid]]]
             [[[[inHumidity]]]]
 
-        [[[yearradiation]]]
-            [[[[radiation]]]]
+        #[[[yearradiation]]]
+        #    [[[[radiation]]]]
             
-        [[[yearuv]]]
-            yscale = 0, 16, 1
-            [[[[UV]]]]
+        #[[[yearuv]]]
+        #    yscale = 0, 16, 1
+        #    [[[[UV]]]]
 
 ###############################################################################
 

+ 2 - 1
week.html.tmpl

@@ -185,7 +185,7 @@
                         <tr><td>Low Barometer</td><td>$month.barometer.min</td><td>$month.barometer.mintime</td></tr>
                         <tr><td>Rain Total</td><td>$month.rain.sum</td><td></td></tr>
                         <tr><td>High Rain Rate</td><td>$month.rainRate.max</td><td>$month.rainRate.maxtime</td></tr>
-                        <tr><td>High Wind Speed</td><td>$month.wind.max $month.wind.gustdir</td><td>$month.wind.maxtime</td></tr>
+                        <tr><td>High Wind Speed</td><td>$month.wind.max <br>$month.wind.gustdir</td><td>$month.wind.maxtime</td></tr>
                         <tr><td>Average Wind</td><td>$month.wind.avg</td><td></td></tr>
                         <tr><td>RMS Wind</td><td>$month.wind.rms</td><td></td></tr>
                         <tr><td>Vector Average Speed</td><td>$month.wind.vecavg</td><td></td></tr>
@@ -224,6 +224,7 @@
                     <img src="weekwinddir.png" alt="Hi Wind" />
                     <img src="weekwindvec.png" alt="Wind Vector" />
 		    <img src="weektempchill.png" alt="heatchill" />
+		    <img src="weekouthumid.png" alt="Outside Humidity" />
                     <img src="weekbarometer.png" alt="barometer"/>
                     <img src="weekinside.png" alt="Inside" />
 		    <img src="weekinhumid.png" alt="Inside Humidity" />

+ 2 - 1
year.html.tmpl

@@ -99,7 +99,7 @@
                         <tr><td>Low Humidity</td><td>$year.outHumidity.min</td><td>$year.outHumidity.mintime</td></tr>
                         <tr><td>High Barometer</td><td>$year.barometer.max</td><td>$year.barometer.maxtime</td></tr>
                         <tr><td>Low Barometer</td><td>$year.barometer.min</td><td>$year.barometer.mintime</td></tr>
-                        <tr><td>High Wind Speed</td><td>$year.wind.max $year.wind.gustdir</td><td>$year.wind.maxtime</td></tr>
+                        <tr><td>High Wind Speed</td><td>$year.wind.max <br>$year.wind.gustdir</td><td>$year.wind.maxtime</td></tr>
                         <tr><td>Average Wind</td><td>$year.wind.avg</td><td></td></tr>
                         <tr><td>RMS Wind</td><td>$year.wind.rms</td><td></td></tr>
                         <tr><td>Vector Average Speed</td><td>$year.wind.vecavg</td><td></td></tr>
@@ -148,6 +148,7 @@
                     <img src="yearwindvec.png" alt="Wind Vector" />
 		    <img src="yeartempchill.png" alt="heatchill" />
 		    <img src="yearbarometer.png" alt="barometer"/>
+		    <img src="yearouthumid.png" alt="Outside Humidity" />
 		    <img src="yearinside.png" alt="Inside" />
 		    <img src="yearinhumid.png" alt="Inside Humidity" />
                     #if $year.UV.has_data