From 9e389681f0bd325009a1dcdca2882a9a8251d6d0 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 8 Jul 2022 12:48:51 +0200 Subject: [PATCH] [fix] - scheduled --- CHANGED | 2 +- FHEM/74_GardenaSmartDevice.pm | 6 +++--- controls_GardenaSmartDevice.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGED b/CHANGED index e4fe25a..e28c7d9 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - fix + [fix] - ifcondition schedules events diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index f01f9ac..bd1e05a 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -985,7 +985,7 @@ sub setState { } else { $state_string .= RigReadingsValue($hash, 'closed'); } - $state_string .= ($has_scheduling) ? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', ''))) : sprintf( RigReadingsValue($hash, 'paused until %s') , $nearst_irrigation); + $state_string .= ($has_schedule) ? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', ''))) : sprintf( RigReadingsValue($hash, 'paused until %s') , $nearst_irrigation); #TODO: Write state format for ventil 1-@valces_connected -> map ? CommandAttr( undef, $name . ' stateFormat { @@ -994,13 +994,13 @@ sub setState { ' ) if ( AttrVal( $name, 'stateFormat', 'none' ) eq 'none' ); } else { - Log3 $name, 3, "[DEBUG] - Offene Ventile :".scalar(@opened_valves)." laengste bewaesserung: $longest_duration . hat Zeitplan: $has_scheduling Naechster Zeitplan: $nearst_irrigation"; + Log3 $name, 3, "[DEBUG] - Offene Ventile :".scalar(@opened_valves)." laengste bewaesserung: $longest_duration . hat Zeitplan: $has_schedule Naechster Zeitplan: $nearst_irrigation"; $state_string = scalar(@opened_valves) > 0 # offen ? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.')), $longest_duration/60) # zu : - ( $has_scheduling ) + ( $has_schedule ) # zeitplan aktiv # ? ( $nearst_irrigation eq '2038-01-18 00:00') ? ( $nearst_irrigation eq RigReadingsValue( $hash, 'n/a') || $nearst_irrigation eq '2038-01-18 00:00') diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index a4f2ca8..9073ed0 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ UPD 2022-07-01_16:13:02 49241 FHEM/73_GardenaSmartBridge.pm -UPD 2022-07-08_12:47:27 74189 FHEM/74_GardenaSmartDevice.pm +UPD 2022-07-08_12:48:38 74183 FHEM/74_GardenaSmartDevice.pm