diff --git a/fhem/FHEM/45_TRX.pm b/fhem/FHEM/45_TRX.pm index 2764321d7..ed9539fb1 100755 --- a/fhem/FHEM/45_TRX.pm +++ b/fhem/FHEM/45_TRX.pm @@ -51,12 +51,13 @@ TRX_Initialize($) $hash->{ReadFn} = "TRX_Read"; $hash->{WriteFn} = "TRX_Write"; $hash->{Clients} = - ":TRX_WEATHER:TRX_SECURITY:TRX_LIGHT:"; + ":TRX_WEATHER:TRX_SECURITY:TRX_LIGHT:TRX_ELSE:"; my %mc = ( - "1:TRX_WEATHER" => "^..(50|51|52|54|55|56|57|5a|5d).*", +# "1:TRX_WEATHER" => "^..(50|51|52|54|55|56|57|5a|5d).*", + "1:TRX_WEATHER" => "^..(51|52|54|55|56|57|5a|5d).*", "2:TRX_SECURITY" => "^..(20).*", "3:TRX_LIGHT" => "^..(10|11|12|13).*", - "4:TRX_ELSE" => "^...*", + "4:TRX_ELSE" => "^..(0[0-f]|1[4-f]|2[1-f]|3[0-f]|4[0-f]|50|53|58|59|5b|5c|5e|5f|[6-f][0-f]).*", ); $hash->{MatchList} = \%mc; diff --git a/fhem/FHEM/46_TRX_ELSE.pm b/fhem/FHEM/46_TRX_ELSE.pm index b0fcf49ea..e3c3fe429 100755 --- a/fhem/FHEM/46_TRX_ELSE.pm +++ b/fhem/FHEM/46_TRX_ELSE.pm @@ -44,11 +44,11 @@ TRX_ELSE_Initialize($) { my ($hash) = @_; - $hash->{Match} = "^...*"; + $hash->{Match} = "^..(0[0-f]|1[4-f]|2[1-f]|3[0-f]|4[0-f]|50|53|58|59|5b|5c|5e|5f|[6-f][0-f]).*"; $hash->{DefFn} = "TRX_ELSE_Define"; $hash->{UndefFn} = "TRX_ELSE_Undef"; $hash->{ParseFn} = "TRX_ELSE_Parse"; - $hash->{AttrList} = "IODev do_not_notify:1,0 loglevel:0,1,2,3,4,5,6 ". + $hash->{AttrList} = "IODev ignore:1,0 do_not_notify:1,0 loglevel:0,1,2,3,4,5,6 ". $readingFnAttributes; Log 1, "TRX_ELSE: Initialize" if ($TRX_ELSE_debug == 1); @@ -70,7 +70,7 @@ TRX_ELSE_Define($$) my $device_name = "TRX_UNKNOWN".$DOT.$code; - $hash->{TRX_LIGHT_CODE} = $code; + $hash->{CODE} = $code; $modules{TRX_ELSE}{defptr}{$device_name} = $hash; AssignIoPort($hash); @@ -136,23 +136,24 @@ TRX_ELSE_Parse($$) my $def = $modules{TRX_ELSE}{defptr}{$device_name}; if (!$def) { - Log 1, "UNDEFINED $device_name TRX_ELSE $type_hex"; - Log 3, "TRX_ELSE: TRX_ELSE Unknown device $device_name, please define it"; - return "UNDEFINED $device_name TRX_ELSE $type_hex"; + Log 3, "TRX_ELSE: Unknown device $device_name, please define it"; + return "UNDEFINED $device_name TRX_ELSE $type_hex"; + } + my $name = $def->{NAME}; + return "" if(IsIgnored($name)); readingsBeginUpdate($def); - #my $sensor = "hexline"; my $current = $msg; + #my $sensor = "hexline"; #readingsBulkUpdate($def, $sensor, $current); readingsBulkUpdate($def, "state", $current); - readingsEndUpdate($def, 1); - return ""; + return $name; } 1;