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

34_SWAP.pm: fixed handling of single bit endpoints

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7554 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-01-13 18:46:28 +00:00
parent d597d44994
commit 8d7956d4d5
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
fhem/FHEM/34_SWAP.pm
View File

@ -498,20 +498,27 @@ SWAP_Set($@)
my $len = $register->{endpoints}->[$ep]->{size}; my $len = $register->{endpoints}->[$ep]->{size};
if( $len =~ m/^(\d+)\.(\d+)$/ ) { if( $len =~ m/^(\d+)\.(\d+)$/ ) {
return "only single bit endpoints are supported" if( $2 != 1 ); return "only single bit endpoints are supported in regSet" if( $1 != 0 && $2 != 1 );
return "value has to 0 or 1" if( $arg2 ne "0" && $arg2 ne "1" ); return "value has to 0 or 1" if( $arg2 ne "0" && $arg2 ne "1" );
} else { } else {
return "value has to be ". $len ." byte(s) in size" if( $len*2 != length( $arg2 ) ); return "value has to be ". $len ." byte(s) in size" if( $len*2 != length( $arg2 ) );
} }
} else { } else {
my $len = 0; my $len = $register->{size};
foreach my $endpoint ( @{$register->{endpoints}} ) { if( !$len ) {
if( !defined($endpoint->{position}) ) { my $max_position = 0;
$len = $endpoint->{size}; foreach my $endpoint ( @{$register->{endpoints}} ) {
last; if( !defined($endpoint->{position}) ) {
$len = $endpoint->{size};
last;
}
$max_position = maxNum( $max_position, int($endpoint->{position}) );
$len += $endpoint->{size};
} }
$len += $endpoint->{size}; $len = maxNum( $len, $max_position+1 );
} }
return "value has to be ". $len ." byte(s) in size" if( $len*2 != length( $arg2 ) ); return "value has to be ". $len ." byte(s) in size" if( $len*2 != length( $arg2 ) );
@ -559,19 +566,22 @@ SWAP_Set($@)
$endpoint = $register->{endpoints}->[$ep]; $endpoint = $register->{endpoints}->[$ep];
if( defined( $endpoint->{position} ) ) { if( my $position = $endpoint->{position} ) {
if( $endpoint->{position} =~ m/^(\d+)\.(\d+)$/ ) { my $size = $endpoint->{size};
my $byte = hex( substr( $value, length($value) - 2 - $1*2, 2 ) ); if( $position =~ m/^(\d+)\.(\d+)$/ ) {
return "only single bit endpoints supported" if( $size ne "0.1" );
my $bytes = hex(substr($value, $1*2, 2));
my $mask = 0x01 << $2; my $mask = 0x01 << $2;
$byte &= ~$mask if( $arg2 eq "0" ); $bytes &= ~$mask if( $arg2 eq "0" );
$byte |= $mask if( $arg2 eq "1" ); $bytes |= $mask if( $arg2 eq "1" );
$byte &= 0xFF; $bytes &= 0xFF;
substr( $value, length($value) - 2 - $1*2, 2 , sprintf("%02X",$byte) ); substr( $value, $1*2, 2 , sprintf("%02X",$bytes) );
} else { } else {
substr( $value, $endpoint->{position}*2, $endpoint->{size}*2, $arg2 ); substr( $value, $endpoint->{position}*2, $endpoint->{size}*2, $arg2 );
} }
$arg2 = $value; $arg2 = $value;
Log 3, $value;
} }
} }
} }
@ -709,12 +719,13 @@ SWAP_Get($@)
if( $cmd eq 'regList' || $cmd eq 'regListAll' ) { if( $cmd eq 'regList' || $cmd eq 'regListAll' ) {
my $ret = ""; my $ret = "";
$ret .= sprintf( "reg.\t| size\t| dir.\t| name\n"); $ret .= sprintf( "reg.\t| pos\t| size\t| dir.\t| name\n");
if( $cmd eq 'regListAll' ) { if( $cmd eq 'regListAll' ) {
foreach my $reg ( sort { $a <=> $b } keys ( %default_registers ) ) { foreach my $reg ( sort { $a <=> $b } keys ( %default_registers ) ) {
my $register = $default_registers{$reg}; my $register = $default_registers{$reg};
$ret .= sprintf( "%02X\t| %s\t| %s\t|%s\n", $reg, $ret .= sprintf( "%02X\t| %s\t| %s\t| %s\t|%s\n", $reg,
"",
defined($register->{size})?$register->{size}:"", defined($register->{size})?$register->{size}:"",
defined($register->{direction})?($register->{direction}==OUT?"set":"get"):"", defined($register->{direction})?($register->{direction}==OUT?"set":"get"):"",
$register->{name} ); $register->{name} );
@ -722,6 +733,7 @@ SWAP_Get($@)
my $i = 0; my $i = 0;
foreach my $endpoint ( @{$register->{endpoints}} ) { foreach my $endpoint ( @{$register->{endpoints}} ) {
$ret .= sprintf( " .%i\t| %s\t| %s\t| %s\n", $i, $ret .= sprintf( " .%i\t| %s\t| %s\t| %s\n", $i,
defined($endpoint->{position})?$endpoint->{position}:"",
defined($endpoint->{size})?$endpoint->{size}:"", defined($endpoint->{size})?$endpoint->{size}:"",
defined($endpoint->{direction})?($endpoint->{direction}==OUT?"set":"get"):"", defined($endpoint->{direction})?($endpoint->{direction}==OUT?"set":"get"):"",
$endpoint->{name} ) if($i > 0); $endpoint->{name} ) if($i > 0);
@ -738,19 +750,23 @@ SWAP_Get($@)
my $i = 0; my $i = 0;
foreach my $endpoint ( @{$register->{endpoints}} ) { foreach my $endpoint ( @{$register->{endpoints}} ) {
$ret .= sprintf( "%02X\t| %s\t| %s\t|%s\n", $reg, $ret .= sprintf( "%02X\t| %s\t| %s\t| %s\t|%s\n", $reg,
($i!=0&&defined($endpoint->{position}))?$endpoint->{position}:"",
defined($register->{size})?$register->{size}:"", defined($register->{size})?$register->{size}:"",
defined($register->{direction})?($register->{direction}==OUT?"set":"get"):"", defined($register->{direction})?($register->{direction}==OUT?"set":"get"):"",
$register->{name} ) if($i == 0 && defined($endpoint->{position})); $register->{name} ) if($i == 0 && defined($endpoint->{position}));
$ret .= sprintf( "%02X\t| %s\t| %s\t|%s\n", $reg, $ret .= sprintf( "%02X\t| %s\t| %s\t| %s\t|%s\n", $reg,
"",
$endpoint->{size}, $endpoint->{size},
$endpoint->{direction}==OUT?"set":"get", $endpoint->{direction}==OUT?"set":"get",
$endpoint->{name} ) if($i == 0 && !defined($endpoint->{position})); $endpoint->{name} ) if($i == 0 && !defined($endpoint->{position}));
$ret .= sprintf( " .%i\t| %s\t| %s\t| %s\n", $i, $ret .= sprintf( " .%i\t| %s\t| %s\t| %s\t| %s\n", $i,
defined($endpoint->{position})?$endpoint->{position}:"",
$endpoint->{size}, $endpoint->{size},
$endpoint->{direction}==OUT?"set":"get", $endpoint->{direction}==OUT?"set":"get",
$endpoint->{name} ) if($i == 0 && defined($endpoint->{position})); $endpoint->{name} ) if($i == 0 && defined($endpoint->{position}));
$ret .= sprintf( " .%i\t| %s\t| %s\t| %s\n", $i, $ret .= sprintf( " .%i\t| %s\t| %s\t| %s\t| %s\n", $i,
defined($endpoint->{position})?$endpoint->{position}:"",
$endpoint->{size}, $endpoint->{size},
$endpoint->{direction}==OUT?"set":"get", $endpoint->{direction}==OUT?"set":"get",
$endpoint->{name} ) if($i > 0); $endpoint->{name} ) if($i > 0);
@ -840,17 +856,24 @@ SWAP_updateReadings($$$)
&& defined($register->{endpoints} ) ) { && defined($register->{endpoints} ) ) {
my $i = 0; my $i = 0;
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
#my $nr_endpoints = keys(@{$register->{endpoints}});
foreach my $endpoint (@{$register->{endpoints}}) { foreach my $endpoint (@{$register->{endpoints}}) {
my $position = 0;
my $value = ""; my $value = "";
my $size = $endpoint->{size};
my $position = 0;
$position = $endpoint->{position} if( defined($endpoint->{position}) ); $position = $endpoint->{position} if( defined($endpoint->{position}) );
if( $position =~ m/^(\d+)\.(\d+)$/ ) { if( $position =~ m/^(\d+)\.(\d+)$/ ) {
my $byte = hex( substr( $data, length($data) - 2 - $1*2, 2 ) ); if( $size ne "0.1" ) {
Log3 $name, 2, "$endpoint->{name}: only single bit endpoints are supported";
next;
}
my $bytes = substr($data, $1*2, 2);
my $mask = 0x01 << $2; my $mask = 0x01 << $2;
$value = "0"; $value = "0";
$value = "1" if( $byte & $mask ); $value = "1" if( hex($bytes) & $mask );
} else { } else {
$value = substr($data, $position*2, $endpoint->{size}*2); $value = substr($data, $position*2, $size*2);
} }
if( $endpoint->{type} == STR ) { if( $endpoint->{type} == STR ) {
my $v = ""; my $v = "";