diff --git a/fhem/FHEM/59_Twilight.pm b/fhem/FHEM/59_Twilight.pm index 6542d2f0f..846cc725a 100644 --- a/fhem/FHEM/59_Twilight.pm +++ b/fhem/FHEM/59_Twilight.pm @@ -583,6 +583,17 @@ sub Twilight_CompassPoint($) { return $compassPoint; } +sub twilight($$$$) { + my ($twilight, $reading, $min, $max) = @_; + + my $t = hms2h(ReadingsVal($twilight,$reading,0)); + + $t = hms2h($min) if(defined($min) && (hms2h($min) > $t)); + $t = hms2h($max) if(defined($max) && (hms2h($max) < $t)); + + return h2hms_fmt($t); +} + 1; =pod @@ -663,30 +674,30 @@ sub Twilight_CompassPoint($) { get <name> <reading>

- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + +
lightthe current virtual daylight value
nextEventthe name of the next event
nextEventTimethe time when the next event will probably happen (during light phase 5 and 6 this is updated when weather conditions change
sr_astrotime of astronomical sunrise
sr_nauttime of nautical sunrise
sr_civiltime of civil sunrise
srtime of sunrise
sr_indoortime of indoor sunrise
sr_weathertime of weather sunrise
ss_weathertime of weather sunset
ss_indoortime of indoor sunset
sstime of sunset
ss_civiltime of civil sunset
ss_nautictime of nautic sunset
ss_astrotime of astro sunset
azimuththe current azimuth of the sun 0° ist north 180° is south
compasspointa textual representation of the compass point
elevationthe elevaltion of the sun
twilighta percetal value of a new (twi)light value: (elevation+12)/18 * 100)
twilight_weathera percetal value of a new (twi)light value: (elevation-WEATHER_HORIZON+12)/18 * 100). So if there is weather, it +
lightthe current virtual daylight value
nextEventthe name of the next event
nextEventTimethe time when the next event will probably happen (during light phase 5 and 6 this is updated when weather conditions change
sr_astrotime of astronomical sunrise
sr_nauttime of nautical sunrise
sr_civiltime of civil sunrise
srtime of sunrise
sr_indoortime of indoor sunrise
sr_weathertime of weather sunrise
ss_weathertime of weather sunset
ss_indoortime of indoor sunset
sstime of sunset
ss_civiltime of civil sunset
ss_nautictime of nautic sunset
ss_astrotime of astro sunset
azimuththe current azimuth of the sun 0° ist north 180° is south
compasspointa textual representation of the compass point
elevationthe elevaltion of the sun
twilighta percetal value of a new (twi)light value: (elevation+12)/18 * 100)
twilight_weathera percetal value of a new (twi)light value: (elevation-WEATHER_HORIZON+12)/18 * 100). So if there is weather, it is always a little bit darker than by fair weather
conditionthe yahoo condition weather code
condition_txtthe yahoo condition weather code as textual representation
horizonvalue auf the actual horizon 0°, -6°, -12°, -18°
conditionthe yahoo condition weather code
condition_txtthe yahoo condition weather code as textual representation
horizonvalue auf the actual horizon 0°, -6°, -12°, -18°
@@ -698,6 +709,20 @@ sub Twilight_CompassPoint($) {
  • readingFnAttributes

    • + + + Functions + +
    + =end html diff --git a/fhem/FHEM/98_Heating_Control.pm b/fhem/FHEM/98_Heating_Control.pm index 213bc7a6b..5a0ff67a4 100644 --- a/fhem/FHEM/98_Heating_Control.pm +++ b/fhem/FHEM/98_Heating_Control.pm @@ -103,7 +103,7 @@ sub Heating_Control_Define($$) # test if device is defined return "invalid Device, given Device <$device> not found" if(!$defs{$device}); - #Altlasten bereinigen + #fuer den modify Altlasten bereinigen delete($hash->{TIME_AS_PERL}) if($hash->{TIME_AS_PERL}); delete($hash->{helper}{CONDITION}) if($hash->{helper}{CONDITION}); delete($hash->{helper}{COMMAND}) if($hash->{helper}{COMMAND}); @@ -641,6 +641,12 @@ sub SortNumber { define HCW Heating_Control WZ_Heizung en Mo-Fr|{myFunction}|night-temp:18 Mo-Fr|{myFunction()}|dayTemp:16
    The is switched at time myFunction(). It is sent the Command "night-temp 18" and "dayTemp 16". + + If you want to have set all Heating_Controls their current value (after a temperature lowering phase holidays) + you can call the function Heating_Control_SetAllTemps (). + This call can be automatically coupled to a dummy by notify:        + define HeizStatus2 notify Heating:. * {Heating_Control_SetAllTemps ()} + @@ -745,6 +751,12 @@ sub SortNumber { define HCW Heating_Control WZ_Heizung en Mo-Fr|{myFunction}|night-temp:18 Mo-Fr|{myFunction()}|dayTemp:16
    Das Gerät wird bei myFunction() geschaltet. Es wird das Kommando "night-temp 18" bzw. "dayTemp 16" gesendet. + + Wenn du beispielsweise nach einer Temperaturabsenkungsphase erreichen willst, dass alle Heating_Controls ihren aktuellen Wert + einstellen sollen, kannst du die Funktion Heating_Control_SetAllTemps() aufrufen. + Dieser Aufruf kann per notify automatisch an ein dummy gekoppelt werden: + define HeizStatus2 notify Heizung:.* {Heating_Control_SetAllTemps()} +

    diff --git a/fhem/FHEM/98_RandomTimer.pm b/fhem/FHEM/98_RandomTimer.pm index f3c0f6c6c..ba2101669 100644 --- a/fhem/FHEM/98_RandomTimer.pm +++ b/fhem/FHEM/98_RandomTimer.pm @@ -475,13 +475,15 @@ sub RandomTimer_disable($) {