FHEM/mod-XiaomiBTLESens
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add charlies patch

Browse Source
This commit is contained in:
Marko Oldenburg
2019-12-22 20:40:06 +01:00
parent 140ca8b09e
commit 510b7e5f9c
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
74_XiaomiBTLESens.pm
View File

@@ -218,6 +218,7 @@ sub Initialize($) {
. "minLux " . "minLux "
. "maxLux " . "maxLux "
. "sshHost " . "sshHost "
. "psCommand "
. "model:flowerSens,thermoHygroSens,clearGrassSens " . "model:flowerSens,thermoHygroSens,clearGrassSens "
. "blockingCallLoglevel:2,3,4,5 " . "blockingCallLoglevel:2,3,4,5 "
. $readingFnAttributes; . $readingFnAttributes;
@@ -627,6 +628,10 @@ sub CreateParamGatttool($@) {
} }
} }
sub Gatttool_executeCommand{
my $command = join ' ', @_;
($_ = qx{$command 2>&1}, $? >> 8);
}
sub ExecGatttool_Run($) { sub ExecGatttool_Run($) {
my $string = shift; my $string = shift;
@@ -657,11 +662,12 @@ sub ExecGatttool_Run($) {
$cmd .= "--char-write-req -a $handle -n $value" $cmd .= "--char-write-req -a $handle -n $value"
if ( $gattCmd eq 'write' ); if ( $gattCmd eq 'write' );
$cmd .= " --listen" if ($listen); $cmd .= " --listen" if ($listen);
$cmd .= " 2>&1 /dev/null"; # $cmd .= " 2>&1 /dev/null";
$cmd .= " 2>&1";
$cmd .= "'" if ( $sshHost ne 'none' ); $cmd .= "'" if ( $sshHost ne 'none' );
$cmd = # $cmd = "ssh $sshHost 'gatttool -i $hci -b $mac --char-write-req -a 0x33 -n A01F && gatttool -i $hci -b $mac --char-read -a 0x35 2>&1 /dev/null'"
"ssh $sshHost 'gatttool -i $hci -b $mac --char-write-req -a 0x33 -n A01F && gatttool -i $hci -b $mac --char-read -a 0x35 2>&1 /dev/null'" $cmd = "ssh $sshHost 'gatttool -i $hci -b $mac --char-write-req -a 0x33 -n A01F && gatttool -i $hci -b $mac --char-read -a 0x35 2>&1 '"
if ( $sshHost ne 'none' if ( $sshHost ne 'none'
and $gattCmd eq 'write' and $gattCmd eq 'write'
and AttrVal( $name, "model", "none" ) eq 'flowerSens' ); and AttrVal( $name, "model", "none" ) eq 'flowerSens' );
@@ -672,11 +678,13 @@ sub ExecGatttool_Run($) {
my $gatttoolCmdlineStaticEscaped = my $gatttoolCmdlineStaticEscaped =
BTLE_CmdlinePreventGrepFalsePositive( BTLE_CmdlinePreventGrepFalsePositive(
"gatttool -i $hci -b $mac"); "gatttool -i $hci -b $mac");
my $psCommand = AttrVal( $name, 'psCommand', 'ps ax' );
$grepGatttool = qx(ps ax| grep -E \'$gatttoolCmdlineStaticEscaped\') Log3 $name, 5, 'Execute Command: $psCommand | grep -E "$gatttoolCmdlineStaticEscaped"';
# $grepGatttool = qx(ps ax| grep -E \'$gatttoolCmdlineStaticEscaped\')
$grepGatttool = qx( $psCommand | grep -E \'$gatttoolCmdlineStaticEscaped\')
if ( $sshHost eq 'none' ); if ( $sshHost eq 'none' );
$grepGatttool = # $grepGatttool = qx(ssh $sshHost 'ps ax| grep -E "$gatttoolCmdlineStaticEscaped"')
qx(ssh $sshHost 'ps ax| grep -E "$gatttoolCmdlineStaticEscaped"') $grepGatttool = qx(ssh $sshHost ' $psCommand | grep -E "$gatttoolCmdlineStaticEscaped"')
if ( $sshHost ne 'none' ); if ( $sshHost ne 'none' );
if ( not $grepGatttool =~ /^\s*$/ ) { if ( not $grepGatttool =~ /^\s*$/ ) {
@@ -690,22 +698,27 @@ sub ExecGatttool_Run($) {
} }
$loop = 0; $loop = 0;
my $returnString ="";
my $returnCode = "1";
do { do {
Log3 $name, 5, Log3 $name, 5, "XiaomiBTLESens ($name) - ExecGatttool_Run: call gatttool with command: $cmd and loop $loop";
"XiaomiBTLESens ($name) - ExecGatttool_Run: call gatttool with command: $cmd and loop $loop";
@gtResult = split( ": ", qx($cmd) ); ($returnString, $returnCode) = Gatttool_executeCommand($cmd);
@gtResult = split( ": ", $returnString);
# @gtResult = split( ": ", qx($cmd) );
Log3 $name, 5, Log3 $name, 5,
"XiaomiBTLESens ($name) - ExecGatttool_Run: gatttool loop result " "XiaomiBTLESens ($name) - ExecGatttool_Run: gatttool loop result "
. join( ",", @gtResult ); . join( ",", @gtResult );
$loop++; $loop++;
$gtResult[0] = 'connect error' $returnCode = "2"
unless ( defined( $gtResult[0] ) ); unless ( defined( $gtResult[0] ) );
} while ( $loop < 5 and $gtResult[0] eq 'connect error' ); # } while ( $loop < 5 and $gtResult[0] eq 'connect error' );
} while ( $loop < 5 and $returnCode ne "0" );
Log3 $name, 3,"XiaomiBTLESens ($name) - ExecGatttool_Run: errorcode: \"$returnCode\", ErrorString: \"$returnString\"" if ($returnCode ne "0");
Log3 $name, 4, Log3 $name, 4,
"XiaomiBTLESens ($name) - ExecGatttool_Run: gatttool result " "XiaomiBTLESens ($name) - ExecGatttool_Run: gatttool result "