*** empty log message ***

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

fhem/CHANGED

@@ -336,3 +336,5 @@
   - bugfix:  undefined messages for unknown HMS devs (Peter, 8.6)
   - bugfix:  em1010 and %oldvalue bugs (Peter, 9.6)
   - bugfix:  SCIVT solar controller (peterp, 1.7)
+  - bugfix:  WS300 loglevel change (from 2 to 5 or device specific loglevel)
+  - feature: First steps for a Fritz!Box port. See the fritzbox.html

fhem/FHEM/50_WS300.pm

@@ -302,7 +302,7 @@ WS300_Parse($$)
           $def->{CHANGED}[4] = "$txt[6]: $value";
           $def->{CHANGETIME}[4] = $tm;
           
-          Log 2,"WS300 $def->{NAME}: $val";
+          Log $ll,"WS300 $def->{NAME}: $val";
           DoTrigger($def->{NAME},undef);
         }
         else
@@ -432,7 +432,7 @@ WS300_Parse($$)
             $def->{CHANGED}[11] = "$txt[11]: $rain_month $sfx[11]";
             $def->{CHANGETIME}[11] = $tm;
           }
-          Log 2,"WS300 $def->{NAME}: $val";
+          Log $ll,"WS300 $def->{NAME}: $val";
           DoTrigger($def->{NAME},undef);
         }
       }
@@ -482,11 +482,12 @@ WS300_Parse($$)
     $def->{CHANGED}[4] = "willi: $value";
     $def->{CHANGETIME}[4] = $tm;
     
-    Log 2,"WS300 $def->{NAME}: $val";
+    Log $ll,"WS300 $def->{NAME}: $val";
     DoTrigger($def->{NAME},undef);
   }
   return undef;
 }
+
 #####################################
 sub
 WS300_Read($)

fhem/FHEM/60_EM.pm

@@ -85,7 +85,40 @@ EM_Undef($$)
 sub
 EM_Set($@)
 {
-  return undef;
+  my ($hash, @a) = @_;
+  my $u1 = "Usage: set <name> reset\n" . 
+          "       set <name> time [YYYY-MM-DD HH:MM:SS]";
+
+  return $u1 if(int(@a) < 2);
+  my $msg;
+
+  if($a[1] eq "time") {
+
+    if (int(@a) == 2) {
+      my @lt = localtime;
+      $a[2] = sprintf ("%04d-%02d-%02d", $lt[5]+1900, $lt[4]+1, $lt[3]);
+      $a[3] = sprintf ("%02d:%02d:%02d", $lt[2], $lt[1], $lt[0]);
+    } elsif (int(@a) != 4) {
+      return $u1;
+    }
+    my @d = split("-", $a[2]);
+    my @t = split(":", $a[3]);
+    $msg = sprintf("73%02x%02x%02x00%02x%02x%02x",
+          $d[2],$d[1],$d[0]-2000+0xd0, $t[0],$t[1],$t[2]);
+
+  } elsif($a[1] eq "reset") {
+
+    $msg = "4545";
+
+  } else {
+
+    return "Unknown argument $a[1], choose one of reset,time"
+
+  }
+
+  my $d = EmGetData($hash->{DeviceName}, $msg);
+  return "Read error" if(!defined($d));
+  return b($d,0);
 }
 
 #########################

fhem/FHEM/61_EMWZ.pm

@@ -119,8 +119,10 @@ sub
 EMWZ_Set($@)
 {
   my ($hash, @a) = @_;
+  my $u = "Usage: set <name> <type> <value>, " .
+                "<type> is one of price,alarm,rperkw";
 
-  return "argument is missing" if(int(@a) != 3);
+  return $u if(int(@a) != 3);
 
   my $v = $a[2];
   my $d = $hash->{DEVNR};
@@ -136,7 +138,7 @@ EMWZ_Set($@)
     $v *= 10; # Make display and input the same
     $msg = sprintf("79%02x3102%02x%02x", $d-1, $v%256, int($v/256));
   } else {
-    return "unknown set value, use one of price,alarm,rperkw";
+    return $u;
   }
 
   my $ret = IOWrite($hash, $msg);

fhem/FHEM/90_at.pm

@@ -3,7 +3,6 @@ package main;
 
 use strict;
 use warnings;
-use IO::File;
 
 #####################################
 sub

fhem/FHEM/91_notify.pm

@@ -3,7 +3,6 @@ package main;
 
 use strict;
 use warnings;
-use IO::File;
 
 #####################################
 sub

fhem/HISTORY

@@ -119,3 +119,8 @@
 
 - Pest Jun 18, 20:06:23 MEST 2007
   - in 62_EMEM.pm: Power units removed from value content added to name.
+
+- Rudi Sun Aug  5 10:59:51 MEST 2007
+  - WS300 Loglevel changed for KS300 device (from 2 to GetLogLevel or 5)
+  - First version of the FritzBox port: 
+    - Perl binary/ftdi_sio module 

fhem/fhem.pl

@@ -31,9 +31,7 @@
 
 use strict;
 use warnings;
-use IO::File;
 use IO::Socket;
-use Net::hostent;
 use Time::HiRes qw(gettimeofday);
 
 
@@ -135,7 +133,7 @@ my %intAt;			# Internal at timer hash.
 my $intAtCnt=0;
 my $reread_active = 0;
 my $AttrList = "room comment";
-my $cvsid = '$Id: fhem.pl,v 1.21 2007-07-01 07:30:48 rudolfkoenig Exp $';
+my $cvsid = '$Id: fhem.pl,v 1.22 2007-08-05 09:48:26 rudolfkoenig Exp $';
 
 $init_done = 0;
 

fhem/test/fhem.save

@@ -1,4 +1,4 @@
-#Sun Jun 24 13:09:02 2007
+#Sun Aug  5 11:41:52 2007
 setstate FHZ fhtbuf: 1c
 setstate FHZ 2006-02-12 14:03:39 fhtbuf 23
 setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe
@@ -68,12 +68,11 @@ setstate wz 2006-03-26 08:52:31 unknown_85 4
 setstate wz 2006-03-26 08:50:36 wed-from1 06:00
 setstate wz 2006-03-26 08:50:36 wed-to1 23:00
 setstate wz 2006-03-26 08:52:31 windowopen-temp 12.0 (Celsius)
-setstate x R:13,66; 0,0;30;13,62;15,09;- 0,2; 2,8;
+setstate x 13.66 0.0 30 13.62 15.09 -0.2 2.8
-
+setstate x 2007-08-05 11:41:50 Is 0.0
-setstate x 2007-06-24 13:08:30 Is  0,0
+setstate x 2007-08-05 11:41:50 Temp 30
-setstate x 2007-06-24 13:08:30 Temp 30
+setstate x 2007-08-05 11:41:50 Vs 13.66
-setstate x 2007-06-24 13:08:30 Vs 13,66
+setstate x 2007-08-05 11:41:50 maxI 2.8
-setstate x 2007-06-24 13:08:30 maxI  2,8
+setstate x 2007-08-05 11:41:50 maxV 15.09
-setstate x 2007-06-24 13:08:30 maxV 15,09
+setstate x 2007-08-05 11:41:50 minI -0.2
-setstate x 2007-06-24 13:08:30 minI - 0,2
+setstate x 2007-08-05 11:41:50 minV 13.62
-setstate x 2007-06-24 13:08:30 minV 13,62