FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

74_GardenaDevice: change timer slider to minutes, little fix in bridge device

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21718 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-04-18 16:37:32 +00:00
parent 93cc09a961
commit d75a818c5e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - change: 93_Log2Syslog: improve IETF octet count, some code changes for PBP
- feature: 66_EseraOneWire: support multi sensor 11133 - feature: 66_EseraOneWire: support multi sensor 11133
- change: 59_WUup: switch to packages - change: 59_WUup: switch to packages

5
fhem/FHEM/73_GardenaSmartBridge.pm
View File

@ -63,7 +63,7 @@ use POSIX;
use FHEM::Meta; use FHEM::Meta;
use HttpUtils; use HttpUtils;
our $VERSION = '1.6.7'; our $VERSION = '1.6.8';
my $missingModul = ''; my $missingModul = '';
eval "use Encode qw(encode encode_utf8 decode_utf8);1" eval "use Encode qw(encode encode_utf8 decode_utf8);1"
@ -1126,7 +1126,8 @@ sub createHttpValueStrings($@) {
if ( $payload eq '{}' ) { if ( $payload eq '{}' ) {
$method = 'GET'; $method = 'GET';
$uri .= '/locations/?user_id=' . $hash->{helper}{user_id} $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 ) readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 )
if ( not defined( $hash->{helper}{locations_id} ) ); if ( not defined( $hash->{helper}{locations_id} ) );
$uri .= '/sessions' if ( not defined( $hash->{helper}{session_id} ) ); $uri .= '/sessions' if ( not defined( $hash->{helper}{session_id} ) );

10
fhem/FHEM/74_GardenaSmartDevice.pm
View File

@ -66,7 +66,7 @@ use warnings;
use POSIX; use POSIX;
use FHEM::Meta; use FHEM::Meta;
use Time::Local; use Time::Local;
our $VERSION = '1.6.6'; our $VERSION = '1.6.7';
# try to use JSON::MaybeXS wrapper # try to use JSON::MaybeXS wrapper
# for chance of better performance + open code # for chance of better performance + open code
@ -316,7 +316,7 @@ sub Set($@) {
my $duration = join( " ", @args ); my $duration = join( " ", @args );
$payload = '"name":"start_override_timer","parameters":{"duration":' $payload = '"name":"start_override_timer","parameters":{"duration":'
. $duration . '}'; . $duration * 60 . '}';
} }
elsif ( lc $cmd eq 'startpoint' ) { elsif ( lc $cmd eq 'startpoint' ) {
@ -368,7 +368,7 @@ sub Set($@) {
'"properties":{"name":"watering_timer_' '"properties":{"name":"watering_timer_'
. $valve_id . $valve_id
. '","value":{"state":"manual","duration":' . '","value":{"state":"manual","duration":'
. $duration . $duration * 60
. ',"valve_id":' . ',"valve_id":'
. $valve_id . '}}'; . $valve_id . '}}';
} }
@ -396,7 +396,7 @@ sub Set($@) {
my $list = ''; my $list = '';
$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' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
$list .= 'manualOverride:slider,0,1,59 cancelOverride:noArg' $list .= 'manualOverride:slider,0,1,59 cancelOverride:noArg'
@ -680,7 +680,7 @@ sub ReadingLangGerman($$) {
'paused' => 'pausiert', 'paused' => 'pausiert',
'ok_searching' => 'suche Ladestation', 'ok_searching' => 'suche Ladestation',
'ok_charging' => 'lädt', 'ok_charging' => 'lädt',
'ok_leaving' => 'mähen', 'ok_leaving' => 'unterwegs zum Startpunkt',
'wait_updating' => 'wird aktualisiert ...', 'wait_updating' => 'wird aktualisiert ...',
'wait_power_up' => 'wird eingeschaltet ...', 'wait_power_up' => 'wird eingeschaltet ...',
'parked_timer' => 'geparkt nach Zeitplan', 'parked_timer' => 'geparkt nach Zeitplan',