From b69b2225889194978544a3d6277dcafc5b76312a Mon Sep 17 00:00:00 2001
From: "klaus.schauer" <>
Date: Mon, 7 Dec 2020 18:05:47 +0000
Subject: [PATCH] 00_ElsnerWS: minor function and commandref changes
git-svn-id: https://svn.fhem.de/fhem/trunk@23307 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/00_ElsnerWS.pm | 81 ++++++++++++++++++++++------------------
1 file changed, 44 insertions(+), 37 deletions(-)
diff --git a/fhem/FHEM/00_ElsnerWS.pm b/fhem/FHEM/00_ElsnerWS.pm
index faeaa497c..1f21667e0 100644
--- a/fhem/FHEM/00_ElsnerWS.pm
+++ b/fhem/FHEM/00_ElsnerWS.pm
@@ -417,37 +417,37 @@ sub ElsnerWS_Read($) {
$data = $rest;
# custom command exec
- %specials = ("%NAME" => $name,
- "%TYPE" => $hash->{TYPE},
- "%BRIGHTNESS" => $brightness,
- "%DATE" => $date,
- "%DAYNIGHT" => $twilightFlag,
- "%HEMISPHERE" => $hemisphere,
- "%ISRAINING" => $isRaining,
- "%ISSTORMY" => $isStormy,
- "%ISSUNNY" => $isSunny,
- "%ISSUNNYEAST" => $isSunnyEast,
- "%ISSUNNYSOUTH" => $isSunnySouth,
- "%ISSUNNYWEST" => $isSunnyWest,
- "%ISWINDY" => $isWindy,
- "%LATITUDE" => $latitude,
- "%LONGITUDE" => $longitude,
- "%SUNAZIMUTH" => $sunAzimuth,
- "%SUNEAST" => $sunEast,
- "%SUNELAVATION" => $sunElevation,
- "%SUNSOUTH" => $sunSouth,
- "%SUNWEST" => $sunWest,
- "%TEMPERATURE" => $temperature,
- "%TIME" => $time,
- "%TIMEZONE" => $timeZone,
- "%TWILIGHT" => $twilight,
- "%WEEKDAY" => $weekday,
- "%WINDAVG2MIN" => $windAvg2min,
- "%WINDGUST10MIN" => $windGust10min,
- "%WINDGUSTCURRNT" => $windGustCurrent,
- "%WINDPEAK10MIN" => $windPeak10min,
- "%WINDSPEED" => $windSpeed,
- "%WINDSTENGTH" => $windStrength);
+ %specials = ("%NAME" => $name,
+ "%TYPE" => $hash->{TYPE},
+ "%BRIGHTNESS" => $brightness,
+ "%DATE" => $date,
+ "%DAYNIGHT" => $twilightFlag,
+ "%HEMISPHERE" => $hemisphere,
+ "%ISRAINING" => $isRaining,
+ "%ISSTORMY" => $isStormy,
+ "%ISSUNNY" => $isSunny,
+ "%ISSUNNYEAST" => $isSunnyEast,
+ "%ISSUNNYSOUTH" => $isSunnySouth,
+ "%ISSUNNYWEST" => $isSunnyWest,
+ "%ISWINDY" => $isWindy,
+ "%LATITUDE" => $latitude,
+ "%LONGITUDE" => $longitude,
+ "%SUNAZIMUTH" => $sunAzimuth,
+ "%SUNEAST" => $sunEast,
+ "%SUNELAVATION" => $sunElevation,
+ "%SUNSOUTH" => $sunSouth,
+ "%SUNWEST" => $sunWest,
+ "%TEMPERATURE" => $temperature,
+ "%TIME" => $time,
+ "%TIMEZONE" => $timeZone,
+ "%TWILIGHT" => $twilight,
+ "%WEEKDAY" => $weekday,
+ "%WINDAVG2MIN" => $windAvg2min,
+ "%WINDGUST10MIN" => $windGust10min,
+ "%WINDGUSTCURRNT" => $windGustCurrent,
+ "%WINDPEAK10MIN" => $windPeak10min,
+ "%WINDSPEED" => $windSpeed,
+ "%WINDSTENGTH" => $windStrength);
my $customCmdDown = AttrVal($name, "customCmdDown", undef);
my $customCmdDownPeriod = AttrVal($name, "customCmdDownPeriod", 'once');
@@ -876,6 +876,13 @@ sub ElsnerWS_Attr(@) {
}
}
}
+ } elsif ($attrName eq "customCmdPriority") {
+ if (!defined $attrVal) {
+
+ } elsif ($attrVal !~ m/^down|up$/) {
+ $err = "attribute-value [$attrName] = $attrVal wrong";
+ CommandDeleteAttr(undef, "$name $attrName");
+ }
} elsif ($attrName eq "signOfLife") {
if (!defined $attrVal) {
@@ -1019,10 +1026,10 @@ sub ElsnerWS_Shutdown($) {
Day/night signal
Display of date, time, sun azimuth, sun elevation, longitude and latitude
Execution of custom alarm commands, see customCmdAlarmOff and
- customCmdAlarmOn
+ customCmdAlarmOn.
Execution of custom up and down commands that can be triggered by the readings dayNight, isRaining, isStormy,
isSunny, isSunnyEast, isSunnySouth, isSunnyWest and isWindy, see customCmdDown and
- customCmdUp
+ customCmdUp.
Prerequisites
@@ -1123,8 +1130,8 @@ sub ElsnerWS_Shutdown($) {
else it is a "plain" fhem.pl command (chain). In the <command> you can access the name of the device by using $NAME, $TYPE
and the current readings
$BRIGHTNESS, $DATE, $DAYNIGHT, $HEMISPHERE, $ISRAINING, $ISSTORMY, $ISSUNNY, $ISSUNNYEAST, $ISSUNNYSOUTH",
- $ISSUNNYWEST, $ISWINDY, $LATITUDE, $LONGITUDE, $SUNAZIMUTH, $SUNEAST, $SUNELAVATION, $SUNSOUTH, $SUNWEST, $TEMPERATURE, $TIME,
- $TIMEZONE, $TWILIGHT, $WEEKDAY, $WINDAVG2MIN, $WINDGUST10MIN, $WINDGUSTCURRNT, $WINDPEAK10MIN, $WINDSPEED, $WINDSTENGTH.
+ $ISSUNNYWEST, $ISWINDY, $LATITUDE, $LONGITUDE, $NAME, $SUNAZIMUTH, $SUNEAST, $SUNELAVATION, $SUNSOUTH, $SUNWEST, $TEMPERATURE, $TIME,
+ $TIMEZONE, $TWILIGHT, $TYPE, $WEEKDAY, $WINDAVG2MIN, $WINDGUST10MIN, $WINDGUSTCURRNT, $WINDPEAK10MIN, $WINDSPEED, $WINDSTENGTH.
The eventMap replacements are taken into account. This data
is available as a local variable in perl, as environment variable for shell
scripts, and will be textually replaced for Fhem commands.
@@ -1138,8 +1145,8 @@ sub ElsnerWS_Shutdown($) {
else it is a "plain" fhem.pl command (chain). In the <command> you can access the name of the device by using $NAME, $TYPE
and the current readings
$BRIGHTNESS, $DATE, $DAYNIGHT, $HEMISPHERE, $ISRAINING, $ISSTORMY, $ISSUNNY, $ISSUNNYEAST, $ISSUNNYSOUTH",
- $ISSUNNYWEST, $ISWINDY, $LATITUDE, $LONGITUDE, $SUNAZIMUTH, $SUNEAST, $SUNELAVATION, $SUNSOUTH, $SUNWEST, $TEMPERATURE, $TIME,
- $TIMEZONE, $TWILIGHT, $WEEKDAY, $WINDAVG2MIN, $WINDGUST10MIN, $WINDGUSTCURRNT, $WINDPEAK10MIN, $WINDSPEED, $WINDSTENGTH.
+ $ISSUNNYWEST, $ISWINDY, $LATITUDE, $LONGITUDE, $NAME, $SUNAZIMUTH, $SUNEAST, $SUNELAVATION, $SUNSOUTH, $SUNWEST, $TEMPERATURE, $TIME,
+ $TIMEZONE, $TWILIGHT, $TYPE, $WEEKDAY, $WINDAVG2MIN, $WINDGUST10MIN, $WINDGUSTCURRNT, $WINDPEAK10MIN, $WINDSPEED, $WINDSTENGTH.
The eventMap replacements are taken into account. This data
is available as a local variable in perl, as environment variable for shell
scripts, and will be textually replaced for Fhem commands.