Diff: main.cpp

Revision:

1:63ae8cbbe758

Parent:

0:8aa125a0a09a

Child:

2:77fe1a8f5bac

--- a/main.cpp	Fri Aug 30 06:19:52 2019 +0000
+++ b/main.cpp	Tue Sep 03 14:12:36 2019 +0000
@@ -46,8 +46,9 @@
     DigitalOut(select3_2),
     DigitalOut(select3_3),
 };
+
+Serial pc(USBTX,USBRX);
 Serial uart(PA_9,PA_10);
-Serial pc(USBTX,USBRX);
 I2C i2c(SDA,SCL);
 SO1602A oled(i2c,0x78);
 
@@ -113,7 +114,7 @@
         } else if(i<=47) {
             anal[i]=y3.read();
         }
-//        pc.printf("%f ",anal[i]);
+//       pc.printf("%f ",anal[i]);
 
         if(anal[i]<0.8f) {
             read[i]=0;
@@ -128,15 +129,22 @@
 
 void DataTrim(char send[6],int data[48])
 {
-    send[0]=char((data[0]<<7)+(data[5]<<6)+(data[1]<<5)+(data[4]<<4)+(data[2]<<3)+(data[3]<<2)+(data[12]<<1)+(data[6]<<0));
-    send[1]=char((data[13]<<7)+(data[7]<<6)+(data[14]<<5)+(data[15]<<4)+(data[22]<<3)+(data[11]<<2)+(data[23]<<1)+(data[10]<<0));
-    send[2]=char((data[8]<<7)+(data[9]<<6)+(data[16]<<5)+(data[21]<<4)+(data[17]<<3)+(data[20]<<2)+(data[18]<<1)+(data[19]<<0));
-    send[3]=char((data[27]<<7)+(data[41]<<6)+(data[37]<<5)+(data[40]<<4)+(data[25]<<3)+(data[24]<<2)+(data[28]<<1)+(data[39]<<0));
-    send[4]=char((data[29]<<7)+(data[38]<<6)+(data[30]<<5)+(data[31]<<4)+(data[32]<<3)+(data[37]<<2)+(data[33]<<1)+(data[36]<<0));
-    send[5]=char((data[34]<<7)+(data[35]<<6)+(data[42]<<5)+(data[47]<<4)+(data[43]<<3)+(data[46]<<2)+(data[44]<<1)+(data[45]<<0));
+    send[0]=char((data[0]<<7)+(data[1]<<6)+(data[2]<<5)+(data[3]<<4)+(data[4]<<3)+(data[5]<<2)+(data[12]<<1)+(data[13]<<0));
+    send[1]=char((data[14]<<7)+(data[15]<<6)+(data[7]<<5)+(data[6]<<4)+(data[22]<<3)+(data[23]<<2)+(data[8]<<1)+(data[9]<<0));
+    send[2]=char((data[10]<<7)+(data[11]<<6)+(data[16]<<5)+(data[17]<<4)+(data[18]<<3)+(data[19]<<2)+(data[20]<<1)+(data[21]<<0));
+    send[3]=char((data[27]<<7)+(data[26]<<6)+(data[25]<<5)+(data[24]<<4)+(data[40]<<3)+(data[41]<<2)+(data[28]<<1)+(data[29]<<0));
+    send[4]=char((data[30]<<7)+(data[31]<<6)+(data[38]<<5)+(data[39]<<4)+(data[32]<<3)+(data[33]<<2)+(data[34]<<1)+(data[35]<<0));
+    send[5]=char((data[36]<<7)+(data[37]<<6)+(data[42]<<5)+(data[43]<<4)+(data[44]<<3)+(data[45]<<2)+(data[46]<<1)+(data[47]<<0));
+    
+    uart.putc('S');
+    wait_ms(50);
     for(int i=0; i<=5; i++) {
         uart.putc(send[i]);
+        wait_ms(50);
+        //pc.printf("%d : %d\n\r",i,send[i]);
     }
+    uart.putc('F');
+    
     for(int i=0; i<=47; i++) {
 //        oled.printf("%d",data[i]);
     }
@@ -166,8 +174,9 @@
     for(int i=0; i<=7; i++) {
         LAN[i]=!trimdata[i]*-2+!trimdata[i+2]*2+!trimdata[i+4]*-1+!trimdata[i+5]*1;
     }
-    oled.locate(0,0);
-    oled.printf("%+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d",LAN[0],LAN[1],LAN[2],LAN[3],LAN[4],LAN[5],LAN[6],LAN[7]);
+//    oled.locate(0,0);
+//    oled.printf("%+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d",LAN[0],LAN[1],LAN[2],LAN[3],LAN[4],LAN[5],LAN[6],LAN[7]);
+    //pc.printf("%+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d  %+2d",LAN[0],LAN[1],LAN[2],LAN[3],LAN[4],LAN[5],LAN[6],LAN[7]);
 }
 int readdata[48];
 char uartdata[6];
@@ -192,7 +201,7 @@
     while(1) {
         LineDataRead(readdata);
         DataTrim(uartdata,readdata);
-        printoled(uartdata);
+//        oled.printf("UNTI");
         wait(0.01);
     }
 }