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

OWSWITCH: fix 'Use of uninitialized value in left bitshift (<<) at ./FHEM/21_OWSWITCH.pm line 717.' when being used with OWX_ASYNC

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5523 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-04-14 11:20:22 +00:00
parent 79fb536184
commit 73c84fee71
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/21_OWSWITCH.pm
View File

@ -76,7 +76,7 @@ use strict;
use warnings; use warnings;
sub Log($$); sub Log($$);
my $owx_version="5.11"; my $owx_version="5.12";
#-- fixed raw channel name, flexible channel name #-- fixed raw channel name, flexible channel name
my @owg_fixed = ("A","B","C","D","E","F","G","H"); my @owg_fixed = ("A","B","C","D","E","F","G","H");
my @owg_channel = ("A","B","C","D","E","F","G","H"); my @owg_channel = ("A","B","C","D","E","F","G","H");
@ -493,7 +493,7 @@ sub OWSWITCH_Get($@) {
#-- OWX interface #-- OWX interface
if( $interface =~ /^OWX/ ){ if( $interface =~ /^OWX/ ){
$ret = OWXSWITCH_GetState($hash); $ret = OWXSWITCH_GetState($hash,1);
#-- OWFS interface #-- OWFS interface
}elsif( $interface eq "OWFS" ){ }elsif( $interface eq "OWFS" ){
$ret = OWFSSWITCH_GetState($hash); $ret = OWFSSWITCH_GetState($hash);
@ -510,7 +510,7 @@ sub OWSWITCH_Get($@) {
if( int(@a)==1 ); if( int(@a)==1 );
if( $interface =~ /^OWX/ ){ if( $interface =~ /^OWX/ ){
$ret = OWXSWITCH_GetState($hash); $ret = OWXSWITCH_GetState($hash,1);
}elsif( $interface eq "OWServer" ){ }elsif( $interface eq "OWServer" ){
$ret = OWFSSWITCH_GetState($hash); $ret = OWFSSWITCH_GetState($hash);
}else{ }else{
@ -710,7 +710,7 @@ sub OWSWITCH_Set($@) {
#-- OWX interface #-- OWX interface
if( $interface =~ /^OWX/ ){ if( $interface =~ /^OWX/ ){
$ret1 = OWXSWITCH_GetState($hash); $ret1 = OWXSWITCH_GetState($hash,1);
$value = 0; $value = 0;
#-- vax or val ? #-- vax or val ?
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){ for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
@ -1075,8 +1075,8 @@ sub OWXSWITCH_BinValues($$$$$$$$) {
# #
######################################################################################## ########################################################################################
sub OWXSWITCH_GetState($) { sub OWXSWITCH_GetState($@) {
my ($hash) = @_; my ($hash,$sync) = @_;
my ($select, $res, $res2, $res3, @data); my ($select, $res, $res2, $res3, @data);
@ -1101,12 +1101,11 @@ sub OWXSWITCH_GetState($) {
#-- reading 9 + 3 + 2 data bytes + 2 CRC bytes = 16 bytes #-- reading 9 + 3 + 2 data bytes + 2 CRC bytes = 16 bytes
$select=sprintf("\xF5\xDD\xFF"); $select=sprintf("\xF5\xDD\xFF");
#-- asynchronous mode #-- asynchronous mode
if( $hash->{ASYNC} ){ if( $hash->{ASYNC} ){
if (OWX_Execute( $master, "getstate.ds2406", 1, $owx_dev, $select, 4, undef )) { if (!OWX_Execute( $master, "getstate.ds2406", 1, $owx_dev, $select, 4, undef ) or ($sync and !OWX_AwaitExecuteResponse($master,"getstate.ds2406",$owx_dev))) {
return undef; return "not accessible for reading";
} else {
return "not accessible in reading";
} }
return undef;
#-- synchronous mode #-- synchronous mode
}else{ }else{
OWX_Reset($master); OWX_Reset($master);
@ -1127,11 +1126,10 @@ sub OWXSWITCH_GetState($) {
$select=sprintf("\xF0\x88\x00"); $select=sprintf("\xF0\x88\x00");
#-- asynchronous mode #-- asynchronous mode
if( $hash->{ASYNC} ){ if( $hash->{ASYNC} ){
if (OWX_Execute( $master, "getstate.ds2408", 1, $owx_dev, $select, 10, undef )) { if (!OWX_Execute( $master, "getstate.ds2408", 1, $owx_dev, $select, 10, undef ) or ($sync and !OWX_AwaitExecuteResponse($master,"getstate.ds2408",$owx_dev))) {
return undef; return "not accessible for reading";
} else {
return "not accessible in reading";
} }
return undef;
#-- synchronous mode #-- synchronous mode
}else{ }else{
OWX_Reset($master); OWX_Reset($master);
@ -1151,11 +1149,10 @@ sub OWXSWITCH_GetState($) {
#-- reading 9 + 1 + 2 data bytes = 12 bytes #-- reading 9 + 1 + 2 data bytes = 12 bytes
#-- asynchronous mode #-- asynchronous mode
if( $hash->{ASYNC} ){ if( $hash->{ASYNC} ){
if (OWX_Execute( $master, "getstate.ds2413", 1, $owx_dev, "\xF5", 2, undef )) { if (!OWX_Execute( $master, "getstate.ds2413", 1, $owx_dev, "\xF5", 2, undef ) or ($sync and !OWX_AwaitExecuteResponse($master,"getstate.ds2413",$owx_dev))) {
return undef; return "not accessible for reading";
} else {
return "not accessible in reading";
} }
return undef;
#-- synchronous mode #-- synchronous mode
}else{ }else{
OWX_Reset($master); OWX_Reset($master);