Diff: main.cpp

Revision:

3:ef7e0cbade6d

Parent:

2:b87aaf1bc803

Child:

4:46d4917f2464

--- a/main.cpp	Sat Nov 22 00:58:11 2014 +0000
+++ b/main.cpp	Mon Nov 24 03:28:44 2014 +0000
@@ -7,7 +7,7 @@
 
 int main()
 {
-    int dataIn[3], dataOut[3];
+    int dataIn[4], dataOut[4], buffer;
     dataOut[0]=7;
     dataOut[1]=30;
     mainPower=1;//Don't turn on for initial testing
@@ -15,11 +15,12 @@
     comm.reply(dataOut[0]);//make this the first message
     pc.printf("DataBed On!\r\n");
     int counter=0;
+    int ii=0;
     //float blah=1;
     //t_debug.start();
     while (1) { //Run these functions as fast as possible
 
-        if(comm.receive()) {
+        /*if(comm.receive()) {
             dataIn[0] = comm.read();
             comm.reply(UI);         // Make this the next reply
             while(dataIn[0]==7) {
@@ -39,15 +40,44 @@
                     dataIn[1]=0;
                     break;
                 }
+            }*/
+        if(comm.receive()) {
+            buffer = comm.read();
+            if(buffer==0xFE) { //end of message
+                ii=0;
+                dataIn[3]=buffer;
+                comm.reply(5);
+                counter++;
+                if(BMS.read(msg)) {
+                    if(msg.id==0x18FF8320) {
+                        pc.printf("%x\r\n",msg.data[0]);
+                    }
+                }
+                phone.attachment();
+            } else if(buffer==0xFF) { //beginning of message
+                ii=1;
+                dataIn[0]=buffer;
+                comm.reply(UI);
+            } else if(ii==1) {
+                ii++;
+                dataIn[1]=buffer;
+                comm.reply(52);
+            } else if(ii==2) {
+                ii++;
+                dataIn[2]=buffer;
+                comm.reply(25);
             }
-            if(counter>=100) {
-                UI=0;//set the UI to 0 unless it's changed in checkUI_Xbee()
-                readBuffer();
-                checkUI_XBee(); //check UI from Xbee
-                counter=0;
-            }
-            counter++;
+
         }
+        if(counter>=10) {
+            UI=0;//set the UI to 0 unless it's changed in checkUI_Xbee()
+            readBuffer();
+            checkUI_XBee(); //check UI from Xbee
+            xbeeUI.rxBufferFlush();
+            counter=0;
+        }
+        //counter++;
+        //}
 
     }
 }
\ No newline at end of file