Diff: LTCDecode.cpp

Revision:

10:053bac3e326b

Parent:

9:7214e3c3e5f8

--- a/LTCDecode.cpp	Thu Feb 18 18:15:48 2021 +0000
+++ b/LTCDecode.cpp	Fri Feb 19 15:48:59 2021 +0000
@@ -1,4 +1,4 @@
-#include "LTCDecode.h"
+#include "LTCApp.h"
 
 
 const uint32_t minBitPeriodUS =
@@ -38,17 +38,16 @@
     bool gotSync = false;
 
     if (period > maxMidSymbolTimeUS) { // time since last transition is > maximum time for
-        // a 1, must be a zero and start of the next bit.
-        //        printf("Z");
+        // a 1, must be a zero and start of the next bit. 
         lastBitStart = transitionTime;
-        addBitToBuffer(false); // can't be an end of frame, they must end on a 1
-        return;
+        addBitToBuffer(false); 
+        return;// can't be an end of frame, they must end on a 1
     }
 
     // if it's not a 0 it must be a 1 but are we at the end of the bit yet?
     if ((transitionTime - lastBitStart)> minBitPeriodUS) { // end of a bit
         lastBitStart = transitionTime;
-        gotSync = addBitToBuffer(false); // can't be an end of frame, they must end on a 1
+        gotSync = addBitToBuffer(true);
         if (gotSync) {
             LTCsynced = true;
             decodeTime();
@@ -61,28 +60,28 @@
 // add a bit. Return true if we got the end of frame pattern
 bool LTCDecode::addBitToBuffer(bool bit)
 {
-    LTCBuffer[0] = LTCBuffer[0]>> 1;
-    if (LTCBuffer[1] &= 0x01)
+    LTCBuffer[0] = LTCBuffer[0]>>1;
+    if (LTCBuffer[1] & 0x01)
         LTCBuffer[0] |= 0x80000000;
 
-    LTCBuffer[1] = LTCBuffer[1]>> 1;
-    if (LTCBuffer[2] &= 0x01)
+    LTCBuffer[1] = LTCBuffer[1]>>1;
+    if (LTCBuffer[2] & 0x01)
         LTCBuffer[1] |=  0x80000000;
 
-    LTCBuffer[2] = LTCBuffer[2]>> 1;
+    LTCBuffer[2] = LTCBuffer[2]>>1;
     if (bit)
-        LTCBuffer[2]|=  0x80000000;
+        LTCBuffer[2] |=  0x80000000;
 
-    // frame sync patterin is 1011 1111 1111 1100
+   // frame sync patterin is 1011 1111 1111 1100
     // if it's a valid sync we will have it just received (buffer2 top bits) and the one from the last frame still in the buffer as the low 16 bits of buffer 0.
     return ((((LTCBuffer[2]>>16) & 0x0000FFFF) == 0xBFFC) && ((LTCBuffer[0] & 0x0000FFFF) == 0xBFFC));
 }
 
 void LTCDecode::decodeTime()
 {
-    _frame =        LTCBuffer[0]>>16 & 0x0f + ((LTCBuffer[0] >> 24) & 0x03) * 10;
-    _seconds =      LTCBuffer[1]>>0 & 0x0f + ((LTCBuffer[1] >> 8) & 0x07) * 10;
-    _minutes =      LTCBuffer[1]>>16 & 0x0f + ((LTCBuffer[1] >> 24) & 0x07) * 10;
-    _hours =      LTCBuffer[2]>>0 & 0x0f + ((LTCBuffer[2] >> 8) & 0x03) * 10;
+    _frame =        ((LTCBuffer[0]>>16) & 0x0f) + ((LTCBuffer[0] >> 24) & 0x03) * 10;
+    _seconds =      ((LTCBuffer[1]>>0) & 0x0f) + ((LTCBuffer[1] >> 8) & 0x07) * 10;
+    _minutes =      ((LTCBuffer[1]>>16) & 0x0f) + ((LTCBuffer[1] >> 24) & 0x07) * 10;
+    _hours =      ((LTCBuffer[2]>>0) & 0x0f) + ((LTCBuffer[2] >> 8) & 0x03) * 10;
     _frameDrop = (LTCBuffer[0] & (1<<26));
 }