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

dev #74

Merged
sebastianschwarz merged 126 commits from dev into testing 2022-09-06 11:31:54 +00:00
Conversation 0 Commits 126 Files Changed 4 +15 -11
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0ee95be7be - Show all commits

2
CHANGED
View File

@ -1 +1 @@
[enhancement] - commandref [enhancement] - delete unused scheuldes from readings

22
FHEM/74_GardenaSmartDevice.pm
View File

@ -848,7 +848,7 @@ sub WriteReadings {
## ##
# validiere schedules # validiere schedules
my @soll = ();my @ist=(); my @soll = ();my @ist=(); my @tmp_ist=();
for my $cloud_schedules ( @{ $decode_json->{scheduled_events} } ) { for my $cloud_schedules ( @{ $decode_json->{scheduled_events} } ) {
while ( my ( $r, $v ) = each %{ $cloud_schedules } ) { while ( my ( $r, $v ) = each %{ $cloud_schedules } ) {
push @soll, $v if $r eq 'id'; # cloud hat SOLL push @soll, $v if $r eq 'id'; # cloud hat SOLL
@ -862,27 +862,31 @@ use Data::Dumper;
push @ist, $dev_reading if $dev_schedules =~ /.*_id/; # push reading _id push @ist, $dev_reading if $dev_schedules =~ /.*_id/; # push reading _id
push @ist, $1 if $dev_schedules =~ /.*_(\d)_id/; # push readigs d from x_id push @ist, $1 if $dev_schedules =~ /.*_(\d)_id/; # push readigs d from x_id
Log3 $name, 5, "[DEBUG] - Key ist : $dev_schedules "; Log3 $name, 5, "[DEBUG] $name - Key ist : $dev_schedules ";
Log3 $name, 5, "[DDDDD] - ID FOUND $dev_reading" if $dev_schedules =~ /.*_id/; # cloud hat SOLL Log3 $name, 5, "[DDDDD] $name - ID FOUND $dev_reading" if $dev_schedules =~ /.*_id/; # cloud hat SOLL
} }
Log3 $name, 5, "[OOOU] Cloud ".Dumper(@soll) . "- Ist:". Dumper(@ist); Log3 $name, 5, "[OOOU] Cloud ".Dumper(@soll) . "- Ist:". Dumper(@ist);
## delete only if cloud != (ist/2) ## delete only if cloud != (ist/2)
if (scalar(@soll) != scalar(@ist/2) if ((scalar(@soll) != scalar(@ist/2)
&& scalar(@soll) > 0 && scalar(@soll) > 0
&& scalar(@ist) > 0){ && scalar(@ist) > 0)
|| (scalar(@ist) eq 2 && scalar(@soll) eq 1 )){
@tmp_ist = @ist;
while(my $element = shift(@soll)) { while(my $element = shift(@soll)) {
my $schedule_step_int = 0; my $schedule_step_int = 0;
foreach my $sist (@ist) { foreach my $sist (@tmp_ist) {
my $step = scalar(@ist) > 1 ? 2:1; my $step = scalar(@ist) > 1 ? 2:1;
#print "step laenge $step \n";
print "check $element = $sist\n";
if ($element eq $sist){ if ($element eq $sist){
# splice(@ist, $schedule_step_int, 1); # more than 2 items del them, otherwise 1 #splice(@ist, $schedule_step_int, 1); # more than 2 items del them, otherwise 1
splice(@ist, $schedule_step_int, $step); # more than 2 items del them, otherwise 1 splice(@ist, $schedule_step_int, $step); # more than 2 items del them, otherwise 1
#$schedule_step_int++; #$schedule_step_int++;
} }
# $schedule_step_int++; #$schedule_step_int++;
$schedule_step_int += $step; $schedule_step_int += $step;
} }
} }

2
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-07-21_19:43:48 49634 FHEM/73_GardenaSmartBridge.pm UPD 2022-07-21_19:43:48 49634 FHEM/73_GardenaSmartBridge.pm
UPD 2022-08-06_13:11:33 107424 FHEM/74_GardenaSmartDevice.pm UPD 2022-08-06_20:17:48 107633 FHEM/74_GardenaSmartDevice.pm