Diff: main.cpp

Revision:

7:31cf052463a0

Parent:

6:facc3b44ab4e

Child:

8:4da30196d571

--- a/main.cpp	Tue Dec 08 22:54:10 2015 +0000
+++ b/main.cpp	Wed Dec 09 22:16:42 2015 +0000
@@ -164,34 +164,35 @@
     } else {
         lineN=0;
         if( fgets(rBuffer , 200 , fr) != NULL ) {
-            pch = strtok (softBuffer,",");
+            pch = strtok (rBuffer,",");
             strN=0;
             while (pch != NULL)
             {
-                if(strN==1){setT0 = atoi(pch);  }
-                if(strN==2){setPre0 =atoi(pch); }
-                if(strN==3){setM=atoi(pch);  }
-                if(strN==4){setC =atoi(pch); }
+                if(strN==0){setT0 = atoi(pch);  }
+                if(strN==1){setPre0 =atoi(pch); }
+                if(strN==2){setM=atoi(pch);  }
+                if(strN==3){setC =atoi(pch); }
                 pch = strtok (NULL, ",");
                 strN++;
             }
-            softBuffer[0] = setT0/255; //LSB
-            softBuffer[1] = setT0%255; //MSB
-            softBuffer[2] = setPre0/255; //LSB
-            softBuffer[3] = setPre0%255; //MSB
-            softBuffer[4] = setM/255; //LSB
-            softBuffer[5] = setM%255; //MSB
-            softBuffer[6] = setC/255; //LSB
-            softBuffer[7] = setC%255; //MSB
-            softBuffer[8] = '\0';
-            fpga.putc(softBuffer[0]);
-            fpga.putc(softBuffer[1]);
-            fpga.putc(softBuffer[2]);
-            fpga.putc(softBuffer[3]);
-            fpga.putc(softBuffer[4]);
-            fpga.putc(softBuffer[5]);
-            fpga.putc(softBuffer[6]);
-            fpga.putc(softBuffer[7]);
+            serial_t0.printf("%d,%d,%d,%d\n",setT0,setPre0,setM,setC);
+            rBuffer[0] = setT0/255; //LSB
+            rBuffer[1] = setT0%255; //MSB
+            rBuffer[2] = setPre0/255; //LSB
+            rBuffer[3] = setPre0%255; //MSB
+            rBuffer[4] = setM/255; //LSB
+            rBuffer[5] = setM%255; //MSB
+            rBuffer[6] = setC/255; //LSB
+            rBuffer[7] = setC%255; //MSB
+            rBuffer[8] = '\0';
+            fpga.putc(rBuffer[0]);
+            fpga.putc(rBuffer[1]);
+            fpga.putc(rBuffer[2]);
+            fpga.putc(rBuffer[3]);
+            fpga.putc(rBuffer[4]);
+            fpga.putc(rBuffer[5]);
+            fpga.putc(rBuffer[6]);
+            fpga.putc(rBuffer[7]);
         }
     }
     fclose(fr);
@@ -319,7 +320,7 @@
         
         setSend++;
         
-        if(setSend>60){
+        if(setSend>20){
             setSend=0;  
             SendSet();
         }