FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-06 12:18:46 +00:00
Code Issues Releases Wiki Activity

Match fixed. new sensors for TRX-WEATHER. fixed rain sensor

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1509 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2012-04-30 20:24:11 +00:00
parent e92c735d4d
commit 457aac3216
4 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/46_TRX_ELSE.pm
View File

@ -42,7 +42,7 @@ TRX_ELSE_Initialize($)
{ {
my ($hash) = @_; my ($hash) = @_;
$hash->{Match} = "^.*"; $hash->{Match} = "^...*";
$hash->{DefFn} = "TRX_ELSE_Define"; $hash->{DefFn} = "TRX_ELSE_Define";
$hash->{UndefFn} = "TRX_ELSE_Undef"; $hash->{UndefFn} = "TRX_ELSE_Undef";
$hash->{ParseFn} = "TRX_ELSE_Parse"; $hash->{ParseFn} = "TRX_ELSE_Parse";

3
fhem/FHEM/46_TRX_LIGHT.pm
View File

@ -90,8 +90,7 @@ TRX_LIGHT_Initialize($)
$light_device_c2b{$light_device_codes{$k}->[0]} = $k; $light_device_c2b{$light_device_codes{$k}->[0]} = $k;
} }
#$hash->{Match} = "^\\).*"; # 0x29 $hash->{Match} = "^..(10|11|12).*";
$hash->{Match} = "^(\\ |\\)).*"; # 0x20 or 0x29
$hash->{SetFn} = "TRX_LIGHT_Set"; $hash->{SetFn} = "TRX_LIGHT_Set";
$hash->{DefFn} = "TRX_LIGHT_Define"; $hash->{DefFn} = "TRX_LIGHT_Define";
$hash->{UndefFn} = "TRX_LIGHT_Undef"; $hash->{UndefFn} = "TRX_LIGHT_Undef";

2
fhem/FHEM/46_TRX_SECURITY.pm
View File

@ -47,7 +47,7 @@ TRX_SECURITY_Initialize($)
{ {
my ($hash) = @_; my ($hash) = @_;
$hash->{Match} = "^(\\ |\\)).*"; # 0x20 or 0x29 $hash->{Match} = "^..(20).*";
$hash->{DefFn} = "TRX_SECURITY_Define"; $hash->{DefFn} = "TRX_SECURITY_Define";
$hash->{UndefFn} = "TRX_SECURITY_Undef"; $hash->{UndefFn} = "TRX_SECURITY_Undef";
$hash->{ParseFn} = "TRX_SECURITY_Parse"; $hash->{ParseFn} = "TRX_SECURITY_Parse";

38
fhem/FHEM/46_TRX_WEATHER.pm
View File

@ -10,6 +10,7 @@
# * "THWR800" is THWR800 # * "THWR800" is THWR800
# * "RTHN318" is RTHN318 # * "RTHN318" is RTHN318
# * "TX3_T" is LaCrosse TX3, TX4, TX17 # * "TX3_T" is LaCrosse TX3, TX4, TX17
# * "TS15C" is TS15C
# #
# temperature/humidity sensors (TEMPHYDRO): # temperature/humidity sensors (TEMPHYDRO):
# * "THGR228N" is THGN122/123, THGN132, THGR122/228/238/268 # * "THGR228N" is THGN122/123, THGN132, THGR122/228/238/268
@ -29,12 +30,18 @@
# * "RGR918" is RGR126/682/918 # * "RGR918" is RGR126/682/918
# * "PCR800" is PCR800 # * "PCR800" is PCR800
# * "TFA_RAIN" is TFA # * "TFA_RAIN" is TFA
# * "RG700" is UPM RG700
# #
# wind sensors (WIND): # wind sensors (WIND):
# * "WTGR800_A" is WTGR800 # * "WTGR800_A" is WTGR800
# * "WGR800_A" is WGR800 # * "WGR800_A" is WGR800
# * "WGR918_A" is STR918, WGR918 # * "WGR918_A" is STR918, WGR918
# * "TFA_WIND" is TFA # * "TFA_WIND" is TFA
# * "WDS500" is UPM WDS500
#
# Weighing scales (WEIGHT):
# "BWR101" is Oregon Scientific BWR101
# "GR101" is Oregon Scientific GR101
# #
# Copyright (C) 2012 Willi Herzig # Copyright (C) 2012 Willi Herzig
# #
@ -274,6 +281,7 @@ sub common_anemometer {
0x02 => "WGR800_A", 0x02 => "WGR800_A",
0x03 => "WGR918_A", 0x03 => "WGR918_A",
0x04 => "TFA_WIND", 0x04 => "TFA_WIND",
0x05 => "WDS500", # UPM WDS500
); );
if (exists $devname{$bytes->[1]}) { if (exists $devname{$bytes->[1]}) {
@ -346,6 +354,7 @@ sub common_temp {
0x03 => "THWR800", 0x03 => "THWR800",
0x04 => "RTHN318", 0x04 => "RTHN318",
0x05 => "TX3", # LaCrosse TX3 0x05 => "TX3", # LaCrosse TX3
0x06 => "TS15C",
); );
if (exists $devname{$bytes->[1]}) { if (exists $devname{$bytes->[1]}) {
@ -542,12 +551,13 @@ sub common_rain {
0x01 => "RGR918", 0x01 => "RGR918",
0x02 => "PCR800", 0x02 => "PCR800",
0x03 => "TFA_RAIN", 0x03 => "TFA_RAIN",
0x04 => "RG700",
); );
if (exists $devname{$bytes->[1]}) { if (exists $devname{$bytes->[1]}) {
$dev_type = $devname{$bytes->[1]}; $dev_type = $devname{$bytes->[1]};
} else { } else {
Log 1,"RFX_WEATHER: common_rain error undefined subtype=$subtype"; Log 1,"TRX_WEATHER: common_rain error undefined subtype=$subtype";
my @res = (); my @res = ();
return @res; return @res;
} }
@ -569,14 +579,24 @@ sub common_rain {
} }
my $rain = $bytes->[5]*256 + $bytes->[6]; my $rain = $bytes->[5]*256 + $bytes->[6];
my $train = $bytes->[7]*256*256 + $bytes->[8]*256 + $bytes->[9]; if ($dev_type eq "RGR918") {
push @res, {
device => $dev_str,
type => 'rain',
current => $rain,
units => 'mm/h',
};
} elsif ($dev_type eq "PCR800") {
$rain = $rain / 100;
push @res, {
device => $dev_str,
type => 'rain',
current => $rain,
units => 'mm/h',
};
}
push @res, { my $train = ($bytes->[7]*256*256 + $bytes->[8]*256 + $bytes->[9])/10; # total rain
device => $dev_str,
type => 'rain',
current => $rain,
units => 'mm/h',
};
push @res, { push @res, {
device => $dev_str, device => $dev_str,
type => 'train', type => 'train',
@ -641,7 +661,7 @@ sub common_weight {
units => 'kg', units => 'kg',
}; };
simple_battery($bytes, $dev_str, \@res, 7); #simple_battery($bytes, $dev_str, \@res, 7);
return @res; return @res;
} }