mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into eo_merged

Browse Source 
Conflicts:
	FHEM/10_EnOcean.pm
This commit is contained in:
Marc Hoppe
2013-03-28 13:20:36 +01:00
parent 54518d5d6a c1d6b998e1
commit 018babc89a
531 changed files with 35644 additions and 9660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FHEM/00_TCM.pm
View File

@@ -1,5 +1,6 @@
##############################################
# $Id$
package main;
# by r.koenig at koeniglich.de
@@ -281,6 +282,12 @@ TCM_Read($)
Dispatch($hash, "EnOcean:$org:$d1:$id:$status:$odata", \%addvals);
# Schorsch M: dispatch corrections
if(!Dispatch($hash, "EnOcean:$org:$d1:$id:$status:$odata", \%addvals)) {
Log 1 , "Dispatch was called devices was not defined call Dispatch again";
Dispatch($hash, "EnOcean:$org:$d1:$id:$status:$odata", \%addvals);
}
} elsif($t eq "02") {
my $rc = substr($mdata, 0, 2);
my %codes = (