dev #74

Merged
sebastianschwarz merged 126 commits from dev into testing 2022-09-06 11:31:54 +00:00
3 changed files with 7 additions and 6 deletions
Showing only changes of commit 0086f52d74 - Show all commits

View File

@ -1 +1 @@
[fix] - rollback
[visual] - lowercase not available

View File

@ -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

View File

@ -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