#346 unit test irq dection time with debounce

diff --git a/wiringPi/test/wiringpi_test61_isr2.c b/wiringPi/test/wiringpi_test61_isr2.c
index 5f3bb3f63f0369482688804e5e96823728e98fa9..a2be628d8a634b3a6444c3ce821f4526faa1ed90 100644 (file)
--- a/wiringPi/test/wiringpi_test61_isr2.c
+++ b/wiringPi/test/wiringpi_test61_isr2.c
@@ -131,51 +131,44 @@ double StartSequence2(int Edge, int OUTpin, int INpin, int bounce) {
 }
 
 
-double DurationTime(int Enge, int OUTpin, int IRQpin, int new) {
+double DurationTime(int Enge, int OUTpin, int IRQpin, int bounce) {
   struct timeval now;
   double fTime = 0.0;
-
+  const char* strOp = INT_EDGE_RISING == Enge ? "rising" : "fallling";
   gStartTime = 0;
   gEndTime = 0;
   globalCounter = 0;
-  printf("Start\n");
+  //printf("Start\n");
 
-  if (INT_EDGE_RISING == Enge) {
-    digitalWrite(OUTpin, LOW);
-    if (new) { 
-      wiringPiISR2(IRQpin, INT_EDGE_RISING, &ISR2, 0);
-    } else {
-      wiringPiISR(IRQpin, INT_EDGE_RISING, &ISR);
-    }
-    sleep(1);
-    gettimeofday(&now, 0);
-    gStartTime = now.tv_sec*1000000LL + now.tv_usec;
-    digitalWrite(OUTpin, HIGH);  
-    delay(20);
-    digitalWrite(OUTpin, LOW);  
-   } else if (INT_EDGE_FALLING == Enge) {
-    digitalWrite(OUTpin, HIGH); 
-    if (new) {
-      wiringPiISR2(IRQpin, INT_EDGE_FALLING, &ISR2, 0);
-    } else {
-      wiringPiISR(IRQpin, INT_EDGE_FALLING, &ISR);
-    }
-    sleep(1);
-    gettimeofday(&now, 0);
-    gStartTime = now.tv_sec*1000000LL + now.tv_usec;    
-    digitalWrite(OUTpin, LOW);  
+  digitalWrite(OUTpin, INT_EDGE_RISING == Enge ? LOW : HIGH);
+  if (bounce>=0) {
+    printf("\nnew function, bounce time %d ms, %s :\n", bounce, strOp);
+    wiringPiISR2(IRQpin, Enge, &ISR2, bounce*1000);
+  } else {
+    printf("\nclassic function, %s :\n", strOp);
+    wiringPiISR(IRQpin, Enge, &ISR);
   }
-
   sleep(1);
+  gettimeofday(&now, 0);
+  gStartTime = now.tv_sec*1000000LL + now.tv_usec;
+  digitalWrite(OUTpin, INT_EDGE_RISING == Enge ? HIGH : LOW);
+  delay(20);
+  digitalWrite(OUTpin, LOW);
+  delay(20);
   fTime = (gEndTime - gStartTime);
-  printf("IRQ detect time %g usec", fTime);
-  if (fTime<2000 && fTime>0) {
-    printf("                          -> %spassed%s\n", COLORGRN, COLORDEF);
+  if (bounce<=0) {
+    printf("IRQ detection time %g usec", fTime);
+  } else {
+    printf("IRQ detection time %.1f msec", fTime/1000.0);
+  }
+  if (bounce>=0) {
+    // bounce time + 7ms (addtional bounce time) + 150 us (basic time)
+    CheckBetween("IRQ detection time with bounce [us]", fTime, 0, bounce*1000+ (bounce>0 ? 7000 : 0)+(15000*accuracy));
   } else {
-    printf("                          -> %sfailed%s\n", COLORRED, COLORDEF);
+    CheckBetween("IRQ detection time [us]", fTime, 0, 15000*accuracy);
   }
   wiringPiISRStop(IRQpin);
-
+  //printf("Stop\n");
   return fTime;
 }
 
@@ -252,20 +245,10 @@ int main (void) {
     wiringPiISRStop(IRQpin);
   }
 
-       for (int count=0; count<2; count++) {
-         printf("\nclassic function:\n");
-    printf("=================\n");
-    printf("Measuring duration IRQ @ GPIO%d with trigger @ GPIO%d rising\n", IRQpin, OUTpin);
-         DurationTime(INT_EDGE_RISING, OUTpin, IRQpin, 0);
-         printf("Measuring duration IRQ @ GPIO%d with trigger @ GPIO%d falling\n", IRQpin, OUTpin);
-         DurationTime(INT_EDGE_FALLING, OUTpin, IRQpin, 0);
-
-    printf("\nnew function:\n");
-    printf("===============\n");
-    printf("Measuring duration IRQ @ GPIO%d with trigger @ GPIO%d rising\n", IRQpin, OUTpin);
-         DurationTime(INT_EDGE_RISING, OUTpin, IRQpin, 1);
-         printf("Measuring duration IRQ @ GPIO%d with trigger @ GPIO%d falling\n", IRQpin, OUTpin);
-         DurationTime(INT_EDGE_FALLING, OUTpin, IRQpin, 1);
+  printf("Measuring duration IRQ @ GPIO%d with trigger @ GPIO%d rising and falling\n", IRQpin, OUTpin);
+       for (int bounce=-1; bounce<=5; bounce++) {
+         DurationTime(INT_EDGE_RISING, OUTpin, IRQpin, bounce);
+         DurationTime(INT_EDGE_FALLING, OUTpin, IRQpin, bounce);
        }
        pinMode(OUTpin, INPUT);
 

diff --git a/wiringPi/test/wpi_test.h b/wiringPi/test/wpi_test.h
index f2eb81ab6399876f48ed69c456f27d8715d5206c..1a76480f531fb1ec86a45028af63064829bc6aee 100644 (file)
--- a/wiringPi/test/wpi_test.h
+++ b/wiringPi/test/wpi_test.h
@@ -94,6 +94,15 @@ void CheckNotSame(const char* msg, int value, int expect) {
     }
 }
 
+void CheckBetween(const char* msg, int value, int min, int max) {
+    if (value>=min && value<=max) {
+        printf("%39s (% 3d< % 3d <% 3d) -> %spassed%s\n", msg, min, value, max, COLORGRN, COLORDEF);
+    } else {
+        printf("%39s (% 3d< % 3d <% 3d) -> %sfailed%s\n", msg, min, value, max, COLORRED, COLORDEF);
+        globalError=1;
+    }
+}
+
 
 void CheckSameFloat(const char* msg, float value, float expect, float epsilon) {
     if (fabs(value-expect)<epsilon) {
@@ -104,10 +113,21 @@ void CheckSameFloat(const char* msg, float value, float expect, float epsilon) {
     }
 }
 
+
 void CheckSameFloatX(const char* msg, float value, float expect) {
   return CheckSameFloat(msg, value, expect, 0.08f);
 }
 
+
+void CheckBetweenDouble(const char* msg, double value, double min, double max) {
+    if (value>=min && value<=max) {
+        printf("%39s (%g< %g <%g) -> %spassed%s\n", msg, min, value, max, COLORGRN, COLORDEF);
+    } else {
+        printf("%39s (%g< %g <%g) -> %sfailed%s\n", msg, min, value, max, COLORRED, COLORDEF);
+        globalError=1;
+    }
+}
+
 void CheckSameDouble(const char* msg, double value, double expect, double epsilon) {
     if (fabs(value-expect)<epsilon) {
         printf("%35s (%.3f==%.3f) -> %spassed%s \n", msg, value, expect, COLORGRN, COLORDEF);