diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index 79ab0d9..12363aa 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -2,7 +2,7 @@ # # Developed with Kate # -# (c) 2017-2011 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) +# (c) 2017-2021 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # All rights reserved # # Special thanks goes to comitters: @@ -57,7 +57,6 @@ package FHEM::GardenaSmartBridge; use GPUtils qw(GP_Import GP_Export); -#use Data::Dumper; #only for Debugging use strict; use warnings; @@ -70,7 +69,7 @@ my $missingModul = ''; eval "use Encode qw(encode encode_utf8 decode_utf8);1" or $missingModul .= "Encode "; -# eval "use JSON;1" || $missingModul .= 'JSON '; +# eval "use JSON;1" || $missingModul .= 'JSON '; eval "use IO::Socket::SSL;1" or $missingModul .= 'IO::Socket::SSL '; # try to use JSON::MaybeXS wrapper @@ -147,7 +146,6 @@ if ($@) { ## Import der FHEM Funktionen #-- Run before package compilation BEGIN { - # Import from main context GP_Import( qw(readingsSingleUpdate @@ -183,7 +181,7 @@ BEGIN { #-- Export to main context with different name GP_Export( qw( - Initialize + Initialize ) ); @@ -1219,7 +1217,7 @@ sub createHttpValueStrings { $uri = '/auth/token' if ( !defined( $hash->{helper}{session_id} ) ); if ( defined( $hash->{helper}{locations_id} ) ) { - if ( defined($abilities) && $abilities eq 'mower_settings' ) { + if ( defined($abilities) && $abilities =~ /.*_settings/ ) { $method = 'PUT'; my $dhash = $modules{GardenaSmartDevice}{defptr}{$deviceId}; @@ -1231,7 +1229,7 @@ sub createHttpValueStrings { . $service_id if ( defined($abilities) && defined($payload) - && $abilities eq 'mower_settings' ); + && $abilities =~ /.*_settings/ ); } # park until next schedules or override elsif (defined($abilities) @@ -1254,9 +1252,9 @@ sub createHttpValueStrings { && $abilities eq 'watering' ) { my $valve_id; - $method = 'PUT'; if ( $payload =~ m#watering_timer_(\d)# ) { + $method = 'PUT'; $valve_id = $1; } $uri .= @@ -1264,8 +1262,7 @@ sub createHttpValueStrings { . $deviceId . '/abilities/' . $abilities - . '/properties/watering_timer_' - . $valve_id; + . ( defined($valve_id) ? '/properties/watering_timer_'. $valve_id : '/command') } elsif (defined($abilities) @@ -1442,7 +1439,7 @@ sub DeletePassword { @@ -1466,7 +1463,7 @@ sub DeletePassword { ], "release_status": "stable", "license": "GPL_2", - "version": "v2.2.2", + "version": "v2.4.0", "author": [ "Marko Oldenburg " ], diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index c3195e4..d56d9a9 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -63,8 +63,8 @@ use warnings; use POSIX; use FHEM::Meta; use Time::Local; - -#use Data::Dumper; # only for debugging +use Time::Piece; +use Time::Seconds; # try to use JSON::MaybeXS wrapper # for chance of better performance + open code @@ -164,7 +164,7 @@ BEGIN { #-- Export to main context with different name GP_Export( qw( - Initialize + Initialize ) ); @@ -209,6 +209,13 @@ sub Define { $hash->{helper}{STARTINGPOINTID} = ''; $hash->{helper}{schedules_paused_until_id} = ''; $hash->{helper}{eco_mode_id} = ''; + # IrrigationControl valve control max 6 + $hash->{helper}{schedules_paused_until_1_id} = ''; + $hash->{helper}{schedules_paused_until_2_id} = ''; + $hash->{helper}{schedules_paused_until_3_id} = ''; + $hash->{helper}{schedules_paused_until_4_id} = ''; + $hash->{helper}{schedules_paused_until_5_id} = ''; + $hash->{helper}{schedules_paused_until_6_id} = ''; CommandAttr( undef, "$name IODev $modules{GardenaSmartBridge}{defptr}{BRIDGE}->{NAME}" ) @@ -282,6 +289,18 @@ sub Set { my $abilities; my $service_id; my $mainboard_version = ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 ); + + #set default abilitie ... overwrite in cmd to change + $abilities = 'mower' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); + $abilities = 'watering' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' + || AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); + $abilities = 'power' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); + $abilities = 'manual_watering' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ); + ### mower # service_id (eco, parkuntilfurhternotice, startpoints) if ( lc $cmd eq 'parkuntilfurthernotice' ) { @@ -383,14 +402,35 @@ sub Set { . ',"valve_id":' . $valve_id . '}}'; } + elsif ( $cmd eq 'closeAllValves' ){ + $payload = '"name":"close_all_valves","parameters":{}'; + } + elsif ( $cmd =~ /.*ScheduleValve/ ){ + my $valve_id = $aArg->[0]; + my $duration = (( defined($aArg->[1]) ? ( ((Time::Piece->new)+(ONE_HOUR * $aArg->[1]) - (Time::Piece->new)->tzoffset )->datetime ).'.000Z' : '2040-12-31T22:00:00.000Z')); + + $abilities = 'irrigation_settings'; + $service_id = $hash->{helper}->{'schedules_paused_until_'.$valve_id.'_id'}; + $payload = '"settings":{"name":"schedules_paused_until_' + . $valve_id + . '", "value":"' + . ($cmd eq 'resumeScheduleValve' ? '' : $duration ) + . '","device":"' + . $hash->{DEVICEID} + . '"}'; + } ### Sensors elsif ( lc $cmd eq 'refresh' ) { my $sensname = $aArg->[0]; if ( lc $sensname eq 'temperature' ) { - $payload = '"name":"measure_ambient_temperature"'; - $abilities = 'ambient_temperature'; - + if ( ReadingsVal( $name, 'device_info-category', 'sensor' ) eq 'sensor') { + $payload = '"name":"measure_ambient_temperature"'; + $abilities = 'ambient_temperature'; + } else { + $payload = '"name":"measure_soil_temperature"'; + $abilities = 'soil_temperature'; + } } elsif ( lc $sensname eq 'light' ) { $payload = '"name":"measure_light"'; @@ -401,6 +441,7 @@ sub Set { $payload = '"name":"measure_soil_humidity"'; $abilities = 'humidity'; } + } else { @@ -408,35 +449,28 @@ sub Set { my $list = ''; $list .= -'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,60 startpoint' +'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,240 startpoint' if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); $list .= 'manualOverride:slider,1,1,59 cancelOverride:noArg' if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); $list .= -'manualDurationValve1:slider,1,1,59 manualDurationValve2:slider,1,1,59 manualDurationValve3:slider,1,1,59 manualDurationValve4:slider,1,1,59 manualDurationValve5:slider,1,1,59 manualDurationValve6:slider,1,1,59 cancelOverrideValve1:noArg cancelOverrideValve2:noArg cancelOverrideValve3:noArg cancelOverrideValve4:noArg cancelOverrideValve5:noArg cancelOverrideValve6:noArg' +'closeAllValves:noArg stopScheduleValve:selectnumbers,1,1,6,0,lin resumeScheduleValve:selectnumbers,1,1,6,0,lin manualDurationValve1:slider,1,1,90 manualDurationValve2:slider,1,1,90 manualDurationValve3:slider,1,1,90 manualDurationValve4:slider,1,1,90 manualDurationValve5:slider,1,1,90 manualDurationValve6:slider,1,1,90 cancelOverrideValve1:noArg cancelOverrideValve2:noArg cancelOverrideValve3:noArg cancelOverrideValve4:noArg cancelOverrideValve5:noArg cancelOverrideValve6:noArg' if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); - $list .= 'refresh:temperature,light,humidity' + $list .= 'refresh:temperature,humidity' if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); + # add light for old sensors + $list .= ',light' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' + && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor' ); $list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60' if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); return "Unknown argument $cmd, choose one of $list"; } - - $abilities = 'mower' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ) - && ($abilities !~ /mower_settings|mower_timer/); - $abilities = 'watering' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' - || AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); - $abilities = 'power' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); - $abilities = 'manual_watering' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ); $hash->{helper}{deviceAction} = $payload; readingsSingleUpdate( $hash, "state", "send command to gardena cloud", 1 ); @@ -536,7 +570,7 @@ sub WriteReadings { . $propertie->{name} ne 'light-light' && ref( $propertie->{value} ) ne "HASH" ); - readingsBulkUpdate( + readingsBulkUpdateIfChanged( $hash, $decode_json->{abilities}[$abilities]{name} . '-' . $propertie->{name}, @@ -605,7 +639,8 @@ sub WriteReadings { #Log3 $name, 1, " - IST ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY"); if ( exists($decode_json->{settings}[$settings]{name}) - && ( $decode_json->{settings}[$settings]{name} eq 'schedules_paused_until' + && ( + $decode_json->{settings}[$settings]{name} =~ /schedules_paused_until_?\d?$/ || $decode_json->{settings}[$settings]{name} eq 'eco_mode' ) ) { @@ -648,8 +683,13 @@ sub WriteReadings { $settings--; } while ( $settings >= 0 ); + + my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown'); + readingsBulkUpdate( $hash, 'state', - ReadingsVal( $name, 'mower-status', 'readingsValError' ) ) + $online_state eq 'online' ? + ReadingsVal( $name, 'mower-status', 'readingsValError') : 'offline' + ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); readingsBulkUpdate( $hash, 'state', @@ -661,16 +701,19 @@ sub WriteReadings { ) ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); - readingsBulkUpdate( - $hash, 'state', - 'T: ' - . ReadingsVal( $name, 'ambient_temperature-temperature', - 'readingsValError' ) - . '°C, H: ' - . ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) - . '%, L: ' - . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' - ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); + + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) { + my $state_string = ( ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor') ? 'T: ' .ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ) . '°C, ' : 'T: ' .ReadingsVal( $name, 'soil_temperature-temperature', 'readingsValError' ) . '°C, ' ; + $state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%'; + $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + + # if ( $online_state eq 'offline') { + # readingsBulkUpdate( $hash, 'humidity-humidity', '-1' ); + # readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + # readingsBulkUpdate( $hash, 'light-light', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + # } + readingsBulkUpdate($hash, 'state', $online_state eq 'online' ? $state_string : 'offline' ) + } readingsBulkUpdate( $hash, 'state', @@ -1091,6 +1134,10 @@ sub SetPredefinedStartPoints {
  • set NAME startpoint enable 1
  • set NAME startpoint disable 3 enable 1
    • + +
  • resumeScheduleValve - start schedule irrigation on valve n
    • +
  • stopScheduleValve - stop schedule irrigation on valve n (Default: 2040-12-31T22:00:00.000Z) | optional params hours (now + hours)
    • +
  • closeAllValves - close all valves
    • @@ -1235,6 +1282,9 @@ sub SetPredefinedStartPoints {
  • set NAME startpoint enable 1
  • set NAME startpoint disable 3 enable 1
    • +
  • resumeScheduleValve - Startet Bew&aauml;sserung am Ventil n nach Zeitplan
    • +
  • stopScheduleValve - Setzt Bew&aauml;sserung am Ventil n aus (Default: 2040-12-31T22:00:00.000Z) | Optionaler Parameter Stunden (Jetzt + Stunden)
    • +
  • closeAllValves - Stopt Bew&aauml;sserung an allen Ventilen
    • @@ -1257,7 +1307,7 @@ sub SetPredefinedStartPoints { ], "release_status": "stable", "license": "GPL_2", - "version": "v2.2.3", + "version": "v2.4.0", "author": [ "Marko Oldenburg " ], diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 25cc020..be231a5 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2021-04-22_18:29:35 46169 FHEM/73_GardenaSmartBridge.pm -UPD 2021-04-26_21:37:06 48421 FHEM/74_GardenaSmartDevice.pm +UPD 2021-05-22_04:53:56 46135 FHEM/73_GardenaSmartBridge.pm +UPD 2021-05-22_04:54:14 51644 FHEM/74_GardenaSmartDevice.pm