diff --git a/fhem/CHANGED b/fhem/CHANGED
index e37024d92..24f346d22 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
+ - feature: 59_WUup: added AqPM2.5, AqPM10; fixed documentation
- bugfix: 73_ElectricityCalculator: missing notifydev implemented
- bugfix: 73_GasCalculator: missing notifydev implemented
- bugfix: 73_WaterCalculator: missing notifydev implemented
diff --git a/fhem/FHEM/59_WUup.pm b/fhem/FHEM/59_WUup.pm
index b2c854041..e3465c35a 100644
--- a/fhem/FHEM/59_WUup.pm
+++ b/fhem/FHEM/59_WUup.pm
@@ -32,7 +32,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils;
use UConv;
-my $version = "0.9.7";
+my $version = "0.9.8";
# Declare functions
sub WUup_Initialize($);
@@ -66,7 +66,7 @@ sub WUup_Initialize($) {
. "wubaromin wudailyrainin wudewptf wuhumidity wurainin wusoilmoisture "
. "wusoiltempf wusolarradiation wutempf wuUV wuwinddir wuwinddir_avg2m "
. "wuwindgustdir wuwindgustdir_10m wuwindgustmph wuwindgustmph_10m "
- . "wuwindspdmph_avg2m wuwindspeedmph "
+ . "wuwindspdmph_avg2m wuwindspeedmph wuAqPM2.5 wuAqPM10 "
. $readingFnAttributes;
$hash->{VERSION} = $version;
}
@@ -354,6 +354,7 @@ sub WUup_receive($) {
# 2017-10-19 added set-command "update"
# 2018-03-19 solarradiation calculated from lux to W/m² (thanks to dieter114)
# 2018-04-10 added attribute round
+# 2018-04-13 added AqPM2.5 and AqPM10
#
################################################################################
@@ -422,24 +423,26 @@ sub WUup_receive($) {
Solarradiation takes readings in lux and converts them to W/m²
The following information is supported:
- - winddir - [0-360 instantaneous wind direction]
- - windspeedmph - [mph instantaneous wind speed]
- - windgustmph - [mph current wind gust, using software specific time period]
- - windgustdir - [0-360 using software specific time period]
- - windspdmph_avg2m - [mph 2 minute average wind speed mph]
- - winddir_avg2m - [0-360 2 minute average wind direction]
- - windgustmph_10m - [mph past 10 minutes wind gust mph]
- - windgustdir_10m - [0-360 past 10 minutes wind gust direction]
- - humidity - [% outdoor humidity 0-100%]
- - dewptf- [F outdoor dewpoint F]
- - tempf - [F outdoor temperature]
- - rainin - [rain inches over the past hour)] -- the accumulated rainfall in the past 60 min
- - dailyrainin - [rain inches so far today in local time]
- - baromin - [barometric pressure inches]
- - soiltempf - [F soil temperature]
- - soilmoisture - [%]
- - solarradiation - [W/m²]
+ - winddir - instantaneous wind direction (0-360) [°]
+ - windspeedmph - instantaneous wind speed ·[mph]
+ - windgustmph - current wind gust, using software specific time period [mph]
+ - windgustdir - current wind direction, using software specific time period [°]
+ - windspdmph_avg2m - 2 minute average wind speed [mph]
+ - winddir_avg2m - 2 minute average wind direction [°]
+ - windgustmph_10m - past 10 minutes wind gust [mph]
+ - windgustdir_10m - past 10 minutes wind gust direction [°]
+ - humidity - outdoor humidity (0-100) [%]
+ - dewptf- outdoor dewpoint [F]
+ - tempf - outdoor temperature [F]
+ - rainin - rain over the past hour -- the accumulated rainfall in the past 60 min [in]
+ - dailyrainin - rain so far today in local time [in]
+ - baromin - barometric pressure [inHg]
+ - soiltempf - soil temperature [F]
+ - soilmoisture - soil moisture [%]
+ - solarradiation - solar radiation[W/m²]
- UV - [index]
+ - AqPM2.5 - PM2.5 mass [µg/m³]
+ - AqPM10 - PM10 mass [µg/m³]
@@ -522,24 +525,26 @@ sub WUup_receive($) {
Solarradiation nimmt Readings in lux an und rechnet diese in W/m² um.
Unterstützte Angaben
- - Winddir - [0-360 momentane Windrichtung]
- - Windspeedmph - [mph momentane Windgeschwindigkeit]
- - Windgustmph - [mph aktuellen Böe, mit Software-spezifischem Zeitraum]
- - Windgustdir - [0-360 mit Software-spezifischer Zeit]
- - Windspdmph_avg2m - [mph durchschnittliche Windgeschwindigkeit innerhalb 2 Minuten]
- - Winddir_avg2m - [0-360 durchschnittliche Windrichtung innerhalb 2 Minuten]
- - Windgustmph_10m - [mph Böen der vergangenen 10 Minuten]
- - Windgustdir_10m - [0-360 Richtung der Böen der letzten 10 Minuten]
- - Feuchtigkeit - [% Außenfeuchtigkeit 0-100%]
- - Dewptf- [F Taupunkt im Freien]
- - Tempf - [F Außentemperatur]
- - Rainin - [in Regen in der vergangenen Stunde]
- - Dailyrainin - [in Regenmenge bisher heute]
- - Baromin - [inHg barometrischer Druck]
- - Soiltempf - [F Bodentemperatur]
- - Bodenfeuchtigkeit - [%]
- - Solarradiation - [W/m²]
+ - winddir - momentane Windrichtung (0-360) [°]
+ - windspeedmph - momentane Windgeschwindigkeit [mph]
+ - windgustmph - aktuelle Böe, mit Software-spezifischem Zeitraum [mph]
+ - windgustdir - aktuelle Böenrichtung, mit Software-spezifischer Zeitraum [°]
+ - windspdmph_avg2m - durchschnittliche Windgeschwindigkeit innerhalb 2 Minuten [mph]
+ - winddir_avg2m - durchschnittliche Windrichtung innerhalb 2 Minuten [°]
+ - windgustmph_10m - Böen der vergangenen 10 Minuten [mph]
+ - windgustdir_10m - Richtung der Böen der letzten 10 Minuten [°]
+ - humidity - Luftfeuchtigkeit im Freien (0-100) [%]
+ - dewptf- Taupunkt im Freien [F]
+ - tempf - Außentemperatur [F]
+ - rainin - Regen in der vergangenen Stunde [in]
+ - dailyrainin - Regenmenge bisher heute [in]
+ - baromin - barometrischer Druck [inHg]
+ - soiltempf - Bodentemperatur [F]
+ - soilmoisture - Bodenfeuchtigkeit [%]
+ - solarradiation - Sonneneinstrahlung [W/m²]
- UV - [Index]
+ - AqPM2.5 - Feinstaub PM2,5 [µg/m³]
+ - AqPM10 - Feinstaub PM10 [µg/m³]