From 0beab4ec1d5a4a98feac366fa5f34e1cfb7f24f3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 3 May 2022 22:18:54 +0200 Subject: [PATCH] erste teste --- CHANGED | 2 +- FHEM/74_GardenaSmartDevice.pm | 43 +++++++++++++++++++++++++++------ controls_GardenaSmartDevice.txt | 4 +-- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/CHANGED b/CHANGED index 647155e..03d37c8 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - Reviewed-on: https://git.cooltux.net/FHEM/mod-GardenaSmart/pulls/53 + initial diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index a0b9b6d..66d988d 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -165,7 +165,7 @@ sub Initialize { $hash->{AttrFn} = \&Attr; $hash->{AttrList} = "readingValueLanguage:de,en " - . "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump " + . "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump" . "IODev " . $readingFnAttributes; $hash->{parseParams} = 1; @@ -294,7 +294,7 @@ sub Set { || AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); $abilities = 'power' if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); - $abilities = 'manual_watering' + $abilities = 'watering' if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ); ### mower @@ -355,11 +355,11 @@ sub Set { #$abilities['service_id'] = $hash->{helper}{SCHEDULESID} if ( $mainboard_version > 10.30 ); } ### electronic_pressure_pump - elsif ( lc $cmd eq 'pumptimer' ) { - $payload = - '"name":"pump_manual_watering_timer","parameters":{"duration":' - . $aArg->[0] . '}'; - } + # elsif ( lc $cmd eq 'pumptimer' ) { + # $payload = + # '"name":"pump_manual_watering_timer","parameters":{"duration":' + # . $aArg->[0] . '}'; + # } ### watering_computer & electronic pump elsif ( lc $cmd eq 'manualoverride' ) { $payload = @@ -477,7 +477,32 @@ sub Set { . '","device":"' . $hash->{DEVICEID} . '"}'; } - ### Sensors + ### Watering_pressure_pump + elsif ( lc $cmd eq 'operatingmode') { + my $op_mode = $aArg->[0]; + $payload = '"name":"operating_mode"' + .'"value":"'.$op_mode.'"' + .'"device":"' + . $hash->{DEVICEID}; + $abilities = 'watering_pressure_pump_settings'; + } + elsif ( lc $cmd eq 'leakagedetection') { + my $leakdetection_mode = $aArg->[0]; + $payload = '"name":"leakage_detection"' + .'"value":"'.$leakdetection_mode.'"' + .'"device":"' + . $hash->{DEVICEID}; + $abilities = 'watering_pressure_pump_settings'; + } + elsif ( lc $cmd eq 'turnonpressure') { + my $turnonpressure = $aArg->[0]; + $payload = '"name":"turn_on_pressure"' + .'"value":"'.$turnonpressure.'"' + .'"device":"' + . $hash->{DEVICEID}; + $abilities = 'watering_pressure_pump_settings'; + } + ### Sensors elsif ( lc $cmd eq 'refresh' ) { my $sensname = $aArg->[0]; @@ -529,6 +554,8 @@ sub Set { '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 .= 'manualOverride:slider,1,1,59 cancelOverride:noArg operatingMode:automatic,scheduled leakageDetection:watering,washing_machine,domestic_water_supply,off turnOnpressure:slider,2,0.2,2.8,1' + $list .= 'refresh:temperature,humidity' if ( AttrVal( $name, 'model', 'unknown' ) =~ /sensor.?/ ); diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 49359e4..3fabbdb 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2022-05-01_09:58:36 49520 FHEM/73_GardenaSmartBridge.pm -UPD 2022-05-01_09:58:54 61296 FHEM/74_GardenaSmartDevice.pm +UPD 2022-05-03_21:47:05 49520 FHEM/73_GardenaSmartBridge.pm +UPD 2022-05-03_22:18:24 62448 FHEM/74_GardenaSmartDevice.pm