From 641c298f90c56075ff1ae73d6bf46b9eebf67e78 Mon Sep 17 00:00:00 2001 From: dietmar63 <> Date: Tue, 17 Nov 2015 23:15:20 +0000 Subject: [PATCH] 98_Heating_Control, 98_WeekdayTimer: EnOcean added in windowsensor support and documentation updated because of @ % issue. git-svn-id: https://svn.fhem.de/fhem/trunk@9925 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Heating_Control.pm | 66 +++++++-------------------------- fhem/FHEM/98_WeekdayTimer.pm | 51 +++---------------------- 2 files changed, 18 insertions(+), 99 deletions(-) diff --git a/fhem/FHEM/98_Heating_Control.pm b/fhem/FHEM/98_Heating_Control.pm index 6ee7545b5..b0cf9990a 100644 --- a/fhem/FHEM/98_Heating_Control.pm +++ b/fhem/FHEM/98_Heating_Control.pm @@ -191,60 +191,20 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()} by the well-known Block with {}.
Note: if a command is defined only this command is executed. In case of executing a "set desired-temp" command, you must define the hole commandpart explicitly by yourself.
- - -
  • in the command section you can access the event: -
    • - -
  • Note: the following is deprecated and will be removed in a future - release. The described replacement is attempted if none of the above - variables ($NAME/$EVENT/etc) found in the command. -
    • - The following parameter are replaced:
      -
    1. @ => the device to switch
      2. -
    2. % => the new temperature
      3. +
    3. $NAME => the device to switch
      4. +
    4. $EVENT => the new temperature

    Example: @@ -254,7 +214,7 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()} Every day will be set the temperature at 17:20 to 21°C and 17:25 to eco.

    define HCW Heating_Control WZ_Heizung 07:00|16 Mo,Tu,Th-Fr|16:00|18.5 20:00|12 - {fhem("set dummy on"); fhem("set @ desired-temp %");}
    + {fhem("set dummy on"); fhem("set $NAME desired-temp $EVENT");}
    At the given times and weekdays only(!) the command will be executed.

    define HCW Heating_Control WZ_Heizung Sa-Su,We|08:00|21 (ReadingsVal("WeAreThere", "state", "no") eq "yes")
    @@ -286,11 +246,11 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()} The daylist can be given globaly for the whole WeekdayTimer:

    -        define WD_Wohnen_an  WeekdayTimer WDdevice  de  !$we     09:00|an 19:00|aus (bedingung("@", "%")  
-        define WD_Wohnen_an  WeekdayTimer WDdevice  de   $we     09:00|an 19:00|aus (bedingung("@", "%")  
-        define WD_Wohnen_an  WeekdayTimer WDdevice  de   78      09:00|an 19:00|aus (bedingung("@", "%")  
-        define WD_Wohnen_an  WeekdayTimer WDdevice  de   57      09:00|an 19:00|aus (bedingung("@", "%")  
-        define WD_Wohnen_an  WeekdayTimer WDdevice  de  fr,$we   09:00|an 19:00|aus (bedingung("@", "%")  
+        define WD_Wohnen_an  WeekdayTimer WDdevice  de  !$we     09:00|an 19:00|aus (bedingung($NAME, $EVENT)  
+        define WD_Wohnen_an  WeekdayTimer WDdevice  de   $we     09:00|an 19:00|aus (bedingung($NAME, $EVENT)  
+        define WD_Wohnen_an  WeekdayTimer WDdevice  de   78      09:00|an 19:00|aus (bedingung($NAME, $EVENT)  
+        define WD_Wohnen_an  WeekdayTimer WDdevice  de   57      09:00|an 19:00|aus (bedingung($NAME, $EVENT)  
+        define WD_Wohnen_an  WeekdayTimer WDdevice  de  fr,$we   09:00|an 19:00|aus (bedingung($NAME, $EVENT)
    @@ -416,15 +376,15 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()} so muss dies explizit angegeben werden.
    Folgende Parameter werden ersetzt:
      -
    1. @ => das zu schaltende Device
      2. -
    2. % => die zu setzende Temperatur
      3. +
    3. $NAME => das zu schaltende Device
      4. +
    4. $EVENT => die zu setzende Temperatur

    Beispiel: @@ -434,7 +394,7 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()} Jeden Tag wird die Temperatur um 17:20Uhr auf 21°C und 17:25Uhr auf eco gesetzt.

    define HCW Heating_Control WZ_Heizung 07:00|16 Mo,Di,Mi|16:00|18.5 20:00|12 - {fhem("set dummy on"); fhem("set @ desired-temp %");}
    + {fhem("set dummy on"); fhem("set $NAME desired-temp $EVENT");}
    Zu den definierten Schaltzeiten wird nur(!) der in {} angegebene Perl-Code ausgeführt.

    define HCW Heating_Control WZ_Heizung Sa-So,Mi|08:00|21 (ReadingsVal("WeAreThere", "state", "no") eq "yes")
    diff --git a/fhem/FHEM/98_WeekdayTimer.pm b/fhem/FHEM/98_WeekdayTimer.pm index 026fd28de..2fcc6e90d 100644 --- a/fhem/FHEM/98_WeekdayTimer.pm +++ b/fhem/FHEM/98_WeekdayTimer.pm @@ -1008,60 +1008,19 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()} by the well-known Block with {}.
    Note: if a command is defined only this command is executed. In case of executing a "set desired-temp" command, you must define the hole commandpart explicitly by yourself.
    - - - -

  • in the command section you can access the event: -
    • - -
  • Note: the following is deprecated and will be removed in a future - release. The described replacement is attempted if none of the above - variables ($NAME/$EVENT/etc) found in the command. -
    • - The following parameter are replaced:
      -
    1. @ => the device to switch
      2. -
    2. % => the new temperature
      3. +
    3. $NAME => the device to switch
      4. +
    4. $EVENT => the new temperature

    Example: @@ -1070,7 +1029,7 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()} Mo-Fr are setting the shutter at 05:20 to up, and at 20:30 down.

    define heatingBath WeekdayTimer bath 07:00|16 Mo,Tu,Th-Fr|16:00|18.5 20:00|eco - {fhem("set dummy on"); fhem("set @ desired-temp %");}
    + {fhem("set dummy on"); fhem("set $NAME desired-temp $EVENT");}
    At the given times and weekdays only(!) the command will be executed.

    define dimmer WeekdayTimer livingRoom Sa-Su,We|07:00|dim30% Sa-Su,We|21:00|dim90% (ReadingsVal("WeAreThere", "state", "no") eq "yes")