98_weekprofile: add support for WeekdayTimer Forum: #105521.15

git-svn-id: https://svn.fhem.de/fhem/trunk@20617 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - feature: 98_weekprofile: add support for WeekdayTimer Forum: #105521
  - feature: 98_RandomTimer: Add execNow option
  - change:  93_DbRep: minor internal code chane, commandref revised
  - bugfix:  73_AutoShuttersControl: fix selfdefense bug

fhem/FHEM/98_weekprofile.pm

@@ -26,7 +26,7 @@ my @shortDays = ("Mon","Tue","Wed","Thu","Fri","Sat","Sun");
 
 my %LAST_SEND;
 
-my @DEVLIST_SEND = ("MAX","CUL_HM","HMCCUDEV","weekprofile","dummy");
+my @DEVLIST_SEND = ("MAX","CUL_HM","HMCCUDEV","weekprofile","dummyWT","WeekdayTimer");
 
 my $CONFIG_VERSION = "1.1";
 
@@ -120,9 +120,11 @@ sub weekprofile_getDeviceType($$;$)
   
   my $type = undef;
 
-  Log3 $me, 5, "$me(getDeviceType): type: $devHash->{TYPE}";
+  my $devType = $devHash->{TYPE};
+  $devType = $devHash->{wt_type} if ($devType =~ /dummyWT/); #special dummy fake WT for testing
+  Log3 $me, 5, "$me(getDeviceType): type: $devType";
   
