Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

47_OBIS: Fixed signed/unsigned-calculation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11292 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
icinger 2016-04-21 19:21:10 +00:00
parent 90e167328c
commit a9c87f6935
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/47_OBIS.pm
View File

@ -65,12 +65,12 @@ sub OBIS_Initialize($)
my ($hash) = @_; my ($hash) = @_;
require "$attr{global}{modpath}/FHEM/DevIo.pm"; require "$attr{global}{modpath}/FHEM/DevIo.pm";
$hash->{Match} = "OBIS"; $hash->{Match} = "^\/(?s:.*)\!\$";
$hash->{ReadFn} = "OBIS_Read"; $hash->{ReadFn} = "OBIS_Read";
$hash->{ReadyFn} = "OBIS_Ready"; $hash->{ReadyFn} = "OBIS_Ready";
$hash->{DefFn} = "OBIS_Define"; $hash->{DefFn} = "OBIS_Define";
$hash->{ParseFn} = "OBIS_Parse"; $hash->{ParseFn} = "OBIS_Parse";
# $hash->{SetFn} = "OBIS_Set"; $hash->{SetFn} = "OBIS_Set";
$hash->{UndefFn} = "OBIS_Undef"; $hash->{UndefFn} = "OBIS_Undef";
$hash->{AttrFn} = "OBIS_Attr"; $hash->{AttrFn} = "OBIS_Attr";
@ -211,6 +211,7 @@ sub OBIS_trySMLdecode($$)
while ($msg =~ m/(7707)([0-9A-F]{2,999}?)(?=7707|1B1B1B1B)/g) { while ($msg =~ m/(7707)([0-9A-F]{2,999}?)(?=7707|1B1B1B1B)/g) {
my $telegramm = $&; my $telegramm = $&;
my @list=$telegramm=~/(7707)([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2,999})/g; my @list=$telegramm=~/(7707)([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2,999})/g;
Log 3,"Telegram=$telegramm";
my $line=hex($list[1])."-".hex($list[2]).":".hex($list[3]).".".hex($list[4]).".".hex($list[5])."*255("; my $line=hex($list[1])."-".hex($list[2]).":".hex($list[3]).".".hex($list[4]).".".hex($list[5])."*255(";
my ($status,$statusL,$statusT,$valTime,$valTimeL,$valTimeT,$unit,$unitL,$unitT,$scaler,$scalerL,$scalerT,$data,$dataL,$dataT,$other); my ($status,$statusL,$statusT,$valTime,$valTimeL,$valTimeT,$unit,$unitL,$unitT,$scaler,$scalerL,$scalerT,$data,$dataL,$dataT,$other);
@ -219,7 +220,6 @@ sub OBIS_trySMLdecode($$)
($unitL,$unitT,$unit,$other)=OBIS_decodeTL($other); ($unitL,$unitT,$unit,$other)=OBIS_decodeTL($other);
($scalerL,$scalerT,$scaler,$other)=OBIS_decodeTL($other); ($scalerL,$scalerT,$scaler,$other)=OBIS_decodeTL($other);
($dataL,$dataT,$data,$other)=OBIS_decodeTL($other); ($dataL,$dataT,$data,$other)=OBIS_decodeTL($other);
# Type String # Type String
my $line2=""; my $line2="";
if ($dataT ==0 ) { if ($dataT ==0 ) {
@ -241,12 +241,27 @@ sub OBIS_trySMLdecode($$)
$unit eq "01" ? "" : $unit eq "01" ? "" :
$unit eq "1D" ? "varh" : $unit eq "1D" ? "varh" :
$unit eq "" ? "" : "var"; $unit eq "" ? "" : "var";
$scaler=$scaler ne "" ? 10**unpack("c", pack("C", hex($scaler))) : 0; $scaler=$scaler ne "" ? 10**unpack("c", pack("C", hex($scaler))) : 1;
if ($scaler==0) {$scaler=1}; # just to make sure if ($scaler==0) {$scaler=1}; # just to make sure
$line2.="<" if ($status=~/[aA]2$/); $line2.="<" if ($status=~/[aA]2$/);
$line2.=">" if ($status=~/82$/); $line2.=">" if ($status=~/82$/);
$line2.=(OBIS_hex2int($data)*$scaler).($unit eq "" ? "" : "*$unit") if($dataT ==80); my $val=0;
$line2.=(unpack("s", pack("S", hex($data)))*$scaler).($unit eq "" ? "" : "*$unit") if($dataT ==96); # signed Values
if ($dataT & 0b00010000) {
$val=unpack("c", pack("C", hex($data))) if ($dataL==1);
$val=unpack("s", pack("S", hex($data))) if ($dataL==2);
$val=unpack("l", pack("L", hex($data))) if ($dataL==4);
$val=unpack("q", pack("Q", hex($data))) if ($dataL==8);
}
#unsigned Values
if ($dataT & 0b00100000) {
$val=unpack("C", pack("C", hex($data))) if ($dataL==1);
$val=unpack("S", pack("S", hex($data))) if ($dataL==2);
$val=unpack("L", pack("L", hex($data))) if ($dataL==4);
$val=unpack("Q", pack("Q", hex($data))) if ($dataL==8);
}
$line2.=($val*$scaler).($unit eq "" ? "" : "*$unit") if($dataT ==80);
$line2.=($val*$scaler).($unit eq "" ? "" : "*$unit") if($dataT ==96);
} elsif ($dataT & 0b01000000) { # Type Boolean - no Idea, where this is used } elsif ($dataT & 0b01000000) { # Type Boolean - no Idea, where this is used
$line2=OBIS_hex2int($data); # 0=false, everything else is true $line2=OBIS_hex2int($data); # 0=false, everything else is true
} elsif ($dataT & 0b01110000) { # Type List of.... - not sure, if we ever need that } elsif ($dataT & 0b01110000) { # Type List of.... - not sure, if we ever need that