Fix Multiple Send delay

CHANGED

@@ -1,3 +1,6 @@
+2021-06-07 - 00_SIGNALduino.pm
+
+Version updated to current date
 2021-06-07 - Update doc - SD_ProtocolData.pm (#975)
 
 * Update SD_ProtocolData.pm

FHEM/00_SIGNALduino.pm

@@ -39,7 +39,7 @@ use List::Util qw(first);
 
 
 use constant {
-  SDUINO_VERSION                  => '3.5.1+20210525',
+  SDUINO_VERSION                  => '3.5.2+20210607',
   SDUINO_INIT_WAIT_XQ             => 1.5,     # wait disable device
   SDUINO_INIT_WAIT                => 2,
   SDUINO_INIT_MAXRETRY            => 3,
@@ -1264,10 +1264,14 @@ sub SIGNALduino_CheckSendRawResponse {
     my $name=$hash->{NAME};
     # zu testen der sendeQueue, kann wenn es funktioniert auf verbose 5
     $hash->{logMethod}->($name, 4, "$name: CheckSendrawResponse, sendraw answer: $msg");
-    #RemoveInternalTimer("HandleWriteQueue:$name");
     delete($hash->{ucCmd});
-    #SIGNALduino_HandleWriteQueue("x:$name"); # Todo #823 on github
-    InternalTimer(gettimeofday() + 0.1, \&SIGNALduino_HandleWriteQueue, "HandleWriteQueue:$name") if (scalar @{$hash->{QUEUE}} > 0 && InternalVal($name,'sendworking',0) == 0);
+    if ($msg =~ /D=[A-Za-z0-9]+;/ )
+    {
+      RemoveInternalTimer("HandleWriteQueue:$name");
+      SIGNALduino_HandleWriteQueue("x:$name"); # Todo #823 on github
+    } else {
+      InternalTimer(gettimeofday() , \&SIGNALduino_HandleWriteQueue, "HandleWriteQueue:$name") if (scalar @{$hash->{QUEUE}} > 0 && InternalVal($name,'sendworking',0) == 0);
+    }
   }
   return (undef);
 }
@@ -1620,7 +1624,7 @@ sub SIGNALduino_AddSendQueue {
   #SIGNALduino_Log3 $hash , 5, Dumper($hash->{QUEUE});
 
   $hash->{logMethod}->($hash, 5,"$name: AddSendQueue, " . $hash->{NAME} . ": $msg (" . @{$hash->{QUEUE}} . ')');
-  InternalTimer(gettimeofday() + 0.1, \&SIGNALduino_HandleWriteQueue, "HandleWriteQueue:$name") if (scalar @{$hash->{QUEUE}} == 1 && InternalVal($name,'sendworking',0) == 0);
+  InternalTimer(gettimeofday(), \&SIGNALduino_HandleWriteQueue, "HandleWriteQueue:$name") if (scalar @{$hash->{QUEUE}} == 1 && InternalVal($name,'sendworking',0) == 0);
 }
 
 ############################# package main, test exists
@@ -1810,9 +1814,11 @@ sub SIGNALduino_Read {
             $hash->{logMethod}->($name, 5, "$name: Read, try asyncOutput of message $returnMessage");
             my $ao = undef;
             $ao = asyncOutput( $hash->{ucCmd}->{asyncOut}, $hash->{ucCmd}->{cmd}.': ' . $returnMessage ) if (defined($returnMessage));
-          $hash->{logMethod}->($name, 5, "$name: Read, asyncOutput failed $ao") if (defined($ao));
+            $hash->{logMethod}->($name, 5, "$name: Read, asyncOutput failed $ao") if (defined($ao));
+          }
+          if ( exists $hash->{ucCmd} && defined $hash->{ucCmd}->{cmd} &&  $hash->{ucCmd}->{cmd} ne "sendraw" ) {
+            delete $hash->{ucCmd} ;
           }
-          delete($hash->{ucCmd});
         }
 
         if (exists($hash->{keepalive})) {

controls_signalduino.txt

@@ -1,4 +1,4 @@
-UPD 2021-05-28_16:17:04 222865 FHEM/00_SIGNALduino.pm
+UPD 2021-06-07_22:53:27 223048 FHEM/00_SIGNALduino.pm
 UPD 2020-06-15_17:41:39 17876  FHEM/10_FS10.pm
 UPD 2020-05-26_11:51:12 20465  FHEM/10_SD_GT.pm
 UPD 2016-09-18_21:22:06 10111  FHEM/14_BresserTemeo.pm

t/FHEM/00_SIGNALduino/01_SIGNALduino_CheckSendRawResponse.t

@@ -4,16 +4,10 @@ use warnings;
 
 use Test2::V0;
 use Test2::Tools::Compare qw{is field U D match hash bag };
-use Mock::Sub;
 use Test2::Todo;
 
+our %defs;
 
-my $mock;
-my $InternalTimer;
-
-BEGIN {
-  $mock = Mock::Sub->new;
-};
 
 InternalTimer(time()+1, sub() {
   my $targetHash = $defs{dummyDuino};
@@ -23,22 +17,32 @@ InternalTimer(time()+1, sub() {
     'SM;',
     'SN;',
   );
-  $InternalTimer = $mock->mock('InternalTimer');
-
+  my $mock;
+
+  $mock = Test2::Mock->new(
+    track => 1,
+    class => 'main'
+  );	 
+  $mock->override( 'InternalTimer' => sub {  } ) ;
+  $mock->override('RemoveInternalTimer' => sub {  } ) ;
+  $mock->override('SIGNALduino_HandleWriteQueue' => sub {  } ) ;
+
+  my $tracking = $mock->sub_tracking();
+
   for my $respMsg (@respMsgs) {
-    $targetHash->{ucCmd} = "something";
-    $InternalTimer->reset;
+    $mock->clear_sub_tracking();
 
+    $targetHash->{ucCmd} = "something";
     subtest qq[verify accept "$respMsg"] => sub {
-
+    
       subtest qq[sendworking=0, QUEUE = 0] => sub {
         plan (2);
-          @{$targetHash->{QUEUE}} = ();
+        @{$targetHash->{QUEUE}} = ();
         $targetHash->{sendworking} = 0;
         SIGNALduino_CheckSendRawResponse($targetHash,$respMsg);
 
         is($targetHash->{ucCmd},U,'Verify ucCmd deleted');
-        is($InternalTimer->called,0,'Verify internalTimer called');
+        is(scalar @{$tracking->{InternalTimer}},0,'Verify InternalTimer is not called');
       };
 
       subtest qq[sendworking=0, QUEUE = 1] => sub {
@@ -47,7 +51,7 @@ InternalTimer(time()+1, sub() {
         SIGNALduino_CheckSendRawResponse($targetHash,$respMsg);
 
         is($targetHash->{ucCmd},U,'Verify ucCmd deleted');
-        is($InternalTimer->called,1,'Verify internalTimer called');
+        is(scalar @{$tracking->{InternalTimer}},1,'Verify InternalTimer is called');
       };
 
       subtest qq[sendworking=1, QUEUE = 1] => sub {
@@ -56,13 +60,35 @@ InternalTimer(time()+1, sub() {
         SIGNALduino_CheckSendRawResponse($targetHash,$respMsg);
 
         is($targetHash->{ucCmd},U,'Verify ucCmd deleted');
-        is($InternalTimer->called,1,'Verify internalTimer is not called once more');
+        is(scalar @{$tracking->{InternalTimer}},1,'Verify InternalTimer is not called');
+
       };
     };
 
   };
-
-  $InternalTimer->unmock;
+
+  for my $respMsg (qw /SR;D=AD0; /) {
+
+    subtest qq[verify accept "$respMsg" sendworking=0, QUEUE = 0] => sub {
+      $mock->clear_sub_tracking();
+      plan (4);
+
+
+      @{$targetHash->{QUEUE}} = ();
+      $targetHash->{sendworking} = 0;
+      SIGNALduino_CheckSendRawResponse($targetHash,'SR;D=AD0;');
+
+      is($targetHash->{ucCmd},U,'Verify ucCmd deleted'); 
+      is(scalar @{$tracking->{RemoveInternalTimer}},1,'Verify RemoveInternalTimer called');
+      is(scalar @{$tracking->{SIGNALduino_HandleWriteQueue}},1,'Verify SIGNALduino_HandleWriteQueue called');
+      is(scalar @{$tracking->{InternalTimer}},0,'Verify InternalTimer is not called');
+
+      $mock->restore('RemoveInternalTimer');
+      $mock->restore('SIGNALduino_HandleWriteQueue');
+      $mock->restore('InternalTimer');
+    };  }
+
+  $mock->reset_all;
   done_testing();
   exit(0);