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

49_Arlo.pm: fixed updateReadings, added model reading

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18889 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
maluk 2019-03-13 18:12:33 +00:00
parent 3c18cf9b8f
commit ac14607f3e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FHEM/49_Arlo.pm
View File

@ -465,16 +465,18 @@ sub Arlo_CreateDevices($) {
Arlo_Request($hash, '/users/devices', 'GET', undef, undef, \&Arlo_CreateDevicesCallback); Arlo_Request($hash, '/users/devices', 'GET', undef, undef, \&Arlo_CreateDevicesCallback);
} }
sub Arlo_CreateDevice($$$$$$;$) { sub Arlo_CreateDevice($$$$$$$;$) {
my ($hash, $deviceType, $prefix, $deviceName, $serialNumber, $xCloudId, $basestationSerialNumber) = @_; my ($hash, $deviceType, $prefix, $deviceName, $serialNumber, $xCloudId, $model, $basestationSerialNumber) = @_;
my $d = $modules{$MODULE}{defptr}{"$prefix$serialNumber"}; my $d = $modules{$MODULE}{defptr}{"$prefix$serialNumber"};
if (!defined($d)) { if (!defined($d)) {
if (defined($basestationSerialNumber)) { if (defined($basestationSerialNumber)) {
CommandDefine(undef,"Arlo_$deviceName Arlo $deviceType $basestationSerialNumber $serialNumber $xCloudId"); CommandDefine(undef, "Arlo_$deviceName Arlo $deviceType $basestationSerialNumber $serialNumber $xCloudId");
} else { } else {
CommandDefine(undef,"Arlo_$deviceName Arlo $deviceType $serialNumber $xCloudId"); CommandDefine(undef, "Arlo_$deviceName Arlo $deviceType $serialNumber $xCloudId");
} }
$d = $modules{$MODULE}{defptr}{"$prefix$serialNumber"};
} }
readingsSingleUpdate($d, 'model', $model, 0) if (defined($d));
} }
sub Arlo_GetNameWithoutUmlaut($) { sub Arlo_GetNameWithoutUmlaut($) {
@ -496,22 +498,23 @@ sub Arlo_CreateDevicesCallback($$$) {
$deviceName = Arlo_GetNameWithoutUmlaut($deviceName); $deviceName = Arlo_GetNameWithoutUmlaut($deviceName);
my $deviceType = $device->{deviceType}; my $deviceType = $device->{deviceType};
my $xCloudId = $device->{xCloudId}; my $xCloudId = $device->{xCloudId};
my $model = $device->{modelId};
Log3 $hash->{NAME}, 3, "Found device $deviceType with name $deviceName."; Log3 $hash->{NAME}, 3, "Found device $deviceType with name $deviceName.";
if ($deviceType eq 'basestation') { if ($deviceType eq 'basestation') {
Arlo_CreateDevice($hash, 'BASESTATION', 'B', $deviceName, $serialNumber, $xCloudId); Arlo_CreateDevice($hash, 'BASESTATION', 'B', $deviceName, $serialNumber, $xCloudId, $model);
} elsif ($deviceType eq 'arlobridge') { } elsif ($deviceType eq 'arlobridge') {
Arlo_CreateDevice($hash, 'BRIDGE', 'B', $deviceName, $serialNumber, $xCloudId); Arlo_CreateDevice($hash, 'BRIDGE', 'B', $deviceName, $serialNumber, $xCloudId, $model);
} elsif ($deviceType eq 'camera') { } elsif ($deviceType eq 'camera') {
my $parentId = $device->{parentId}; my $parentId = $device->{parentId};
if ($serialNumber ne $parentId) { if ($serialNumber ne $parentId) {
Arlo_CreateDevice($hash, 'CAMERA', 'C', $deviceName, $serialNumber, $xCloudId, $parentId); Arlo_CreateDevice($hash, 'CAMERA', 'C', $deviceName, $serialNumber, $xCloudId, $model, $parentId);
} else { } else {
Arlo_CreateDevice($hash, 'BABYCAM', 'B', $deviceName, $serialNumber, $xCloudId); Arlo_CreateDevice($hash, 'BABYCAM', 'B', $deviceName, $serialNumber, $xCloudId, $model);
} }
} elsif ($deviceType eq 'arloq') { } elsif ($deviceType eq 'arloq') {
Arlo_CreateDevice($hash, 'ARLOQ', 'B', $deviceName, $serialNumber, $xCloudId); Arlo_CreateDevice($hash, 'ARLOQ', 'B', $deviceName, $serialNumber, $xCloudId, $model);
} elsif ($deviceType eq 'lights') { } elsif ($deviceType eq 'lights') {
Arlo_CreateDevice($hash, 'LIGHT', 'L', $deviceName, $serialNumber, $xCloudId, $device->{parentId}); Arlo_CreateDevice($hash, 'LIGHT', 'L', $deviceName, $serialNumber, $xCloudId, $model, $device->{parentId});
} }
} }
} }
@ -608,7 +611,7 @@ sub Arlo_ReadCamerasAndLights($) {
my $lights = {action => 'get', resource => 'lights', publishResponse => \0}; my $lights = {action => 'get', resource => 'lights', publishResponse => \0};
Arlo_PreparePostRequest($hash, $lights); Arlo_PreparePostRequest($hash, $lights);
my @body = ($cam, $lights); my @body = ($cam, $lights);
if ($hash->{basestationSerialNumber} eq $hash->{serialNumber}) { if (defined($hash->{basestationSerialNumber}) && $hash->{basestationSerialNumber} eq $hash->{serialNumber}) {
my $mode = {action => 'get', resource => 'modes', publishResponse => \0}; my $mode = {action => 'get', resource => 'modes', publishResponse => \0};
my ($account, $deviceId, $xCloudId) = Arlo_PreparePostRequest($hash, $mode); my ($account, $deviceId, $xCloudId) = Arlo_PreparePostRequest($hash, $mode);
push @body, $mode; push @body, $mode;