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

24_TPLinkHS110.pm: Added support for HW Version 2.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16751 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
vk 2018-05-17 06:41:38 +00:00
parent 725f570447
commit 36eaadd236
1 changed files with 89 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
FHEM/24_TPLinkHS110.pm
View File

@ -38,6 +38,7 @@ use IO::Socket::Timeout;
use JSON; use JSON;
use SetExtensions; use SetExtensions;
##################################### #####################################
sub TPLinkHS110_Initialize($) sub TPLinkHS110_Initialize($)
{ {
@ -119,8 +120,21 @@ sub TPLinkHS110_Get($$)
Log3 $hash, 3, "TPLinkHS110: $name Get called. Relay state: $json->{'system'}->{'get_sysinfo'}->{'relay_state'}, RSSI: $json->{'system'}->{'get_sysinfo'}->{'rssi'}"; Log3 $hash, 3, "TPLinkHS110: $name Get called. Relay state: $json->{'system'}->{'get_sysinfo'}->{'relay_state'}, RSSI: $json->{'system'}->{'get_sysinfo'}->{'rssi'}";
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
my $hw_ver = $json->{'system'}->{'get_sysinfo'}->{'hw_ver'};
my %hwMap = hwMapping();
foreach my $key (sort keys %{$json->{'system'}->{'get_sysinfo'}}) { foreach my $key (sort keys %{$json->{'system'}->{'get_sysinfo'}}) {
readingsBulkUpdate($hash, $key, $json->{'system'}->{'get_sysinfo'}->{$key}); my $sysinfoValue = $json->{'system'}->{'get_sysinfo'}->{$key};
#adjust different hw_ver readings
if (exists($hwMap{$hw_ver}{'system'}{'get_sysinfo'}{$key})) {
if (exists($hwMap{$hw_ver}{'system'}{'get_sysinfo'}{$key}{'factor'})) {
$sysinfoValue = $sysinfoValue * $hwMap{$hw_ver}{'system'}{'get_sysinfo'}{$key}{'factor'};
}
$key = $hwMap{$hw_ver}{'system'}{'get_sysinfo'}{$key}{'name'}
}
readingsBulkUpdate($hash, $key, $sysinfoValue);
} }
if ($json->{'system'}->{'get_sysinfo'}->{'relay_state'} == 0) { if ($json->{'system'}->{'get_sysinfo'}->{'relay_state'} == 0) {
readingsBulkUpdate($hash, "state", "off"); readingsBulkUpdate($hash, "state", "off");
@ -157,10 +171,29 @@ sub TPLinkHS110_Get($$)
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
return; return;
}; };
my %emeterReadings = ();
foreach my $key2 (sort keys %{$realtimejson->{'emeter'}->{'get_realtime'}}) { foreach my $key2 (sort keys %{$realtimejson->{'emeter'}->{'get_realtime'}}) {
readingsBulkUpdate($hash, $key2, $realtimejson->{'emeter'}->{'get_realtime'}->{$key2});
my $emeterValue = $realtimejson->{'emeter'}->{'get_realtime'}->{$key2};
#adjust different hw_ver readings, be sure to list all emeter readings in hwMapping
if (exists($hwMap{$hw_ver}{'emeter'}{'get_realtime'}{$key2})) {
if (exists($hwMap{$hw_ver}{'emeter'}{'get_realtime'}{$key2}{'factor'})) {
$emeterValue = $emeterValue * $hwMap{$hw_ver}{'emeter'}{'get_realtime'}{$key2}{'factor'};
} }
Log3 $hash, 3, "TPLinkHS110: $name Device is an HS110. Got extra realtime data: $realtimejson->{'emeter'}->{'get_realtime'}->{'power'} Watt, $realtimejson->{'emeter'}->{'get_realtime'}->{'voltage'} Volt, $realtimejson->{'emeter'}->{'get_realtime'}->{'current'} Ampere"; $key2 = $hwMap{$hw_ver}{'emeter'}{'get_realtime'}{$key2}{'name'};
readingsBulkUpdate($hash, $key2, $emeterValue);
$emeterReadings{$key2} = $emeterValue;
} else {
return "Check supported hw_ver of device: $hw_ver\n";
}
}
Log3 $hash, 3, "TPLinkHS110: $name Device is an HS110. Got extra realtime data: $emeterReadings{'power'} Watt, $emeterReadings{'voltage'} Volt, $emeterReadings{'current'} Ampere";
# Get Daily Stats # Get Daily Stats
my $command = '{"emeter":{"get_daystat":{"month":'.$mon.',"year":'.$year.'}}}'; my $command = '{"emeter":{"get_daystat":{"month":'.$mon.',"year":'.$year.'}}}';
my $c = encrypt($command); my $c = encrypt($command);
@ -181,10 +214,18 @@ sub TPLinkHS110_Get($$)
my $total=0; my $total=0;
foreach my $key (sort keys @{$json->{'emeter'}->{'get_daystat'}->{'day_list'}}) { foreach my $key (sort keys @{$json->{'emeter'}->{'get_daystat'}->{'day_list'}}) {
foreach my $key2 ($json->{'emeter'}->{'get_daystat'}->{'day_list'}[$key]) { foreach my $key2 ($json->{'emeter'}->{'get_daystat'}->{'day_list'}[$key]) {
if ($hw_ver eq "1.0") {
$total = $total+ $key2->{'energy'}; $total = $total+ $key2->{'energy'};
if ($key2->{'day'} == $mday) { if ($key2->{'day'} == $mday) {
readingsBulkUpdate($hash, "daily_total", sprintf("%.3f", $key2->{'energy'})); readingsBulkUpdate($hash, "daily_total", sprintf("%.3f", $key2->{'energy'}));
} }
} else {
$total = $total+ $key2->{'energy_wh'};
if ($key2->{'day'} == $mday) {
readingsBulkUpdate($hash, "daily_total", sprintf("%.3f", $key2->{'energy_wh'}));
}
}
} }
} }
my $count=1; my $count=1;
@ -346,8 +387,8 @@ sub TPLinkHS110_Attr {
# Based on https://www.softscheck.com/en/reverse-engineering-tp-link-hs110/ # Based on https://www.softscheck.com/en/reverse-engineering-tp-link-hs110/
sub encrypt { sub encrypt {
my $key = 171; my $key = 171;
my $result = "\0\0\0\0";
my @string=split(//, $_[0]); my @string=split(//, $_[0]);
my $result = "\0\0\0".chr(@string);
foreach (@string) { foreach (@string) {
my $a = $key ^ ord($_); my $a = $key ^ ord($_);
$key = $a; $key = $a;
@ -367,6 +408,43 @@ sub decrypt {
return $result; return $result;
} }
# mapping for different hardware versions
sub hwMapping {
my %hwMap = ();
$hwMap{'1.0'}{'system'}{'get_sysinfo'}{'longitude'}{'name'} = 'longitude';
$hwMap{'1.0'}{'system'}{'get_sysinfo'}{'longitude'}{'factor'} = 1;
$hwMap{'1.0'}{'system'}{'get_sysinfo'}{'latitude'}{'name'} = 'latitude';
$hwMap{'1.0'}{'system'}{'get_sysinfo'}{'latitude'}{'factor'} = 1;
$hwMap{'2.0'}{'system'}{'get_sysinfo'}{'longitude_i'}{'name'} = 'longitude';
$hwMap{'2.0'}{'system'}{'get_sysinfo'}{'longitude_i'}{'factor'} = 0.0001;
$hwMap{'2.0'}{'system'}{'get_sysinfo'}{'latitude_i'}{'name'} = 'latitude';
$hwMap{'2.0'}{'system'}{'get_sysinfo'}{'latitude_i'}{'factor'} = 0.0001;
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'power'}{'name'} = 'power';
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'power'}{'factor'} = 1;
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'voltage'}{'name'} = 'voltage';
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'voltage'}{'factor'} = 1;
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'current'}{'name'} = 'current';
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'current'}{'factor'} = 1;
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'total'}{'name'} = 'total';
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'total'}{'factor'} = 1;
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'err_code'}{'name'} = 'err_code';
$hwMap{'1.0'}{'emeter'}{'get_realtime'}{'err_code'}{'factor'} = 1;
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'power_mw'}{'name'} = 'power';
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'power_mw'}{'factor'} = 0.001;
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'voltage_mv'}{'name'} = 'voltage';
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'voltage_mv'}{'factor'} = 0.001;
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'current_ma'}{'name'} = 'current';
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'current_ma'}{'factor'} = 0.001;
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'total_wh'}{'name'} = 'total';
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'total_wh'}{'factor'} = 0.001;
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'err_code'}{'name'} = 'err_code';
$hwMap{'2.0'}{'emeter'}{'get_realtime'}{'err_code'}{'factor'} = 1;
return %hwMap;
}
###################################################################################### ######################################################################################
1; 1;