Diff: format.cpp

Revision:

2:9a51bb2694aa

Parent:

1:7070fb876a2c

Child:

3:410a2812b0dc

--- a/format.cpp	Thu Dec 31 06:10:30 2015 +0000
+++ b/format.cpp	Thu Dec 31 06:40:03 2015 +0000
@@ -6,7 +6,7 @@
     
     char buf[BUFSIZE];
     uint16_t FileData[FDATA_NUM]={0}, num, data;
-    uint8_t spi_num, h_byte, l_byte;
+    uint8_t spi_num, h_byte, l_byte, val, packet;
     int i;
     FILE *fp;
     char *fname="/sd/mydir/sdtest.txt";
@@ -26,7 +26,7 @@
             num = atol(strtok(buf, ","));
             data = atol(strtok(NULL, "\r\n\0"));
             
-            if((num>=0)&&(num<FDATA_NUM)){
+            if(num<FDATA_NUM){
                 FileData[num] = data;
                 pc.printf("%d, %ld\n", num, FileData[num]);
             }
@@ -35,36 +35,19 @@
             }
         }
         fclose(fp);
-        /*
-        FileData[0] = 1;
-        FileData[1] = 2;
-        FileData[2] = 5;
-        FileData[3] = 10;
-        FileData[4] = 20;
-        FileData[5] = 50;
-        FileData[6] = 10;
-        FileData[7] = 20;
-        FileData[8] = 50;
-        FileData[9] = 100;
         
-        fp = fopen(fname, "w");
-        for(i=0; i<FDATA_NUM; i++) fprintf(fp, "%d, %ld\n", i, FileData[i]);
-        fclose(fp);
-        */
-
-    
     while(1){
         
         val = nucleo.receive();
         if(!val) continue;
         
-        spi_num = device.read();
-        h_byte = device.read();
-        l_byte = device.read();
+        spi_num = nucleo.read();
+        h_byte = nucleo.read();
+        l_byte = nucleo.read();
         
         if((spi_num&0x80)>>7 == 1){//writing to sd
             spi_num = spi_num & 0x7F;
-            if((spi_num>=0)&&(spi_num<FDATA_NUM)){
+            if(spi_num<FDATA_NUM){
                 FileData[spi_num] = (h_byte<<8) | l_byte;
                 //pc.printf("%d, %ld\n", num, FileData[num]);
                 fp = fopen(fname, "w");
@@ -74,7 +57,7 @@
         }
         else{//reading from sd
             spi_num = spi_num & 0x7F;
-            if((spi_num>=0)&&(spi_num<FDATA_NUM)){
+            if(spi_num<FDATA_NUM){
                 h_byte = (FileData[spi_num] & 0xFF00)>>8;
                 l_byte = (FileData[spi_num] & 0x00FF);
 
@@ -92,7 +75,7 @@
 
 #ifdef ULTRA_SONIC
 void Usw_System(void){
-    uint8_t paket, val, order;
+    uint8_t packet, val, order;
     uint16_t front_dis=0, rear_dis=0;
     
     while(1){
@@ -133,7 +116,6 @@
 #ifdef COLOR_SENSOR
 void Color_System(void){
     uint8_t val, order, packet;
-    uint8_t h_byte, l_byte;
     uint16_t data;
 
     while(1){
@@ -142,7 +124,7 @@
             if(val){
                 order = nucleo.read();
                 order %= SENSOR_X_COLOR;
-                data = ColorSensor[order/SENSOR_NUM][order%COLOR_NUM].read_u16();
+                data = ColorSensor[order].read_u16();
                 packet = (data & 0xFF00)>>8;
                 nucleo.reply(packet);
             }