FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 11:01:59 +00:00
Code Issues Releases Wiki Activity

77_SMAEM: contrib 3.5.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20734 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-12-13 20:23:14 +00:00
parent 88e1c71173
commit b0c204cd52
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,13 +312,6 @@ 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$/; # Firmware Version extrahieren
if($1) {
my $fw = $1;
$fw =~ /(.{2})(.{2})(.{2})/;
$hash->{FIRMWARE} = hex($1).".".hex($2).".".hex($3);
}
$hash->{MODEL} = $model; $hash->{MODEL} = $model;
# alle Serialnummern in HELPER sammeln und ggf. speichern # alle Serialnummern in HELPER sammeln und ggf. speichern
@ -412,12 +405,22 @@ sub SMAEM_DoParse ($) {
} }
Log3 ($name, 4, "SMAEM $name - Offset: $offset"); Log3 ($name, 4, "SMAEM $name - Offset: $offset");
# Firmware Version extrahieren
my $fwversion;
$hex =~ /.*90000000(.{8})00000000$/;
if($1) {
my $fw = $1;
$fw =~ /(.{2})(.{2})(.{2})(.{2})/;
$fwversion = hex($1).".".sprintf("%02d", hex($2)).".".sprintf("%02d", hex($3)).".".chr(hex($4));
}
################ Aufbau Ergebnis-Array #################### ################ Aufbau Ergebnis-Array ####################
# Extract datasets from hex: # Extract datasets from hex:
# Generic: # Generic:
my $susyid = hex(substr($hex,36,4)); my $susyid = hex(substr($hex,36,4));
my $milliseconds = hex(substr($hex,48,8)); my $milliseconds = hex(substr($hex,48,8));
# Prestring with SMAEM and SERIALNO or not
# Prestring with SMAEM and SERIALNO or not
my $ps = (!AttrVal($name, "disableSernoInReading", undef)) ? "SMAEM".$smaserial."_" : ""; my $ps = (!AttrVal($name, "disableSernoInReading", undef)) ? "SMAEM".$smaserial."_" : "";
# Counter Divisor: [Hex-Value]=Ws => Ws/1000*3600=kWh => divide by 3600000 # Counter Divisor: [Hex-Value]=Ws => Ws/1000*3600=kWh => divide by 3600000
@ -533,10 +536,12 @@ sub SMAEM_DoParse ($) {
push(@row_array, $ps."Einspeisung_Scheinleistung ".sprintf("%.1f",$einspeisung_schein)."\n"); push(@row_array, $ps."Einspeisung_Scheinleistung ".sprintf("%.1f",$einspeisung_schein)."\n");
push(@row_array, $ps."Einspeisung_Scheinleistung_Zaehler ".sprintf("%.1f",$einspeisung_schein_count)."\n"); push(@row_array, $ps."Einspeisung_Scheinleistung_Zaehler ".sprintf("%.1f",$einspeisung_schein_count)."\n");
my $cosphi=hex(substr($hex,304,8))/1000; my $cosphi = hex(substr($hex,304,8))/1000;
push(@row_array, $ps."CosPhi ".sprintf("%.3f",$cosphi)."\n"); push(@row_array, $ps."CosPhi ".sprintf("%.3f",$cosphi)."\n");
push(@row_array, $ps."GridFreq ".$grid_freq."\n") if($grid_freq); push(@row_array, $ps."GridFreq ".$grid_freq."\n") if($grid_freq);
push(@row_array, $ps."FwVersion ".$fwversion."\n") if($fwversion);
push(@row_array, "SerialNumber ".$smaserial."\n") if(!$ps);
# L1 # L1
my $l1_bezug_wirk = hex(substr($hex,320+$offset,8))/10; my $l1_bezug_wirk = hex(substr($hex,320+$offset,8))/10;