Diff: main.cpp

Revision:

21:715c8cf78e14

Parent:

20:cf8e99d989a6

Child:

22:357327fe25af

--- a/main.cpp	Mon Apr 13 17:44:21 2015 +0000
+++ b/main.cpp	Wed Apr 15 01:51:46 2015 +0000
@@ -16,7 +16,7 @@
 #include "dataBedComm.h"
 #include "dataComm.h"
 short dataIn[7];
-short dataOut[]={0xFF,30,31,0, 0, 0, 0xFE};
+short dataOut[]={0xFF,30,31,0, 0, 0, 0, 0, 0xFE};
 dataComm dc = dataComm();
 Timer dbg;
 
@@ -36,26 +36,28 @@
     dataOut[4] = (short)f2;
     dataOut[5] = (short)f2;
     //pc.printf("%f\r\n", f1);
-    pc.printf("%d\r\n", (short)f1);
+    //pc.printf("%d\r\n", (short)f1);
     //pc.printf("%f\r\n", f2);
-    pc.printf("%d\r\n", (short)f2);
+    //pc.printf("%d\r\n", (short)f2);
     //for (int i = 2; i < 4; i++) {
       //  pc.printf("data%d is %x\r\n", i, dataOut[i]);
     //}
     //dataOut[2]=fsm.error();
     short* ptr=dataIn;
-    ptr=sendData(dataOut, 7, dataIn);
-    /*for (int i = 0; i < 7; i++) {   
-        pc.printf("%x, ", dataIn[i]);
+    ptr=sendData(dataOut, 9, dataIn);
+    //for (int i = 0; i < 7; i++) {
+        if (dataIn[1] != 0) {   
+    pc.printf("UI: %d\r\n", dataIn[1]);
     }
-    pc.printf("\r\n");*/
-    dc.process_write(dataIn, 7);
+    //}
+    //pc.printf("\r\n");*/
+    dc.process_write(dataIn+2, 7);
     //pc.printf("%d, %d, %d, %d,", dataIn[0], dataIn[1], dataIn[2], dataIn[3]);
     
     // Run state change/analysis in FSM
     int exoState=fsm.state(dataIn[1]);
     float temp=dbg.read_us();
-    pc.printf("%f\r\n",temp);
+    //pc.printf("%f\r\n",temp);
     
 }