From 634cbd8c2c83ab513a7d26730a9f610db969ef97 Mon Sep 17 00:00:00 2001
From: wherzig <>
Date: Sat, 28 Apr 2012 21:54:58 +0000
Subject: [PATCH] weight sensors BWR101 and GR101 added

git-svn-id: https://svn.fhem.de/fhem/trunk@1494 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/45_TRX.pm         |  4 +-
 fhem/FHEM/46_TRX_WEATHER.pm | 76 +++++++++++++++++++++++++++++++++++--
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/fhem/FHEM/45_TRX.pm b/fhem/FHEM/45_TRX.pm
index 2761b636f..82f3cbc76 100755
--- a/fhem/FHEM/45_TRX.pm
+++ b/fhem/FHEM/45_TRX.pm
@@ -53,10 +53,10 @@ TRX_Initialize($)
   $hash->{Clients} =
         ":TRX_WEATHER:TRX_SECURITY:TRX_LIGHT:";
   my %mc = (
-    "1:TRX_WEATHER"   	=> "^..(50|51|52|54|55|56).*",
+    "1:TRX_WEATHER"   	=> "^..(50|51|52|54|55|56|5d).*",
     "2:TRX_SECURITY" 	=> "^..(20).*", 
     "3:TRX_LIGHT"	=> "^..(10|11|12).*", 
-    "4:TRX_ELSE"   	=> "^..(0|3|4|6|7|8|9).*",
+    "4:TRX_ELSE"   	=> "^...*",
   );
   $hash->{MatchList} = \%mc;
 
diff --git a/fhem/FHEM/46_TRX_WEATHER.pm b/fhem/FHEM/46_TRX_WEATHER.pm
index 90b649253..421a634cb 100755
--- a/fhem/FHEM/46_TRX_WEATHER.pm
+++ b/fhem/FHEM/46_TRX_WEATHER.pm
@@ -79,8 +79,7 @@ TRX_WEATHER_Initialize($)
 {
   my ($hash) = @_;
 
-  $hash->{Match}     = "^[\x38-\x78].*";
-  #$hash->{Match}     = "^[^\x30]";
+  $hash->{Match}     = "^..(50|51|52|54|55|56|5d).*";
   $hash->{DefFn}     = "TRX_WEATHER_Define";
   $hash->{UndefFn}   = "TRX_WEATHER_Undef";
   $hash->{ParseFn}   = "TRX_WEATHER_Parse";
@@ -135,6 +134,8 @@ my %types =
    0x550b => { part => 'RAIN', method => \&common_rain, },
    # WIND
    0x5610 => { part => 'WIND', method => \&common_anemometer, },
+   # WEIGHT
+   0x5D08 => { part => 'WEIGHT', method => \&common_weight, },
   );
 
 # --------------------------------------------
@@ -344,7 +345,7 @@ sub common_temp {
 	0x02 => "THGR132N", # was THGR228N,
 	0x03 => "THWR800",
 	0x04 => "RTHN318",
-	0x05 => "TX3_T", # LaCrosse TX3
+	0x05 => "TX3", # LaCrosse TX3
   );
 
   if (exists $devname{$bytes->[1]}) {
@@ -392,7 +393,7 @@ sub common_hydro {
 
   my %devname =
     (	# HEXSTRING => "NAME"
-	0x01 => "TX3_H", # LaCrosse TX3
+	0x01 => "TX3", # LaCrosse TX3
   );
 
   if (exists $devname{$bytes->[1]}) {
@@ -587,6 +588,65 @@ sub common_rain {
   return @res;
 }
 
+# ------------------------------------------------------------
+#
+sub common_weight {
+    	my $type = shift;
+	my $longids = shift;
+    	my $bytes = shift;
+
+  my $subtype = sprintf "%02x", $bytes->[1];
+  #Log 1,"subtype=$subtype";
+  my $dev_type;
+
+  my %devname =
+    (	# HEXSTRING => "NAME"
+	0x01 => "BWR101",
+	0x02 => "GR101",
+  );
+
+  if (exists $devname{$bytes->[1]}) {
+  	$dev_type = $devname{$bytes->[1]};
+  } else {
+  	Log 1,"TRX_WEATHER: common_weight error undefined subtype=$subtype";
+  	my @res = ();
+  	return @res;
+  }
+
+  #my $seqnbr = sprintf "%02x", $bytes->[2];
+  #Log 1,"seqnbr=$seqnbr";
+
+  my $dev_str = $dev_type;
+  if (use_longid($longids,$dev_type)) {
+  	$dev_str .= $DOT.sprintf("%02x", $bytes->[3]);
+  }
+  if ($bytes->[4] > 0) {
+  	$dev_str .= $DOT.sprintf("%d", $bytes->[4]);
+  }
+
+  my @res = ();
+
+  # hexline debugging
+  if ($TRX_HEX_debug) {
+    my $hexline = ""; for (my $i=0;$i<@$bytes;$i++) { $hexline .= sprintf("%02x",$bytes->[$i]);} 
+    push @res, { device => $dev_str, type => 'hexline', current => $hexline, units => 'hex', };
+  }
+
+  my $weight = ($bytes->[5]*256 + $bytes->[6])/10;
+
+  push @res, {
+	device => $dev_str,
+	type => 'weight',
+	current => $weight,
+	units => 'kg',
+  };
+
+  simple_battery($bytes, $dev_str, \@res, 7);
+
+  return @res;
+}
+
+
 # -----------------------------
 sub
 TRX_WEATHER_Parse($$)
@@ -790,6 +850,14 @@ TRX_WEATHER_Parse($$)
 			$def->{READINGS}{$sensor}{VAL} = $i->{risk};
 			$def->{CHANGED}[$n++] = $sensor . ": " . $i->{risk};;
 	}
+	elsif ($i->{type} eq "weight") { 
+			$val .= "W: ".$i->{current}." ";
+
+			$sensor = "weight";			
+			$def->{READINGS}{$sensor}{TIME} = $tm;
+			$def->{READINGS}{$sensor}{VAL} = $i->{current};
+			$def->{CHANGED}[$n++] = $sensor . ": " . $i->{current};;
+	}
 	elsif ($i->{type} eq "hexline") { 
 			$sensor = "hexline";			
 			$def->{READINGS}{$sensor}{TIME} = $tm;