From cdf313b0acc183ef5f86ca226004daf8acb044fe Mon Sep 17 00:00:00 2001
From: Marc Hoppe <MarcHoppe@web.de>
Date: Sat, 24 May 2014 22:07:36 +0200
Subject: [PATCH] twilight: Waether_horizon ohne wetter setzen

---
 fhem/FHEM/59_Twilight.pm | 10 ++++++----
 fhem/FHEM/99_MyUtils.pm  | 37 ++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/fhem/FHEM/59_Twilight.pm b/fhem/FHEM/59_Twilight.pm
index da21a3897..f4f61fe87 100644
--- a/fhem/FHEM/59_Twilight.pm
+++ b/fhem/FHEM/59_Twilight.pm
@@ -488,10 +488,12 @@ sub Twilight_getWeatherHorizon(@)
 
   my $location=$hash->{WEATHER};
   if ($location == 0)  {
-     $hash->{WEATHER_HORIZON}="0";
-     $hash->{CONDITION}="0";
-     return 1;
-  }
+  	$hash->{WEATHER_HORIZON}=$hash->{INDOOR_HORIZON}+1;
+  	$hash->{CONDITION}="-1";
+    #$hash->{WEATHER_HORIZON}="0";
+    #$hash->{CONDITION}="0";  
+    return 1;
+  } 
 
   my $mod = "[".$hash->{NAME} ."] ";
   my @faktor_cond_code = (10,10,10,10, 9, 7, 7, 7, 7, 7,
diff --git a/fhem/FHEM/99_MyUtils.pm b/fhem/FHEM/99_MyUtils.pm
index 00afa3db0..bfd5a3a11 100644
--- a/fhem/FHEM/99_MyUtils.pm
+++ b/fhem/FHEM/99_MyUtils.pm
@@ -144,10 +144,10 @@ sub RollTest() {
 }
 
 sub RollAll($$) {
-   #Log 1, "################";
+#   Log 1, "################";
    my ($cmd, $delay) = @_;
-   #Log 1, "c:$cmd d:$delay";
-   #&RollGroup(\@rollAlle, $cmd, $delay);
+#   Log 1, "c:$cmd d:$delay";
+#   &RollGroup(\@rollAlle, $cmd, $delay);
    if($cmd eq "closes") {
      &RollGroup(\@rollRunter, $cmd,$delay);
    }
@@ -160,7 +160,8 @@ sub RollAll($$) {
 sub RollWeck($) {
    my ($delay) = @_;
    &RollGroup(\@rollWeck, "up 5", $delay);
-   myfhem("set wach 1");
+   myfhem("define weckwachat at +03:00:00 set wach 1");
+#   myfhem("set wach 1");
 }
 
 sub Dbg($) {
@@ -173,7 +174,6 @@ sub RollCheck() {
     my $temp=20;
     my $wett;
     my $twil;
-    my $fen;
     my $r;
     my $sr;
     my $i=0;
@@ -181,6 +181,7 @@ sub RollCheck() {
 
     for $r ( @rolls ) {
 
+	my $fen="Closed";
 	my $tempH=0;
 	my $sonne=0;
 	my $tag=0;
@@ -198,17 +199,19 @@ sub RollCheck() {
 	    $tempH=1;
 	}
 	
-        $wett=ReadingsVal("wetter", "code", 99);
-        $sr=Value("sonnenrichtung");
-	if($wett==30 || $wett==32 || $wett==34 || $wett==36) { # sonnig, heiter, heiss
-	    if (index($sr, $r->{dir}) != -1) {
-		$sonne=1;
-	    }
+        $twil=Value("twil");
+	if($twil>=3 && $twil<10) { # civil
+	    $tag=1;
 	}
 
-        $twil=Value("twil");
-	if($twil>=3 && $twil<10) {
-	    $tag=1;
+        $wett=ReadingsVal("wetter", "code", 99);
+        $sr=Value("sonnenrichtung");
+        if($twil>=5 && $twil<8) { # indoor
+	    if($wett==30 || $wett==32 || $wett==34 || $wett==36) { # sonnig, heiter, heiss
+		if (index($sr, $r->{dir}) != -1) {
+		    $sonne=1;
+		}
+	    }
 	}
 
         if($r->{win} ne "") {
@@ -225,11 +228,11 @@ sub RollCheck() {
             }
 	}
 
-#       Dbg("  tempH:$tempH so:$sonne tag:$tag skipR:$skipRunter");
+        Dbg("RollCheck:$r->{roll}-tempH:$tempH temp:$temp so:$sonne wett:$wett sr:$sr twil:$twil tag:$tag fen:$fen skipR:$skipRunter skipH:$skipHoch");
 
 	if( $tag and $sonne and $tempH) {
             if($r->{state}!=STATE_SCHLITZ) {
-                if(!$skipRunter) { 
+                if(!$skipHoch && !$skipRunter) { 
 		    myfhem("define r".$i." at +".$t." set ".$r->{roll}." closes");
 		    myfhem("define ru".$i." at +".$t2." set ".$r->{roll}." up 7");
 		    Dbg("RollChg: $r->{roll} - runter schlitz\n");
@@ -243,8 +246,8 @@ sub RollCheck() {
                 if(!$skipHoch) { 
 		    myfhem("define r".$i." at +".$t." set ".$r->{roll}." opens");
 		    Dbg("RollChg: $r->{roll} - hoch\n");
+		    $r->{state}=STATE_HOCH;
 		}
-                $r->{state}=STATE_HOCH;
 	    }
 	}