diff --git a/TODO.txt b/TODO.txt index f8c0663e..beb84d2e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,2 @@ TODO before the next release: -ET values are not being generated when using software record generation. - diff --git a/bin/weewx/accum.py b/bin/weewx/accum.py index df9c16d4..93bf44c9 100644 --- a/bin/weewx/accum.py +++ b/bin/weewx/accum.py @@ -317,9 +317,9 @@ class WXAccum(BaseAccum): record['windDir'] = self[obs_type].vec_dir record['windGust'] = self[obs_type].max record['windGustDir'] = self[obs_type].max_dir - elif obs_type == 'rain': - # We need total rain during the timespan, not the average: - record['rain'] = self[obs_type].sum + elif obs_type in ['rain', 'ET']: + # We need totals during the timespan, not the average: + record[obs_type] = self[obs_type].sum elif obs_type in ['hourRain', 'dayRain', 'monthRain', 'yearRain', 'totalRain']: # For these types, we want the last observation: record[obs_type] = self[obs_type].last diff --git a/docs/changes.txt b/docs/changes.txt index 822d31a0..173e43fa 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,7 +1,7 @@ weewx change history -------------------- -2.X.Y 09/ZZ/13 +2.5.0 09/ZZ/13 Weewx now allows easier localization to non-English speaking locales. In particular, set the environment variable LANG to your locale, and @@ -14,6 +14,9 @@ speed is zero. The LOOP value for daily ET on Vantages was too high by a factor of 10. This has been corrected. +Fixed a bug that caused values of ET to be miscalculated when using +software record generation. + Ported to Korora 19 (Fedora 19). Thanks to user zmodemguru! Plots under 16 hours in length, now use 1 hour increments (instead of