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

add fetch new sensor values, fix blank character in device names

Browse Source
This commit is contained in:
Marko Oldenburg 2017-08-07 13:50:26 +02:00
parent 6fd6929946
commit a7f14353a9
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
73_GardenaSmartBridge.pm
View File

@ -64,7 +64,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
###todo Hier fehlt noch Modulabfrage für ssl ###todo Hier fehlt noch Modulabfrage für ssl
my $version = "0.0.25"; my $version = "0.0.28";
@ -337,6 +337,23 @@ sub GardenaSmartBridge_ErrorHandling($$$) {
#Log3 $name, 1, "GardenaSmartBridge ($name) - Error:\n".Dumper($err); #Log3 $name, 1, "GardenaSmartBridge ($name) - Error:\n".Dumper($err);
#Log3 $name, 1, "GardenaSmartBridge ($name) - Data:\n".Dumper($data); #Log3 $name, 1, "GardenaSmartBridge ($name) - Data:\n".Dumper($data);
#### Ein Fehler der Behandelt werden muss
# '<html>
# <head>
# <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
# <title>Error 400 Bad Request</title>
# </head>
# <body><h2>HTTP ERROR 400</h2>
# <p>Problem accessing /sg-1/devices/2ad0d816-8bc3-4f0a-8c52-8b0dc8d7b2ec/abilities/watering_computer/command. Reason:
# <pre> Bad Request</pre></p><hr><i><small>Powered by Jetty://</small></i><hr/>
#
# </body>
# </html>
# ';
readingsSingleUpdate($hash,'state','connect to cloud',1) if( defined($hash->{helper}{locations_id}) ); readingsSingleUpdate($hash,'state','connect to cloud',1) if( defined($hash->{helper}{locations_id}) );
@ -412,7 +429,6 @@ sub GardenaSmartBridge_ResponseProcessing($$) {
} }
Dispatch($hash,$json,undef) Dispatch($hash,$json,undef)
#Log3 $name, 3, "GardenaSmartBridge ($name) - NAME: $decode_json->{name} und ID: $decode_json->{id} und JSON: $json"
unless( $decode_json->{category} eq 'gateway' ); unless( $decode_json->{category} eq 'gateway' );
} }

11
74_GardenaSmartDevice.pm
View File

@ -62,7 +62,7 @@ eval "use Encode qw(encode encode_utf8 decode_utf8);1" or $missingModul .= "Enco
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= "JSON ";
my $version = "0.0.25"; my $version = "0.0.28";
@ -215,7 +215,12 @@ sub GardenaSmartDevice_Set($@) {
$payload = '"name":"cancel_override"'; $payload = '"name":"cancel_override"';
} elsif( lc $cmd eq '' ) { } elsif( lc $cmd eq 'refresh' ) {
my $sensname = join( " ", @args );
$payload = '"name":"measure_ambient_temperature"' if( $sensname eq 'Temperature' );
$payload = '"name":"measure_light"' if( $sensname eq 'Light' );
$payload = '"name":"measure_humidity"' if( $sensname eq 'Humidity' );
} elsif( lc $cmd eq '' ) { } elsif( lc $cmd eq '' ) {
@ -280,7 +285,7 @@ sub GardenaSmartDevice_Parse($$) {
} else { } else {
Log3 $name, 3, "GardenaSmartDevice ($name) - autocreate new device $decode_json->{name} with deviceId $decode_json->{id}, model $decode_json->{category} and IODev IODev=$name"; Log3 $name, 3, "GardenaSmartDevice ($name) - autocreate new device $decode_json->{name} with deviceId $decode_json->{id}, model $decode_json->{category} and IODev IODev=$name";
return "UNDEFINED $decode_json->{name} GardenaSmartDevice $decode_json->{id} $decode_json->{category} IODev=$name"; return "UNDEFINED " . join(' ',$decode_json->{name}) . " GardenaSmartDevice $decode_json->{id} $decode_json->{category} IODev=$name";
} }
} }
} }