diff --git a/fhem/FHEM/59_LuftdatenInfo.pm b/fhem/FHEM/59_LuftdatenInfo.pm
index c5283347e..88974d1d8 100644
--- a/fhem/FHEM/59_LuftdatenInfo.pm
+++ b/fhem/FHEM/59_LuftdatenInfo.pm
@@ -124,7 +124,7 @@ sub LuftdatenInfo_Define($$) {
$hash->{DEF} = "$MODE $hash->{SENSORIDS}";
}
elsif(!$DEF){
- $hash->{ADDRESS} = $DEF;
+ $hash->{ADDRESS} = $MODE;
$MODE = "local";
@@ -428,7 +428,10 @@ sub LuftdatenInfo_ParseHttpResponse($) {
))[0];
$device = IsDevice($device, $TYPE) ? $defs{$device} : $hash;
- if($_->{value_type} =~ /P1$/){
+ if($_->{value_type} =~ /P0$/){
+ $_->{value_type} = "PM1";
+ }
+ elsif($_->{value_type} =~ /P1$/){
$_->{value_type} = "PM10";
}
elsif($_->{value_type} =~ /P2$/){
@@ -469,12 +472,18 @@ sub LuftdatenInfo_ParseHttpResponse($) {
$_->{value} = ($_->{value} > 10000 ? $_->{value} / 100 : $_->{value});
$_->{value_type} = "pressureNN";
}
+ elsif($_->{value_type} =~ /_risk/){
+ $_->{value_type} = "UVRisk";
+ }
elsif($_->{value_type} eq "signal"){
$_->{value_type} = "signal";
}
elsif($_->{value_type} =~ /temperature$/){
$_->{value_type} = "temperature";
}
+ elsif($_->{value_type} =~ /_watt/){
+ $_->{value_type} = "UVIntensity";
+ }
elsif($_->{value_type} =~ /_time$/){
$_->{value_type} = "time";
}
@@ -609,70 +618,81 @@ sub LuftdatenInfo_statusRequest($) {
Readings
-
- -
-
PM10
- Quantity of particles with a diameter of less than 10 μm in μg / m³
-
- -
-
PM2.5
- Quantity of particles with a diameter of less than 2.5 μm in μg / m³
-
- -
-
temperature
- Temperature in °C
-
- -
-
humidity
- Relative humidity in %
-
- -
-
pressure
- Pressure in hPa
-
- -
-
pressureNN
- Pressure at sea level in hPa
- Is calculated if pressure and temperature sensor are active and the
- sensor is not at sea level.
- The height, can be determined by maps or SmartPhone, needs to be
- specified at the configuration page.
-
- -
-
illuminanceFull
- illuminace of the full spectrum in lux
-
- -
-
illuminanceIR
- illuminace of the IR spectrum in lux
-
- -
-
illuminanceUV
- ???
-
- -
-
illuminanceVisible
- illuminace of the visible spectrum in lux
-
- -
-
latitude
-
- -
-
longitude
-
- -
-
altitude
-
- -
-
location
- location as "postcode city"
- Only available with remote query.
-
- -
-
signal
- WLAN signal strength in dBm
- Only available with local query.
-
+ -
+
altitude
+
+ -
+
humidity
+ Relative humidity in %
+
+ -
+
illuminanceFull
+ Illuminace of the full spectrum in lux
+
+ -
+
illuminanceIR
+ Iilluminace of the IR spectrum in lux
+
+ -
+
illuminanceUV
+ Iilluminace of the UV spectrum in lux
+
+ -
+
illuminanceVisible
+ Iilluminace of the visible spectrum in lux
+
+ -
+
latitude
+
+ -
+
location
+ location as "postcode city"
+ Only available with remote query.
+
+ -
+
longitude
+
+ -
+
PM1
+ Quantity of particles with a diameter of less than 1 μm in μg/m³
+
+ -
+
PM2.5
+ Quantity of particles with a diameter of less than 2.5 μm in μg/m³
+
+ -
+
PM10
+ Quantity of particles with a diameter of less than 10 μm in μg/m³
+
+ -
+
pressure
+ Pressure in hPa
+
+ -
+
pressureNN
+ Pressure at sea level in hPa
+ Is calculated if pressure and temperature sensor are active and the
+ sensor is not at sea level.
+ The height, can be determined by maps or SmartPhone, needs to be
+ specified at the configuration page.
+
+ -
+
signal
+ WLAN signal strength in dBm
+ Only available with local query.
+
+ -
+
temperature
+ Temperature in °C
+
+ -
+
UVIntensity
+ UV intensity in W
+
+ -
+
UVRisk
+ UV risk from 1 to 5
+
Attribute
@@ -770,20 +790,53 @@ sub LuftdatenInfo_statusRequest($) {
Readings
-
-
PM10
- Menge der Partikel mit einem Durchmesser von weniger als 10 µm in µg/m³
+ altitude
+ Höhe über NN
+
+ -
+
humidity
+ Relative Luftfeuchtgkeit in %
+
+ -
+
illuminanceFull
+ Helligkeit des vollen Bereich in lux
+
+ -
+
illuminanceIR
+ Helligkeit des IR Bereich in lux
+
+ -
+
illuminanceUV
+ Helligkeit des UV Bereich in lux
+
+ -
+
illuminanceVisible
+ Helligkeit des sichtbaren Bereich in lux
+
+ -
+
latitude
+ Längengrad
+
+ -
+
location
+ Standort als "Postleitzahl Ort"
+ Nur bei remote Abfrage verfügbar.
+
+ -
+
longitude
+ Breitengrad
+
+ -
+
PM1
+ Menge der Partikel mit einem Durchmesser von weniger als 1 µm in µg/m³
-
PM2.5
Menge der Partikel mit einem Durchmesser von weniger als 2.5 µm in µg/m³
-
-
temperature
- Temperatur in °C
-
- -
-
humidity
- Relative Luftfeuchtgkeit in %
+ PM10
+ Menge der Partikel mit einem Durchmesser von weniger als 10 µm in µg/m³
-
pressure
@@ -797,44 +850,23 @@ sub LuftdatenInfo_statusRequest($) {
Hierzu ist die Höhe, kann über Kartendienste oder SmartPhone ermittelt
werden, auf der Konfigurationsseite anzugeben.
- -
-
illuminanceFull
- Helligkeit des vollen Bereich in lux
-
- -
-
illuminanceIR
- Helligkeit des IR Bereich in lux
-
- -
-
illuminanceUV
- ???
-
- -
-
illuminanceVisible
- Helligkeit des sichtbaren Bereich in lux
-
- -
-
latitude
- Längengrad
-
- -
-
longitude
- Breitengrad
-
- -
-
altitude
- Höhe über NN
-
- -
-
location
- Standort als "Postleitzahl Ort"
- Nur bei remote Abfrage verfügbar.
-
-
signal
WLAN Signalstärke in dBm
Nur bei local Abfrage verfügbar.
+ -
+
temperature
+ Temperatur in °C
+
+ -
+
UVIntensity
+ UV Intensität in W
+
+ -
+
UVRisk
+ UV Risiko von 1 bis 5
+
Attribute