Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

added RFXMETER module. New option noinit.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@790 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2011-01-03 16:31:38 +00:00
parent 6f96d32cf3
commit a97fa4049f
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
FHEM/40_RFXCOM.pm
View File

@ -14,6 +14,8 @@
# #
# To use it define the IP-Adresss and the Port: # To use it define the IP-Adresss and the Port:
# define RFXCOM RFXCOM 192.168.169.111:10001 # define RFXCOM RFXCOM 192.168.169.111:10001
# optionally you may issue not to initialize the device (useful if you share an RFXCOM device with other programs)
# define RFXCOM RFXCOM 192.168.169.111:10001 noinit
# #
# The RFXCOM receivers supports lots of protocols that may be implemented for FHEM # The RFXCOM receivers supports lots of protocols that may be implemented for FHEM
# writing the appropriate FHEM modules. # writing the appropriate FHEM modules.
@ -62,9 +64,13 @@ RFXCOM_Initialize($)
# Provider # Provider
$hash->{ReadFn} = "RFXCOM_Read"; $hash->{ReadFn} = "RFXCOM_Read";
$hash->{Clients} = $hash->{Clients} =
":OREGON:"; #":RFXMETER:OREGON:RFXELSE:";
":RFXMETER:OREGON:";
my %mc = ( my %mc = (
"1:OREGON" => "^.*", "1:RFXMETER" => "^0.*",
"2:OREGON" => "^[^0]",
#"2:OREGON" => "^[\x38-\x78].*",
#"3:RFXELSE" => "^.*",
); );
$hash->{MatchList} = \%mc; $hash->{MatchList} = \%mc;
@ -76,7 +82,7 @@ RFXCOM_Initialize($)
$hash->{GetFn} = "RFXCOM_Get"; $hash->{GetFn} = "RFXCOM_Get";
$hash->{SetFn} = "RFXCOM_Set"; $hash->{SetFn} = "RFXCOM_Set";
$hash->{StateFn} = "RFXCOM_SetState"; $hash->{StateFn} = "RFXCOM_SetState";
$hash->{AttrList}= "do_not_notify:1,0 loglevel:0,1,2,3,4,5,6"; $hash->{AttrList}= "do_not_notify:1,0 do_not_init:1:0 loglevel:0,1,2,3,4,5,6";
$hash->{ShutdownFn} = "RFXCOM_Shutdown"; $hash->{ShutdownFn} = "RFXCOM_Shutdown";
} }
@ -87,13 +93,14 @@ RFXCOM_Define($$)
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @a = split("[ \t][ \t]*", $def); my @a = split("[ \t][ \t]*", $def);
return "wrong syntax: define <name> RFXCOM devicename" return "wrong syntax: define <name> RFXCOM devicename [noinit]"
if(@a != 3); if(@a != 3 && @a != 4);
RFXCOM_CloseDev($hash); RFXCOM_CloseDev($hash);
my $name = $a[0]; my $name = $a[0];
my $dev = $a[2]; my $dev = $a[2];
my $opt = $a[3] if(@a == 4);;
if($dev eq "none") { if($dev eq "none") {
Log 1, "RFXCOM: $name device is none, commands will be echoed only"; Log 1, "RFXCOM: $name device is none, commands will be echoed only";
@ -101,6 +108,16 @@ RFXCOM_Define($$)
return undef; return undef;
} }
if(defined($opt)) {
if($opt eq "noinit") {
Log 1, "RFXCOM: $name no init is done";
$attr{$name}{do_not_init} = 1;
} else {
return "wrong syntax: define <name> RFXCOM devicename [noinit]"
}
}
$hash->{DeviceName} = $dev; $hash->{DeviceName} = $dev;
my $ret = RFXCOM_OpenDev($hash, 0); my $ret = RFXCOM_OpenDev($hash, 0);
return $ret; return $ret;
@ -208,13 +225,23 @@ RFXCOM_DoInit($)
RFXCOM_Clear($hash); RFXCOM_Clear($hash);
if(defined($attr{$name}) && defined($attr{$name}{"do_not_init"})) {
Log 1, "RFXCOM: defined with noinit. Do not send init string to device.";
$hash->{STATE} = "Initialized" if(!$hash->{STATE});
# Reset the counter
delete($hash->{XMIT_TIME});
delete($hash->{NR_CMD_LAST_H});
return undef;
}
# #
# Init # Init
my $init = pack('H*', 'F02C'); my $init = pack('H*', 'F02C');
RFXCOM_SimpleWrite($hash, $init); RFXCOM_SimpleWrite($hash, $init);
sleep(1); sleep(1);
$buf = RFXCOM_SimpleRead($hash); $buf = RFXCOM_SimpleRead($hash);
my $char = ord($buf); my $char = ord($buf);
if (! $buf) { if (! $buf) {
@ -276,9 +303,7 @@ RFXCOM_Read($)
#$hexline = unpack('H*', $rfxcom_data); #$hexline = unpack('H*', $rfxcom_data);
#Log 1, "RFXCOM_Read rfxcom_data '$hexline'"; #Log 1, "RFXCOM_Read rfxcom_data '$hexline'";
# #
# parse only messages >= 68 Bits. Others are non Oregon sensors or receiption errors. RFXCOM_Parse($hash, $hash, $name, $rmsg);
# change this if you add a module that supports other sensors.
RFXCOM_Parse($hash, $hash, $name, $rmsg) if($rmsg && $bits >= 68);
} }
#Log 1, "RFXCOM_Read END"; #Log 1, "RFXCOM_Read END";