Diff: APP.cpp

Revision:

10:51ee22e230c7

Parent:

8:60499583959f

Child:

11:097ae746d8ac

--- a/APP.cpp	Sun Feb 21 18:58:52 2016 +0000
+++ b/APP.cpp	Sun Feb 21 21:42:36 2016 +0000
@@ -7,6 +7,8 @@
 bool clockTick = false;
 bitset<FRAMESIZE> message(string("1000111011110101011100000000000111011010101001111111011110011010"));
 int counter = 0;
+bitset<8> inputBuffer;
+int preableCounter;
 
 int benchmark(void (*function) (void))
 {
@@ -34,28 +36,49 @@
         }
     }
 }
+/*
+extern "C" void TIMER1_IRQHandler()
+{
+    if ((LPC_TIM2->IR & 0x01) == 0x01) // if MR0 interrupt, proceed
+    {
+        LPC_TIM2->IR |= 1 << 0;        // Clear MR0 interrupt flag
+        clockTick = !clockTick;
+        LPC_TIM2->EMR = encode(message[counter], clockTick);
+
+        if (clockTick)
+        {
+            counter++;
+        }
+
+        if (counter >= FRAMESIZE)
+        {
+            counter = 0;
+        }
+    }
+}*/
+
  
 void initTimers()
 {
     //Timer 2 (match)
-    LPC_SC->PCLKSEL1 |= (1 << 12);     // pclk = cclk timer2
-    LPC_SC->PCONP |= (1 << 22);        // timer2 power on
-    LPC_TIM2->MR0 = CLOCKS_TO_SECOND / 10;           // 100 ms
-    LPC_TIM2->MCR = 3;                 // interrupt and reset control
-                                       // Interrupt & reset timer2 on match
-    LPC_TIM2->EMR = (2 << 4);              // toggle
-    NVIC_EnableIRQ(TIMER2_IRQn);       // enable timer2 interrupt
-    LPC_TIM2->TCR = 1;                 // enable Timer2
-    
+    LPC_SC->PCLKSEL1 |= (1 << 12);          // pclk = cclk timer2
+    LPC_SC->PCONP |= (1 << 22);             // timer2 power on
+    LPC_TIM2->MR0 = CLOCKS_TO_SECOND / 10;  // 100 ms
+    LPC_TIM2->MCR = 3;                      // interrupt and reset control
+                                            // Interrupt & reset timer2 on match
+    LPC_TIM2->EMR = (2 << 4);               // toggle
+    NVIC_EnableIRQ(TIMER2_IRQn);            // enable timer2 interrupt
+    LPC_TIM2->TCR = 1;                      // enable Timer2
+    /*
     //Timer 1 (cap)
-    LPC_SC->PCLKSEL1 |= (1 << 4);     // pclk = cclk timer2
-    LPC_SC->PCONP |= (1 << 2);        // timer1 power on
-    LPC_TIM1->MR0 = CLOCKS_TO_SECOND / 10;           // 100 ms
-    LPC_TIM1->MCR = 3;                 // interrupt and reset control
-                                       // Interrupt & reset timer1 on match
-    NVIC_EnableIRQ(TIMER1_IRQn);       // enable timer1 interrupt
-    LPC_TIM1->TCR = 1;                 // enable Timer1
-
+    LPC_SC->PCLKSEL0 |= (1 << 4);           // pclk = cclk timer2
+    LPC_SC->PCONP |= (1 << 2);              // timer1 power on
+    LPC_TIM1->MR0 = CLOCKS_TO_SECOND / 10;  // 100 ms
+    LPC_TIM1->MCR = 3;                      // interrupt and reset control
+                                            // Interrupt & reset timer1 on match
+    NVIC_EnableIRQ(TIMER1_IRQn);            // enable timer1 interrupt        
+    LPC_TIM1->TCR = 1;                      // enable Timer1
+    */
 }
 
 int main()