FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

patch_ic24 #69

Merged
marko merged 88 commits from patch_ic24 into dev 2022-07-12 17:35:25 +00:00
Conversation 4 Commits 88 Files Changed 4 +7 -6
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0086f52d74 - Show all commits

2
CHANGED
View File

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

9
FHEM/74_GardenaSmartDevice.pm
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 ); push @ic24opened_ventils, $_ if ( ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? $_ : 0 ) > 0 );
## find nearst timestamp ## 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_'.$_ , '') 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 '' ); #$has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , 'n/a') eq '' );
$longest_duration = ReadingsVal( $name, "watering-watering_timer_".$_."_irrigation_left", 0 ) if ( $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 ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms
@@ -910,8 +910,8 @@ sub setState {
# ) # )
# } # fi # } # fi
$nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '');
if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne '' ); # if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, 'n/a') ne 'n/a' );
} }
# override state 4 extendedstates # override state 4 extendedstates
@@ -941,7 +941,8 @@ sub setState {
: :
( $has_scheduling ) ( $has_scheduling )
# zeitplan aktiv # 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 # dauerhaft pausiert
? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash , 'schedule permanently paused')) ) ? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash , 'schedule permanently paused')) )
# naechster zeutplan # naechster zeutplan

2
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2022-06-28_13:11:16 49241 FHEM/73_GardenaSmartBridge.pm 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