mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-04 11:26:55 +00:00
LandroidUtils.pm: some typos
git-svn-id: https://svn.fhem.de/fhem/trunk@27408 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
c22c1eccf9
commit
f8143033f9
@ -76,11 +76,11 @@ Landroid_connect($$)
|
|||||||
url=>"https://$t->{loginUrl}/oauth/token",
|
url=>"https://$t->{loginUrl}/oauth/token",
|
||||||
callback=> sub($$$){
|
callback=> sub($$$){
|
||||||
my ($h,$e,$d) = @_;
|
my ($h,$e,$d) = @_;
|
||||||
return Log3 $m2c, 1, "$errPrefix: $e" if($e);
|
return Log3 $m2c, 1, "$errPrefix $e" if($e);
|
||||||
return Log3 $m2c, 1, "$errPrefix: no data" if(!$d);
|
return Log3 $m2c, 1, "$errPrefix no data" if(!$d);
|
||||||
Log3 $m2c, 5, $d;
|
Log3 $m2c, 5, $d;
|
||||||
$m2c->{".auth"} = json2nameValue($d);
|
$m2c->{".auth"} = json2nameValue($d);
|
||||||
return Log3 $m2c, 1, "$errPrefix: no access_token"
|
return Log3 $m2c, 1, "$errPrefix no access_token"
|
||||||
if(!$m2c->{".auth"}{access_token});
|
if(!$m2c->{".auth"}{access_token});
|
||||||
Log3 $m2c, 4, "$m2c_name: Got auth info";
|
Log3 $m2c, 4, "$m2c_name: Got auth info";
|
||||||
setReadingsVal($m2c, ".refresh_token",
|
setReadingsVal($m2c, ".refresh_token",
|
||||||
@ -116,11 +116,11 @@ Landroid_connect2($)
|
|||||||
},
|
},
|
||||||
callback=>sub($$$){
|
callback=>sub($$$){
|
||||||
my ($h,$e,$d) = @_;
|
my ($h,$e,$d) = @_;
|
||||||
return Log3 $m2c, 1, "$errPrefix: $e" if($e);
|
return Log3 $m2c, 1, "$errPrefix $e" if($e);
|
||||||
return Log3 $m2c, 1, "$errPrefix: no data" if(!$d);
|
return Log3 $m2c, 1, "$errPrefix no data" if(!$d);
|
||||||
Log3 $m2c, 5, $d;
|
Log3 $m2c, 5, $d;
|
||||||
my $me = json2nameValue($d);
|
my $me = json2nameValue($d);
|
||||||
return Log3 $m2c, 1, "$errPrefix: no userId/mqttEndpoint"
|
return Log3 $m2c, 1, "$errPrefix no userId/mqttEndpoint"
|
||||||
if(!$me->{userId} || !$me->{mqttEndpoint});
|
if(!$me->{userId} || !$me->{mqttEndpoint});
|
||||||
Log3 $m2c, 4, "$m2c_name: Got userId/mqttEndpoint";
|
Log3 $m2c, 4, "$m2c_name: Got userId/mqttEndpoint";
|
||||||
$m2c->{userId} = $me->{id};
|
$m2c->{userId} = $me->{id};
|
||||||
@ -130,7 +130,7 @@ Landroid_connect2($)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
# Step 3: get device list & create devices if necessary
|
# Step 3: get device list & create MQTT2_DEVICEs if necessary
|
||||||
sub
|
sub
|
||||||
Landroid_connect3($)
|
Landroid_connect3($)
|
||||||
{
|
{
|
||||||
@ -148,11 +148,11 @@ Landroid_connect3($)
|
|||||||
},
|
},
|
||||||
callback => sub(){
|
callback => sub(){
|
||||||
my ($h,$e,$d) = @_;
|
my ($h,$e,$d) = @_;
|
||||||
return Log3 $m2c, 1, "$errPrefix: $e" if($e);
|
return Log3 $m2c, 1, "$errPrefix $e" if($e);
|
||||||
return Log3 $m2c, 1, "$errPrefix: no data" if(!$d);
|
return Log3 $m2c, 1, "$errPrefix no data" if(!$d);
|
||||||
Log3 $m2c, 5, $d;
|
Log3 $m2c, 5, $d;
|
||||||
my $dl = json2nameValue($d); # DeviceList
|
my $dl = json2nameValue($d); # DeviceList
|
||||||
return Log3 $m2c, 1, "$errPrefix - no devicelist" if(!$dl);
|
return Log3 $m2c, 1, "$errPrefix no devicelist" if(!$dl);
|
||||||
Log3 $m2c, 4, "$m2c_name: Got device info";
|
Log3 $m2c, 4, "$m2c_name: Got device info";
|
||||||
my %sn;
|
my %sn;
|
||||||
for my $d (keys %defs) {
|
for my $d (keys %defs) {
|
||||||
@ -228,7 +228,7 @@ Landroid_connect4($)
|
|||||||
my $a = $attr{$m2c_name};
|
my $a = $attr{$m2c_name};
|
||||||
$a->{keepaliveTimeout} = 600;
|
$a->{keepaliveTimeout} = 600;
|
||||||
$a->{maxFailedConnects} = 1;
|
$a->{maxFailedConnects} = 1;
|
||||||
#MQTT2_CLIENT_connect($defs{$m2c_name}, 1);
|
MQTT2_CLIENT_connect($defs{$m2c_name}, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user