From d75a818c5e79cf5dbc3a1c1952d5bdf3a3a42bab Mon Sep 17 00:00:00 2001
From: LeonGaultier <LeonGaultier@users.noreply.github.com>
Date: Sat, 18 Apr 2020 16:37:32 +0000
Subject: [PATCH] 74_GardenaDevice: change timer slider to minutes, little fix
 in bridge device

git-svn-id: https://svn.fhem.de/fhem/trunk@21718 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                       |  2 ++
 fhem/FHEM/73_GardenaSmartBridge.pm |  5 +++--
 fhem/FHEM/74_GardenaSmartDevice.pm | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index ca7650980..2c2a5bf5b 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,7 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - change:  74_GardenaDevice: change timer slider to minutes,
+                              little fix in bridge device
  - change:  93_Log2Syslog: improve IETF octet count, some code changes for PBP
  - feature: 66_EseraOneWire: support multi sensor 11133
  - change:  59_WUup: switch to packages
diff --git a/fhem/FHEM/73_GardenaSmartBridge.pm b/fhem/FHEM/73_GardenaSmartBridge.pm
index 7b9fa9800..4fb61fb25 100644
--- a/fhem/FHEM/73_GardenaSmartBridge.pm
+++ b/fhem/FHEM/73_GardenaSmartBridge.pm
@@ -63,7 +63,7 @@ use POSIX;
 use FHEM::Meta;
 
 use HttpUtils;
-our $VERSION = '1.6.7';
+our $VERSION = '1.6.8';
 
 my $missingModul = '';
 eval "use Encode qw(encode encode_utf8 decode_utf8);1"
@@ -1126,7 +1126,8 @@ sub createHttpValueStrings($@) {
     if ( $payload eq '{}' ) {
         $method = 'GET';
         $uri .= '/locations/?user_id=' . $hash->{helper}{user_id}
-          if ( not defined( $hash->{helper}{locations_id} ) );
+          if (  exists($hash->{helper}{user_id})
+            and not defined( $hash->{helper}{locations_id} ) );
         readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 )
           if ( not defined( $hash->{helper}{locations_id} ) );
         $uri .= '/sessions' if ( not defined( $hash->{helper}{session_id} ) );
diff --git a/fhem/FHEM/74_GardenaSmartDevice.pm b/fhem/FHEM/74_GardenaSmartDevice.pm
index e234b3d5c..1a993cc0a 100644
--- a/fhem/FHEM/74_GardenaSmartDevice.pm
+++ b/fhem/FHEM/74_GardenaSmartDevice.pm
@@ -66,7 +66,7 @@ use warnings;
 use POSIX;
 use FHEM::Meta;
 use Time::Local;
-our $VERSION = '1.6.6';
+our $VERSION = '1.6.7';
 
 # try to use JSON::MaybeXS wrapper
 #   for chance of better performance + open code
@@ -316,7 +316,7 @@ sub Set($@) {
 
         my $duration = join( " ", @args );
         $payload = '"name":"start_override_timer","parameters":{"duration":'
-          . $duration . '}';
+          . $duration * 60 . '}';
 
     }
     elsif ( lc $cmd eq 'startpoint' ) {
@@ -368,7 +368,7 @@ sub Set($@) {
             '"properties":{"name":"watering_timer_'
           . $valve_id
           . '","value":{"state":"manual","duration":'
-          . $duration
+          . $duration * 60
           . ',"valve_id":'
           . $valve_id . '}}';
     }
@@ -396,7 +396,7 @@ sub Set($@) {
 
         my $list = '';
         $list .=
-'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,60,1440 startpoint'
+'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,60 startpoint'
           if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
 
         $list .= 'manualOverride:slider,0,1,59 cancelOverride:noArg'
@@ -680,7 +680,7 @@ sub ReadingLangGerman($$) {
         'paused'               => 'pausiert',
         'ok_searching'         => 'suche Ladestation',
         'ok_charging'          => 'lädt',
-        'ok_leaving'           => 'mähen',
+        'ok_leaving'           => 'unterwegs zum Startpunkt',
         'wait_updating'        => 'wird aktualisiert ...',
         'wait_power_up'        => 'wird eingeschaltet ...',
         'parked_timer'         => 'geparkt nach Zeitplan',