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 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6faccfe564 - Show all commits

2
CHANGED
View File

@ -1 +1 @@
first step state cleanup code

4
FHEM/74_GardenaSmartDevice.pm
View File

@ -886,13 +886,13 @@ sub setState {
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ){ if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ){
my @ic24opened_ventils; my @ic24opened_ventils;
my $state_string = ''; my $nearst_irrigation = '2999-12-12 24:00'; my $state_string = ''; my $nearst_irrigation = '2999-12-12 24:00';
my $has_scheduling = false; my $has_scheduling = 0;
my @valves_connected = split(',', ReadingsVal( $name, 'ic24-valves_connected', '')); my @valves_connected = split(',', ReadingsVal( $name, 'ic24-valves_connected', ''));
for (@valves_connected){ for (@valves_connected){
## add to opened ventils, if watering active ## add to opened ventils, if watering active
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 = true if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z'); $has_scheduling = 1 if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z');
if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne '') { if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne '') {
$nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') if ( Time::Piece->strptime( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, ''), "%Y-%m-%d %H:%M") < Time::Piece->strptime( $nearst_irrigation, "%Y-%m-%d %H:%M")) $nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') if ( Time::Piece->strptime( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, ''), "%Y-%m-%d %H:%M") < Time::Piece->strptime( $nearst_irrigation, "%Y-%m-%d %H:%M"))

2
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-05-28_13:13:38 49520 FHEM/73_GardenaSmartBridge.pm UPD 2022-05-28_13:13:38 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-06-10_20:24:37 66965 FHEM/74_GardenaSmartDevice.pm UPD 2022-06-10_20:26:59 66958 FHEM/74_GardenaSmartDevice.pm