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

OWX-Clients: use OWX_ASYNC_Verify in asynchronous mode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5401 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-04-01 15:05:57 +00:00
parent 700d009f74
commit 6234b7a0fd
5 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/21_OWAD.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"); my @owg_fixed = ("A","B","C","D");
my @owg_channel = ("A","B","C","D"); my @owg_channel = ("A","B","C","D");
@ -555,7 +555,12 @@ sub OWAD_Get($@) {
if($a[1] eq "present") { if($a[1] eq "present") {
#-- hash of the busmaster #-- hash of the busmaster
my $master = $hash->{IODev}; my $master = $hash->{IODev};
$value = OWX_Verify($master,$owx_dev); #-- asynchronous mode
if( $hash->{ASYNC} ){
$value = OWX_ASYNC_Verify($master,$hash->{ROM_ID});
} else {
$value = OWX_Verify($master,$hash->{ROM_ID});
}
$hash->{PRESENT} = $value; $hash->{PRESENT} = $value;
return "$name.present => $value"; return "$name.present => $value";
} }

5
FHEM/21_OWID.pm
View File

@ -299,7 +299,12 @@ sub OWID_Get($@) {
if($a[1] eq "present") { if($a[1] eq "present") {
#-- hash of the busmaster #-- hash of the busmaster
my $master = $hash->{IODev}; my $master = $hash->{IODev};
#-- asynchronous mode
if( $hash->{ASYNC} ){
$value = OWX_ASYNC_Verify($master,$hash->{ROM_ID});
} else {
$value = OWX_Verify($master,$hash->{ROM_ID}); $value = OWX_Verify($master,$hash->{ROM_ID});
}
if( $value == 0 ){ if( $value == 0 ){
readingsSingleUpdate($hash,"present",0,$hash->{PRESENT}); readingsSingleUpdate($hash,"present",0,$hash->{PRESENT});
} else { } else {

7
FHEM/21_OWMULTI.pm
View File

@ -442,10 +442,15 @@ sub OWMULTI_Get($@) {
#-- get present #-- get present
if($a[1] eq "present" ) { if($a[1] eq "present" ) {
#-- OWX interface #-- OWX interface
if( $interface eq "OWX" ){ if( $interface =~ /^OWX/ ){
#-- hash of the busmaster #-- hash of the busmaster
my $master = $hash->{IODev}; my $master = $hash->{IODev};
#-- asynchronous mode
if( $hash->{ASYNC} ){
$value = OWX_ASYNC_Verify($master,$hash->{ROM_ID});
} else {
$value = OWX_Verify($master,$hash->{ROM_ID}); $value = OWX_Verify($master,$hash->{ROM_ID});
}
$hash->{PRESENT} = $value; $hash->{PRESENT} = $value;
return "$name.present => $value"; return "$name.present => $value";
} else { } else {

5
FHEM/21_OWSWITCH.pm
View File

@ -450,7 +450,12 @@ sub OWSWITCH_Get($@) {
if($a[1] eq "present") { if($a[1] eq "present") {
#-- hash of the busmaster #-- hash of the busmaster
my $master = $hash->{IODev}; my $master = $hash->{IODev};
#-- asynchronous mode
if( $hash->{ASYNC} ){
$value = OWX_ASYNC_Verify($master,$hash->{ROM_ID});
} else {
$value = OWX_Verify($master,$hash->{ROM_ID}); $value = OWX_Verify($master,$hash->{ROM_ID});
}
$hash->{PRESENT} = $value; $hash->{PRESENT} = $value;
return "$name.present => $value"; return "$name.present => $value";
} }

5
FHEM/21_OWTHERM.pm
View File

@ -424,7 +424,12 @@ sub OWTHERM_Get($@) {
if( $interface =~ /^OWX/ ){ if( $interface =~ /^OWX/ ){
#-- hash of the busmaster #-- hash of the busmaster
my $master = $hash->{IODev}; my $master = $hash->{IODev};
#-- asynchronous mode
if( $hash->{ASYNC} ){
$value = OWX_ASYNC_Verify($master,$hash->{ROM_ID});
} else {
$value = OWX_Verify($master,$hash->{ROM_ID}); $value = OWX_Verify($master,$hash->{ROM_ID});
}
$hash->{PRESENT} = $value; $hash->{PRESENT} = $value;
return "$name.present => $value"; return "$name.present => $value";
} else { } else {