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

patch-offline_status_startup_undefined #73

Merged
sebastianschwarz merged 29 commits from patch-offline_status_startup_undefined into dev 2022-08-11 18:07:01 +00:00
Conversation 1 Commits 29 Files Changed 3 +1752 -1787
3 changed files with 1752 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abcccefeb4 - Show all commits

2
CHANGED
View File

@@ -1 +1 @@
Reviewed-by: Marko Oldenburg <marko@noreply@cooltux.net> cleanup code, fix start up defined string

35
FHEM/74_GardenaSmartDevice.pm
View File

@@ -1040,41 +1040,6 @@ sub setState {
} }
Log3 $name, 5, "[DEBUG] - choosed nearst: $nearst_irrigation"; Log3 $name, 5, "[DEBUG] - choosed nearst: $nearst_irrigation";
######
######
###### $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_'.$_ , 'n/a') eq '' );
######
###### # if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne ''
###### # --- wenn next_start_x ne 'na' && paused_until_x eq '' -> start_x
###### ## scheduling-schedules_paused_until_* = leer oder n/a -> keine zeitpläne
######
###### if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z' ) {
###### # $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '');
###### Log3 $name, 3, "[DEBUG] - ";
######
###### # $nearst_irrigation = RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, ''))
###### # if (
###### # Time::Piece->strptime( RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, '')), "%Y-%m-%d %H:%M") < Time::Piece->strptime( $nearst_irrigation, "%Y-%m-%d %H:%M")
###### # && $has_scheduling && Time::Piece->strptime( RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, '')), "%Y-%m-%d %H:%M") > Time::Piece->new
###### # )
###### if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') eq '' ) { # non next start, schedules paused permanently or next schedule > 1 year; get nearst paused_until
###### $nearst_irrigation = RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, ''))
###### if ( Time::Piece->strptime( RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, '')), "%Y-%m-%d %H:%M")
###### < Time::Piece->strptime( $nearst_irrigation, "%Y-%m-%d %H:%M")
###### && $has_scheduling
###### && Time::Piece->strptime( RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_, '')), "%Y-%m-%d %H:%M")
###### > Time::Piece->new
###### )
###### } else {
###### $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '');
###### }
###### } # fi
######
###### #$nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '');
###### # if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, 'n/a') ne 'n/a' );
######
} # for } # for
# override state 4 extendedstates # override state 4 extendedstates
if ( AttrVal( $name, "extendedState", 0 ) == 1) { if ( AttrVal( $name, "extendedState", 0 ) == 1) {

2
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2022-07-12_20:03:00 49634 FHEM/73_GardenaSmartBridge.pm UPD 2022-07-12_20:03:00 49634 FHEM/73_GardenaSmartBridge.pm
UPD 2022-07-19_20:20:03 71804 FHEM/74_GardenaSmartDevice.pm UPD 2022-07-20_12:15:45 73554 FHEM/74_GardenaSmartDevice.pm