FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 08:03:40 +00:00
Code Issues Releases Wiki Activity

77_SMAEM.pm: contrib 3.5.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20726 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-12-13 15:13:13 +00:00
parent d1a82001f1
commit a933de2678
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/contrib/DS_Starter/77_SMAEM.pm
View File

@ -36,7 +36,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History done by DS_Starter # Versions History done by DS_Starter
our %SMAEM_vNotesIntern = ( our %SMAEM_vNotesIntern = (
"3.5.0" => "12.12.2019 support of SMA Homemanager 2.0 >= 2.03.4.R, attributes \"firmwareVersion\", \"serialNumber\" ", "3.5.0" => "12.12.2019 support of SMA Homemanager 2.0 >= 2.03.4.R, attribute \"serialNumber\" ",
"3.4.0" => "22.05.2019 support of Installer.pm/Meta.pm added, new version maintenance, commandref revised ", "3.4.0" => "22.05.2019 support of Installer.pm/Meta.pm added, new version maintenance, commandref revised ",
"3.3.0" => "21.05.2019 set reset to delete and reinitialize cacheFile, support of DelayedShutdownFn ", "3.3.0" => "21.05.2019 set reset to delete and reinitialize cacheFile, support of DelayedShutdownFn ",
"3.2.0" => "26.07.2018 log entry enhanced if diff overflow ", "3.2.0" => "26.07.2018 log entry enhanced if diff overflow ",
@ -286,22 +286,16 @@ sub SMAEM_Read ($) {
my $socket = $hash->{TCPDev}; my $socket = $hash->{TCPDev};
my $timeout = AttrVal($name, "timeout", 60); my $timeout = AttrVal($name, "timeout", 60);
my $refsn = AttrVal($name, "serialNumber", ""); my $refsn = AttrVal($name, "serialNumber", "");
my $data; my ($data,$model);
return if(IsDisabled($name)); return if(IsDisabled($name));
# if($fw eq "1.02.04.R") {
# return unless $socket->recv($data, 600); # Each SMAEM packet is 600 bytes of packed payload
# } elsif ($fw eq ">= 2.03.4.R") {
# return unless $socket->recv($data, 608); # Each packet of HM with FW >= 2.03.4.R is 608 bytes of packed payload
# }
$socket->recv($data, 608); $socket->recv($data, 608);
my $dl = length($data); my $dl = length($data);
if($dl == 600) { if($dl == 600) { # Each SMAEM packet is 600 bytes of packed payload
$hash->{MODEL} = "EM / HM 2.0 < 2.03.4.R"; $model = "EM / HM 2.0 < 2.03.4.R";
} elsif($dl == 608) { } elsif($dl == 608) { # Each packet of HM with FW >= 2.03.4.R is 608 bytes of packed payload
$hash->{MODEL} = "HM 2.0 >= 2.03.4.R"; $model = "HM 2.0 >= 2.03.4.R";
} else { } else {
Log3 ($name, 1, "SMAEM $name - Buffer length ".$dl." is invalid. Don't parse it."); Log3 ($name, 1, "SMAEM $name - Buffer length ".$dl." is invalid. Don't parse it.");
return; return;
@ -317,13 +311,15 @@ sub SMAEM_Read ($) {
return if(!$smaserial); return if(!$smaserial);
return if($refsn && $refsn ne $smaserial); # nur selektiv eine EM mit angegebener Serial lesen (default: alle) return if($refsn && $refsn ne $smaserial); # nur selektiv eine EM mit angegebener Serial lesen (default: alle)
$hex =~ /.*90000000(.{6})5200000000$/; $hex =~ /.*90000000(.{6})5200000000$/; # Firmware Version extrahieren
if($1) { if($1) {
my $fw = $1; my $fw = $1;
$fw =~ s/^(.{2})(.{2})(.{2})/"$1.$2.$3"/e; $fw =~ s/^(.{2})(.{2})(.{2})/"$1.$2.$3"/e;
$hash->{FIRMWARE} = $fw; $hash->{FIRMWARE} = $fw;
} }
$hash->{MODEL} = $model;
# alle Serialnummern in HELPER sammeln und ggf. speichern # alle Serialnummern in HELPER sammeln und ggf. speichern
if(!defined($hash->{HELPER}{ALLSERIALS}) || $hash->{HELPER}{ALLSERIALS} !~ /$smaserial/) { if(!defined($hash->{HELPER}{ALLSERIALS}) || $hash->{HELPER}{ALLSERIALS} !~ /$smaserial/) {
my $sep = $hash->{HELPER}{ALLSERIALS}?"_":undef; my $sep = $hash->{HELPER}{ALLSERIALS}?"_":undef;
@ -408,7 +404,7 @@ sub SMAEM_DoParse ($) {
# Entscheidung ob EM/HM2.0 mit Firmware >= 2.03.4.R # Entscheidung ob EM/HM2.0 mit Firmware >= 2.03.4.R
my $offset = 0; my $offset = 0;
my $grid_freq; my $grid_freq;
$hex =~ /.*000d04.{11}(000e04)(.*)(001504).*/; $hex =~ /.*000d04.{10}(000e04)(.*)(001504).*/;
if($1 && $1 eq "000e04") { if($1 && $1 eq "000e04") {
$grid_freq = hex($2)/1000; $grid_freq = hex($2)/1000;
$offset = 16; $offset = 16;