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

testing #80

Merged
marko merged 137 commits from testing into main 2022-12-22 07:04:47 +00:00
Conversation 0 Commits 137 Files Changed 4 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e389681f0 - Show all commits

2
CHANGED
View File

@ -1 +1 @@
fix [fix] - ifcondition schedules events

6
FHEM/74_GardenaSmartDevice.pm
View File

@ -985,7 +985,7 @@ sub setState {
} else { } else {
$state_string .= RigReadingsValue($hash, 'closed'); $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 ? #TODO: Write state format for ventil 1-@valces_connected -> map ?
CommandAttr( undef, $name . ' stateFormat CommandAttr( undef, $name . ' stateFormat
{ {
@ -994,13 +994,13 @@ sub setState {
' ) ' )
if ( AttrVal( $name, 'stateFormat', 'none' ) eq 'none' ); if ( AttrVal( $name, 'stateFormat', 'none' ) eq 'none' );
} else { } 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 $state_string = scalar(@opened_valves) > 0
# offen # offen
? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.')), $longest_duration/60) ? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.')), $longest_duration/60)
# zu # zu
: :
( $has_scheduling ) ( $has_schedule )
# zeitplan aktiv # zeitplan aktiv
# ? ( $nearst_irrigation eq '2038-01-18 00:00') # ? ( $nearst_irrigation eq '2038-01-18 00:00')
? ( $nearst_irrigation eq RigReadingsValue( $hash, 'n/a') || $nearst_irrigation eq '2038-01-18 00:00') ? ( $nearst_irrigation eq RigReadingsValue( $hash, 'n/a') || $nearst_irrigation eq '2038-01-18 00:00')

2
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-07-01_16:13:02 49241 FHEM/73_GardenaSmartBridge.pm 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