V42

diff --git a/pigpio.c b/pigpio.c
index f78155119d61f11b1f4cd7e20a820f66a418cfcb..1f4271a577beada98416c82aa28d996949d4754a 100644 (file)
--- a/pigpio.c
+++ b/pigpio.c
@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 */
 
-/* pigpio version 41 */
+/* pigpio version 42 */
 
 /* include ------------------------------------------------------- */
 
@@ -5244,7 +5244,7 @@ static void * pthAlertThread(void *x)
    uint32_t oldLevel, newLevel, level, reportedLevel;
    uint32_t oldSlot,  newSlot;
    uint32_t stick, expected, nowTick, ft;
-   int32_t diff;
+   int32_t diff, minDiff, stickInited;
    int cycle, pulse;
    int emit, seqno, emitted;
    uint32_t changes, bits, changedBits, timeoutBits;
@@ -5279,11 +5279,14 @@ static void * pthAlertThread(void *x)
 
    moreToDo = 0;
 
-   stick = systReg[SYST_CLO];
+   stickInited = 0;
+   stick = 0;
 
    nextWakeTick =
       stick + alert_delays[(gpioCfg.internals>>PI_CFG_ALERT_FREQ)&15];
 
+   minDiff = gpioCfg.clockMicros / 2;
+
    while (1)
    {
       newSlot = dmaCurrentSlot(dmaNowAtICB());
@@ -5304,8 +5307,6 @@ static void * pthAlertThread(void *x)
       {
          level = myGetLevel(oldSlot++);
 
-         newLevel = (level & monitorBits);
-
          gpioSample[numSamples].tick  = stick;
          gpioSample[numSamples].level = level;
 
@@ -5327,11 +5328,11 @@ static void * pthAlertThread(void *x)
 
             stick = myGetTick(cycle);
 
-            diff = stick - expected;
-
-            if ((diff < -1) || (diff > 1))
+            if (stickInited)
             {
-               if (gpioCfg.clockMicros > 1)
+               diff = stick - expected;
+
+               if (abs(diff) > minDiff)
                {
                   ft = gpioSample[numSamples-PULSE_PER_CYCLE].tick;
 
@@ -5343,21 +5344,26 @@ static void * pthAlertThread(void *x)
                         ((i*ticks)/PULSE_PER_CYCLE) + ft;
                   }
                }
-            }
 
-            diff += (TICKSLOTS/2);
+               diff += (TICKSLOTS/2);
 
-            if (diff < 0)
-            {
-               gpioStats.diffTick[0]++;
-            }
+               if (diff < 0)
+               {
+                  gpioStats.diffTick[0]++;
+               }
 
-            else if (diff >= TICKSLOTS)
+               else if (diff >= TICKSLOTS)
+               {
+                  gpioStats.diffTick[TICKSLOTS-1]++;
+               }
+
+               else gpioStats.diffTick[diff]++;
+            }
+            else
             {
-               gpioStats.diffTick[TICKSLOTS-1]++;
+               stickInited = 1;
+               numSamples = 0;
             }
-
-            else gpioStats.diffTick[diff]++;
          }
       }
 
@@ -7766,10 +7772,6 @@ void gpioTerminate(void)
    {
       fprintf(stderr,
          "\n#####################################################\n");
-      fprintf(stderr,
-         "If you didn't request stats please cut & paste the\n"
-         "following and e-mail to pigpio@abyz.co.uk\n");
-
       fprintf(stderr, "pigpio version=%d internals=%X\n",
          PIGPIO_VERSION, gpioCfg.internals);
 

diff --git a/pigpio.h b/pigpio.h
index b97394290fbfc974c6617ff6f99b9b667cf1bf6c..288e1f4031c3572bbef56b35f1f8353d2828ce7d 100644 (file)
--- a/pigpio.h
+++ b/pigpio.h
@@ -31,7 +31,7 @@ For more information, please refer to <http://unlicense.org/>
 #include <stdint.h>
 #include <pthread.h>
 
-#define PIGPIO_VERSION 41
+#define PIGPIO_VERSION 42
 
 /*TEXT