Diff: main.cpp

Revision:

51:bc261eae004b

Parent:

50:937e860f4621

Child:

59:63609922579c

Child:

60:5058465904e0

--- a/main.cpp	Fri Apr 12 21:26:02 2013 +0000
+++ b/main.cpp	Fri Apr 12 21:34:34 2013 +0000
@@ -23,25 +23,11 @@
 void armtest();
 void motortestline();
 void colourtest();
-void pt_test();
 void cakesensortest();
 void printingtestthread(void const*);
 void printingtestthread2(void const*);
 void feedbacktest();
 
-// bytes packing for peer to peer communication
-typedef union {
-    struct _data {
-        unsigned char header[3];
-        unsigned char ID;
-        float value;
-        float aux;
-    }  data;
-    unsigned char type_char[sizeof(_data)];
-} bytepack_t;
-
-Serial pc(USBTX, USBRX);
-
 int main()
 {
 
@@ -73,7 +59,7 @@
     
     SystemTime.start();
     
-    
+    Serial pc(USBTX, USBRX);
     pc.baud(115200);
     wait(2);
     InitSerial();
@@ -97,11 +83,8 @@
     Thread printingThread(Printing::printingloop, NULL, osPriorityLow, 2048);
 
     measureCPUidle(); //repurpose thread for idle measurement
-    //colourtest();
-    //pt_test();
-    while(true) {
     Thread::wait(osWaitForever);
-    }
+   
 }
 
 #include <cstdlib>
@@ -201,6 +184,8 @@
 
 }
 
+/*
+
 void pt_test()
 {
     DigitalOut _blue_led(p10);
@@ -258,7 +243,7 @@
 
     }
 }
-
+*/
 
 
 void armtest()