diff --git a/CHANGED b/CHANGED index 7eead8c..41f11fe 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - [fix] - rollback + [visual] - lowercase not available diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index 23ea60f..352d20f 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -893,7 +893,7 @@ sub setState { push @ic24opened_ventils, $_ if ( ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? $_ : 0 ) > 0 ); ## find nearst timestamp #$has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z' && ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') eq '' ); - $has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z' && ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , 'n/a') eq '' ); + $has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z' && ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne 'n/a' ); #$has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , 'n/a') eq '' ); $longest_duration = ReadingsVal( $name, "watering-watering_timer_".$_."_irrigation_left", 0 ) if ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms @@ -910,8 +910,8 @@ sub setState { # ) # } # fi - $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') - if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne '' ); + $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', ''); + # if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, 'n/a') ne 'n/a' ); } # override state 4 extendedstates @@ -941,7 +941,8 @@ sub setState { : ( $has_scheduling ) # zeitplan aktiv - ? ( $nearst_irrigation eq '2038-01-18 00:00') + # ? ( $nearst_irrigation eq '2038-01-18 00:00') + ? ( $nearst_irrigation eq 'n/a') # dauerhaft pausiert ? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash , 'schedule permanently paused')) ) # naechster zeutplan diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 601ddd7..5859ea2 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ UPD 2022-06-28_13:11:16 49241 FHEM/73_GardenaSmartBridge.pm -UPD 2022-06-29_08:59:49 70492 FHEM/74_GardenaSmartDevice.pm +UPD 2022-06-29_12:23:57 70548 FHEM/74_GardenaSmartDevice.pm