Diff: main.cpp

Branch:

jpa

Revision:

4:fbbf5d1785e7

Parent:

3:2de8e4771674

Child:

5:ceefd0cfa233

--- a/main.cpp	Wed Sep 02 12:54:45 2020 +0000
+++ b/main.cpp	Wed Sep 02 14:43:31 2020 +0000
@@ -109,9 +109,15 @@
 void initSerial();
 void sendSerialUSB(char * str);
 void receiveSerialUSB();
+void sendSerial2(char * str);
+void receiveSerial2();
+void sendSerial7(char * str);
+void receiveSerial7();
 
-extern volatile char            bufferSerialUSB[];
+//extern volatile char            bufferSerialUSB[];
 extern volatile int             msgSerialUSB;
+extern volatile int             msgSerial2;
+extern volatile int             msgSerial7;
 
 //extern Serial          serialUSB(USBTX, USBRX);    // serial PC
 //extern Serial          serial2(PC_6, PC_7); // TX, RX for udp bridge
@@ -134,14 +140,16 @@
     }    
     else
     {  
+        /*
         printf(" Can message receive ok\n");
         printf("  ID      = 0x%.3X\r\n", msg.id);
         printf("  Type    = %d\r\n", msg.type);
         printf("  Format  = %d\r\n", msg.format);
         printf("  Length  = %d\r\n", msg.len);
+        printf("ID = 0x%.3X Data=", msg.id);
+        */
         printf("  Data    =");
-        for(int i = 0; i < msg.len; i++)
-            printf(" 0x%.2X", msg.data[i]);
+        for(int i = 0; i < msg.len; i++) printf(" 0x%.2X", msg.data[i]);
         printf("\r\n");
     }
 
@@ -225,7 +233,8 @@
             }
 
         if (msgSerialUSB > 0) {receiveSerialUSB();}
-        //sendSerialUSB(bufferSerialUSB);
+        if (msgSerial2 > 0) {receiveSerial2();}
+        if (msgSerial7 > 0) {receiveSerial7();}
      
         // timer send can 
        if(timer.read_ms() >= 10000)            // check for timeout