Diff: main.cpp

Revision:

6:e269f6c282bc

Parent:

5:a50e02fc49cd

--- a/main.cpp	Thu May 02 21:18:42 2013 +0000
+++ b/main.cpp	Fri May 03 12:07:30 2013 +0000
@@ -3,8 +3,7 @@
 #include "TextLCD.h"
 #include "process_signal.h"
 #include "reciever.h"
-
-
+#include "transmitter.h"
 
 
 //RGB LED SETUP
@@ -12,6 +11,8 @@
 DigitalOut Blue(PTC10);
 DigitalOut Green(PTC11);
 
+Serial pc(USBTX,USBRX);
+
 //LCD SCREEN SETUP
 TextLCD lcd(PTD7, PTD6, PTA17, PTA16, PTC17, PTC16); // rs, e, d4-d7
 
@@ -60,8 +61,7 @@
     signal=Interrogate();
     hit= process_signal(signal);
 
-                if (hit==1)
-                {  
+                 
                 lives--;
                 
                 if(lives<0)
@@ -85,7 +85,7 @@
                     Blue=1;
                     wait(0.2);                  
                     }
-                }
+                
     }
        
 end: