Diff: APP.cpp

Revision:

21:137d010e7469

Parent:

20:f0932bfe09ed

diff -r f0932bfe09ed -r 137d010e7469 APP.cpp
--- a/APP.cpp	Tue Feb 23 00:22:49 2016 +0000
+++ b/APP.cpp	Tue Feb 23 00:28:40 2016 +0000
@@ -119,14 +119,13 @@
 
     LPC_PINCON->PINSEL0 |= (3 << 8);   // P0.4 = CAP2.0
     initTimers();
-    STATES tempState = BLU;
+
     while (true)
     {
         if (dataReady)
         {
             for (int i = 0; i < payloadSize * 8; i++)
             {
-                
                 if((i + 1) % 8 == 0)
                 {
                     char tempChar = (decodedMessage[i] << 0) | (decodedMessage[i - 1] << 1) | (decodedMessage[i - 2] << 2) | (decodedMessage[i - 3] << 3) | (decodedMessage[i - 4] << 4) | (decodedMessage[i - 5] << 5) | (decodedMessage[i - 6] << 6) | (decodedMessage[i - 7] << 7);
@@ -135,29 +134,9 @@
             }
             dataReady = false;
         }
-        if (tempState != mefSTATE)
-        {
-            pc.printf("\r\nNew state: %i \r\n", mefSTATE);
-            tempState = mefSTATE;
-        }
-        if(frameDropped)
-        {
-            pc.printf("Frame dropped\r\n");
-            frameDropped = false;    
-        }
-        if(debugMessageReady)
-        {
-            pc.printf("%i\r\n", debugMessage);
-            debugMessageReady = false;
-        }
     }
 }
 
-void bSToChar(bitset<8> bs)
-{
-       
-}
-
 void _decodeCallback(bitset<MAX_DATA> decMessage, int size)
 {
     decodedMessage = decMessage;
@@ -169,14 +148,3 @@
 {
     frameDropped = true;
 }
-
-void _updateState(STATES state)
-{
-    mefSTATE = state;
-}
-
-void _mefDebug(int blu)
-{
-    debugMessage = blu;
-    debugMessageReady = true;
-}