-  if ($devHash->{TYPE} =~ /CUL_HM/){
+  if ($devType =~ /CUL_HM/){
     my $model = AttrVal($device,"model","");
     
     #models: HM-TC-IT-WM-W-EU, HM-CC-RT-DN, HM-CC-TC
@@ -150,28 +152,36 @@ sub weekprofile_getDeviceType($$;$)
     $type = "CUL_HM" if ( ($model =~ m/.*HM-CC-TC.*/) && ($channel == 2) );
   }
   #avoid max shutter contact
-  elsif ( ($devHash->{TYPE} =~ /MAX/) && ($devHash->{type} =~ /.*Thermostat.*/) ){
+  elsif ( ($devType =~ /MAX/) && ($devHash->{type} =~ /.*Thermostat.*/) ){
     $type = "MAX";
   }
-  elsif ( $devHash->{TYPE} =~ /HMCCUDEV/ || $devHash->{TYPE} =~ /dummyHM/){
+  elsif ( $devType =~ /HMCCUDEV/){
 	  my $model = $devHash->{ccutype};
+    if (!defined($model)) {
+      Log3 $me, 2, "$me(getDeviceType): ccutype not defined - take HM-xxx (HMCCU_HM)";
+      $model = "HM-xxx";
+    }
     Log3 $me, 5, "$me(getDeviceType): $devHash->{NAME}, $model";
 	  $type = "HMCCU_IP" if ( $model =~ m/HmIP.*/ );
     $type = "HMCCU_HM" if ( $model =~ m/HM-.*/ );
   }
-  elsif ($devHash->{TYPE} =~ /dummy/){
-    Log3 $me, 5, "$me(getDeviceType): dummy $device";
-    $type = "MAX"     if ($device =~ m/.*MAX.*FAKE.*/);    #dummy (FAKE WT) with name MAX inside for testing
-    $type = "CUL_HM"  if ($device =~ m/.*CUL_HM.*FAKE.*/); #dummy (FAKE WT) with name CUL_HM inside for testing
-    $type = "HMCCU_IP"if ($device =~ m/.*HMCCU_IP.*FAKE.*/);  #dummy (FAKE WT) with name HMCCU_IP inside for testing
-    $type = "HMCCU_HM"if ($device =~ m/.*HMCCU_HM.*FAKE.*/);  #dummy (FAKE WT) with name HMCCU_HM inside for testing
-  }
 
   return $type if ($sndrcv eq "RCV");
   
-  if ($devHash->{TYPE} =~ /weekprofile/){
+  if ($devType =~ /weekprofile/){
     $type = "WEEKPROFILE";
   }
+  elsif ($devType =~ /WeekdayTimer/){
+    my $def = $defs{$device}{DEF};
+    Log3 $me, 5, "$me(getDeviceType): def WDT $def";
+    #if (index($def, $me) != -1) {
+    if ($def =~ m/.*weekprofile.*/) {  
+      $type = "WDT";
+    }
+    else {
+      Log3 $me, 4, "$me(getDeviceType): found WDT but not configured for weekprofile";
+    }
+  }
   
   if (defined($type)) {
     Log3 $me, 4, "$me(getDeviceType): $devHash->{NAME} is type $type";
@@ -181,6 +191,25 @@ sub weekprofile_getDeviceType($$;$)
   return $type;
 }
 
+############################################## 
+sub weekprofile_get_prefix_HM($@)
+{
+  my ($device,$base_name,$me) = @_;
+  my @prefix_lst = ("","R-1.P1_","R-","R-P1_","P1_");
+  my $prefix = undef;
+
+  foreach (@prefix_lst) {
+    my $reading = "$_"."$base_name";
+    my $time = ReadingsVal($device, $reading, "");
+    Log3 $me, 5, "$me(weekprofile_get_prefix_HM): check: $reading $time";
+    if ($time ne "") {
+      $prefix = $_;
+      last;
+    }
+  }
+  return $prefix;
+}
+
 ############################################## 
 sub weekprofile_readDayProfile($@)
 {
@@ -223,21 +252,19 @@ sub weekprofile_readDayProfile($@)
   }
   elsif ($type =~ /HMCCU.*/){    
     my $lastTime = "";
+    my $prefix = weekprofile_get_prefix_HM($device,"ENDTIME_$reading"."_1",$me);
+    if (!defined($prefix)) {
+      Log3 $me, 2, "$me(readDayProfile): no readings for $reading found";
+      return (\@times, \@temps);  
+    }
+    Log3 $me, 5, "$me(readDayProfile): HM-Prefix is $prefix";
+
     for (my $i = 1; $i < 14; $i+=1){
-      my $prfTime = ReadingsVal($device, "R-1.P1_ENDTIME_$reading"."_$i", "");
+      my $prfTime = ReadingsVal($device, "$prefix"."ENDTIME_$reading"."_$i", "");
-      my $prfTemp = ReadingsVal($device, "R-1.P1_TEMPERATURE_$reading"."_$i", "");
+      my $prfTemp = ReadingsVal($device, "$prefix"."TEMPERATURE_$reading"."_$i", "");
-
-      $prfTime = ReadingsVal($device, "R-ENDTIME_$reading"."_$i", "") if (!$prfTime);
-      $prfTemp = ReadingsVal($device, "R-TEMPERATURE_$reading"."_$i", "") if (!$prfTemp);
-      
-      $prfTime = ReadingsVal($device, "R-P1_ENDTIME_$reading"."_$i", "") if (!$prfTime);
-      $prfTemp = ReadingsVal($device, "R-P1_TEMPERATURE_$reading"."_$i", "") if (!$prfTemp);
-
-      $prfTime = ReadingsVal($device, "P1_ENDTIME_$reading"."_$i", "") if (!$prfTime);
-      $prfTemp = ReadingsVal($device, "P1_TEMPERATURE_$reading"."_$i", "") if (!$prfTemp);
 
       if ($prfTime eq "" or $prfTemp eq ""){
-        Log3 $me, 3, "$me(readDayProfile): unsupported readings";
+        Log3 $me, 2, "$me(readDayProfile): no readings for $reading found ($i)";
         return (\@times, \@temps);
       }
       else{
@@ -259,7 +286,7 @@ sub weekprofile_readDayProfile($@)
   }
   
   for(my $i = 0; $i < scalar(@temps); $i+=1){
-	  Log3 $me, 4, "$me(ReadDayProfile): temp $i $temps[$i]";
+	  Log3 $me, 5, "$me(ReadDayProfile): temp $i $temps[$i]";
     $temps[$i] =~s/[^\d.]//g; #only numbers
     my $tempON = myAttrVal($me, "tempON", undef);
     my $tempOFF = myAttrVal($me, "tempOFF", undef);
@@ -339,6 +366,11 @@ sub weekprofile_sendDevProfile(@)
       
       return fhem("set $device profile_data $prf->{TOPIC}:$prf->{NAME} $json_text",1);
   }
+  elsif ($type eq "WDT") {
+    my $cmd = "set $device weekprofile $me:$prf->{TOPIC}:$prf->{NAME}";
+    Log3 $me, 4, "$me(sendDevProfile): send to WDT $cmd";
+    return fhem("$cmd",1);
+  }
 
   my $devPrf = weekprofile_readDevProfile($device,$type,$me);
   
@@ -419,31 +451,20 @@ sub weekprofile_sendDevProfile(@)
       $cmd .= ($k < $dayCnt-1) ? "; ": "";
       $k++;
     }
-  } elsif ($type eq "HMCCU_IP"){
+  } elsif ($type =~ /HMCCU.*/){ 
+    $cmd .= "set $device config" if ($type eq "HMCCU_HM");
+    $cmd .= "set $device config 1" if ($type eq "HMCCU_IP");
     my $k=0;
     my $dayCnt = scalar(@dayToTransfer);
-    $cmd .= "set $device config 1";
+    my $prefix = weekprofile_get_prefix_HM($device,"ENDTIME_SUNDAY_1",$me);
-    foreach my $day (@dayToTransfer){
+    if (!defined($prefix)) {
-      #Usage: set <device> datapoint [{channel-number}.]{datapoint} {value} 
+      Log3 $me, 3, "$me(sendDevProfile): no prefix found"; 
-      my $reading = $DEV_READINGS{$day}{$type};
+      $prefix = ""; 
-      my $dpTime = "P1_ENDTIME_$reading";
-      my $dpTemp = "P1_TEMPERATURE_$reading";
-   
-      my $tmpCnt =  scalar(@{$prfData->{$day}->{"temp"}});      
-      for (my $i = 0; $i < $tmpCnt; $i++) {
-        $cmd .= " " . $dpTemp . "_" . ($i + 1) . "=" . $prfData->{$day}->{"temp"}[$i];
-        $cmd .= " " . $dpTime . "_" . ($i + 1) . "=" . weekprofile_timeToMinutes($prfData->{$day}->{"time"}[$i]);
     }
-      $k++;
-    }
-  } elsif ($type eq "HMCCU_HM"){
-    my $k=0;
-    my $dayCnt = scalar(@dayToTransfer);
-    $cmd .= "set $device config";
     foreach my $day (@dayToTransfer){
       my $reading = $DEV_READINGS{$day}{$type};
-      my $dpTime = "ENDTIME_$reading";
+      my $dpTime = "$prefix"."ENDTIME_$reading";
-      my $dpTemp = "TEMPERATURE_$reading";
+      my $dpTemp = "$prefix"."TEMPERATURE_$reading";
    
       my $tmpCnt =  scalar(@{$prfData->{$day}->{"temp"}});      
       for (my $i = 0; $i < $tmpCnt; $i++) {
@@ -503,7 +524,7 @@ sub weekprofile_refreshSendDevList($)
   my ($hash) = @_;
   my $me = $hash->{NAME};
   
-  delete $hash->{SNDDEVLIST};
+  splice(@{$hash->{SNDDEVLIST}});
   
   foreach my $d (keys %defs)   
   {
@@ -524,6 +545,9 @@ sub weekprofile_refreshSendDevList($)
     
     push @{$hash->{SNDDEVLIST}} , $dev;
   }
+  my $cnt = scalar(@{$hash->{SNDDEVLIST}});
+  Log3 $me, 5, "$me(weekprofile_refreshSendDevList): $cnt devices in list";
+  
   return undef;
 }
 
@@ -1110,6 +1134,8 @@ sub weekprofile_Notify($$)
       next if(!defined($s));
       my ($what,$who) = split(' ',$s);
 
+      Log3 $me, 5, "$me(Notify): $devName, $what";
+           
       if ($what =~ m/^INITIALIZED$/ || $what =~ m/REREADCFG/) {
         delete $own->{PROFILES};
         weekprofile_refreshSendDevList($own);