From 22a19fbbd1f7dfb32eb7b66c9c5836bfcadd2074 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 27 Dec 2010 09:39:28 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.fhem.de/fhem/trunk@781 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 1 + fhem/FHEM/10_FS20.pm | 20 ++------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index 7ae18fc5c..819f6b14e 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -913,6 +913,7 @@ CUL_SimpleWrite(@) } $msg .= "\n" unless($nonl); + Log 1, "SW: $msg"; $hash->{USBDev}->write($msg . "\n") if($hash->{USBDev}); syswrite($hash->{TCPDev}, $msg) if($hash->{TCPDev}); diff --git a/fhem/FHEM/10_FS20.pm b/fhem/FHEM/10_FS20.pm index dd248a89f..b078c42a7 100755 --- a/fhem/FHEM/10_FS20.pm +++ b/fhem/FHEM/10_FS20.pm @@ -109,7 +109,7 @@ FS20_Initialize($) $hash->{DefFn} = "FS20_Define"; $hash->{UndefFn} = "FS20_Undef"; $hash->{ParseFn} = "FS20_Parse"; - $hash->{AttrList} = "IODev follow-on-for-timer:1,0 do_not_notify:1,0 ignore:0,1 dummy:1,0 showtime:1,0 model;fs20hgs,fs20hgs,fs20pira,fs20piri,fs20s20,fs20s8,fs20s4,fs20s4a,fs20s4m,fs20s4u,fs20s4ub,fs20sd,fs20sn,fs20sr,fs20ss,fs20str,fs20tfk,fs20tfk,fs20tk,fs20uts,fs20ze,fs20as1,fs20as4,fs20di,fs20du,fs20ls,fs20ms2,fs20rst,fs20sa,fs20sig,fs20st,fs20sv,fs20usr exchange_on_off loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev follow-on-for-timer:1,0 do_not_notify:1,0 ignore:0,1 dummy:1,0 showtime:1,0 model;fs20hgs,fs20hgs,fs20pira,fs20piri,fs20s20,fs20s8,fs20s4,fs20s4a,fs20s4m,fs20s4u,fs20s4ub,fs20sd,fs20sn,fs20sr,fs20ss,fs20str,fs20tfk,fs20tfk,fs20tk,fs20uts,fs20ze,fs20as1,fs20as4,fs20di,fs20du,fs20ls,fs20ms2,fs20rst,fs20sa,fs20sig,fs20st,fs20sv,fs20usr loglevel:0,1,2,3,4,5,6"; } @@ -162,14 +162,6 @@ FS20_Set($@) return "no set value specified" if($na < 2 || $na > 3); return "Readonly value $a[1]" if(defined($readonly{$a[1]})); - if($attr{$a[0]} && $attr{$a[0]}{exchange_on_off}) { - if($a[1] =~ m/off/) { - $a[1] =~ s/off/on/; - } else { - $a[1] =~ s/on/off/; - } - } - my $c = $fs20_c2b{$a[1]}; if(!defined($c)) { @@ -197,7 +189,7 @@ FS20_Set($@) my $val; if($na == 3) { # Timed command. - $c =~ s/1/3/; # Set the extension bit + $c = sprintf("%02X", $c & 0x20); # Set the extension bit ######################## # Calculating the time. @@ -367,14 +359,6 @@ FS20_Parse($$) my $lh = $def->{$n}; $n = $lh->{NAME}; # It may be renamed - if($attr{$n} && $attr{$n}{exchange_on_off}) { - if($v =~ m/off/) { - $v =~ s/off/on/; - } else { - $v =~ s/on/off/; - } - } - return "" if(IsIgnored($n)); # Little strange. $lh->{CHANGED}[0] = $v;