FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

fix get humidity bug, add rename Fn

Browse Source
This commit is contained in:
Marko Oldenburg
2018-08-23 22:12:59 +02:00
parent bcf8444225
commit cb5352ddcb
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
73_GardenaSmartBridge.pm
View File

@@ -70,7 +70,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
eval "use IO::Socket::SSL;1" or $missingModul .= "IO::Socket::SSL "; eval "use IO::Socket::SSL;1" or $missingModul .= "IO::Socket::SSL ";
my $version = "1.2.0"; my $version = "1.2.2";
@@ -85,8 +85,6 @@ sub GardenaSmartBridge_Undef($$);
sub GardenaSmartBridge_Delete($$); sub GardenaSmartBridge_Delete($$);
sub GardenaSmartBridge_ResponseProcessing($$); sub GardenaSmartBridge_ResponseProcessing($$);
sub GardenaSmartBridge_ErrorHandling($$$); sub GardenaSmartBridge_ErrorHandling($$$);
#sub GardenaSmartBridge_encrypt($);
#sub GardenaSmartBridge_decrypt($);
sub GardenaSmartBridge_WriteReadings($$); sub GardenaSmartBridge_WriteReadings($$);
sub GardenaSmartBridge_ParseJSON($$); sub GardenaSmartBridge_ParseJSON($$);
sub GardenaSmartBridge_getDevices($); sub GardenaSmartBridge_getDevices($);
@@ -96,6 +94,7 @@ sub GardenaSmartBridge_Notify($$);
sub GardenaSmartBridge_StorePassword($$); sub GardenaSmartBridge_StorePassword($$);
sub GardenaSmartBridge_ReadPassword($); sub GardenaSmartBridge_ReadPassword($);
sub GardenaSmartBridge_DeletePassword($); sub GardenaSmartBridge_DeletePassword($);
sub GardenaSmartBridge_Rename(@);
@@ -116,6 +115,7 @@ sub GardenaSmartBridge_Initialize($) {
$hash->{DefFn} = "GardenaSmartBridge_Define"; $hash->{DefFn} = "GardenaSmartBridge_Define";
$hash->{UndefFn} = "GardenaSmartBridge_Undef"; $hash->{UndefFn} = "GardenaSmartBridge_Undef";
$hash->{DeleteFn} = "GardenaSmartBridge_Delete"; $hash->{DeleteFn} = "GardenaSmartBridge_Delete";
$hash->{RenameFn} = "GardenaSmartBridge_Rename";
$hash->{NotifyFn} = "GardenaSmartBridge_Notify"; $hash->{NotifyFn} = "GardenaSmartBridge_Notify";
$hash->{AttrFn} = "GardenaSmartBridge_Attr"; $hash->{AttrFn} = "GardenaSmartBridge_Attr";
@@ -420,7 +420,7 @@ sub GardenaSmartBridge_ErrorHandling($$$) {
} elsif( $param->{code} == 204 and $dhash ne $hash and defined($dhash->{helper}{deviceAction}) ) { } elsif( $param->{code} == 204 and $dhash ne $hash and defined($dhash->{helper}{deviceAction}) ) {
readingsBulkUpdate( $dhash, "state", "the command is processed", 1); readingsBulkUpdate( $dhash, "state", "the command is processed", 1);
InternalTimer( gettimeofday()+3,"GardenaSmartBridge_getDevices", $hash, 1 ); InternalTimer( gettimeofday()+5,"GardenaSmartBridge_getDevices", $hash, 1 );
} elsif( $param->{code} != 200 ) { } elsif( $param->{code} != 200 ) {
@@ -714,6 +714,18 @@ sub GardenaSmartBridge_ReadPassword($) {
} }
} }
sub GardenaSmartBridge_Rename(@) {
my ($new,$old) = @_;
my $hash = $defs{$new};
GardenaSmartBridge_StorePassword($hash,GardenaSmartBridge_ReadPassword($hash));
setKeyValue($hash->{TYPE}."_".$old."_passwd",undef);
return undef;
}
sub GardenaSmartBridge_ParseJSON($$) { sub GardenaSmartBridge_ParseJSON($$) {
my ($hash, $buffer) = @_; my ($hash, $buffer) = @_;

4
74_GardenaSmartDevice.pm
View File

@@ -67,7 +67,7 @@ use Time::Local;
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= "JSON ";
my $version = "1.2.0"; my $version = "1.2.2";
@@ -253,7 +253,7 @@ sub GardenaSmartDevice_Set($@) {
$abilities = 'light'; $abilities = 'light';
} elsif( lc $sensname eq 'humidity' ) { } elsif( lc $sensname eq 'humidity' ) {
$payload = '"name":"measure_humidity"'; $payload = '"name":"measure_soil_humidity"';
$abilities = 'humidity'; $abilities = 'humidity';
} }