Diff: ManageBufferJPA.cpp

Branch:

jpa

Revision:

17:f3c5ec9ca00f

Parent:

10:41aff2b7acc6

--- a/ManageBufferJPA.cpp	Wed Dec 30 17:22:27 2020 +0000
+++ b/ManageBufferJPA.cpp	Wed Jan 13 19:52:35 2021 +0000
@@ -1,7 +1,6 @@
 #include "mbed.h"
 
 const int        kMaxBufferSize = 125;
-
 volatile char    bufferSerialUSB[kMaxBufferSize+3];
 volatile int     idxSerialIntUSB = 0;
 int              idxSerialUserUSB = 0;
@@ -9,7 +8,6 @@
 char             stringSerialUSB[kMaxBufferSize+3];
 int              stringSerialUSBok = 0;               // si ==1 alors trame dispo (fin de trame == LF ou 10
 int              idxSerialStringUSB = 0;
-
 volatile char    bufferSerial2[kMaxBufferSize+3];
 volatile int     idxSerialInt2 = 0;
 int              idxSerialUser2 = 0;
@@ -17,7 +15,6 @@
 char             stringSerial2[kMaxBufferSize+3];
 int              stringSerial2ok = 0;                 // si ==1 alors trame dispo (fin de trame == LF ou 10
 int              idxSerialString2 = 0;
-
 volatile char    bufferSerial7[kMaxBufferSize+3];
 volatile int     idxSerialInt7 = 0;
 int              idxSerialUser7 = 0;
@@ -32,10 +29,8 @@
 RawSerial          serial7(PF_7, PF_6); // TX, RX for extension
 // ---------------------------------------------------
 void serialUSB_int_recv()
-    {       
-    if(serialUSB.readable()) 
-        {   
-        bufferSerialUSB[idxSerialIntUSB]=(serialUSB.getc());
+   { if(serialUSB.readable()) 
+       { bufferSerialUSB[idxSerialIntUSB]=(serialUSB.getc());
         idxSerialIntUSB++;
         if (idxSerialIntUSB >= kMaxBufferSize) {idxSerialIntUSB = 0;}
         bufferSerialUSB[idxSerialIntUSB]= 0;
@@ -45,10 +40,8 @@
     }
 // ---------------------------------------------------------------------------
 void serial2_int_recv()
-    {       
-    if(serial2.readable()) 
-        {   
-        bufferSerial2[idxSerialInt2]=(serial2.getc());
+   { if(serial2.readable()) 
+      { bufferSerial2[idxSerialInt2]=(serial2.getc());
         idxSerialInt2++;
         if (idxSerialInt2 >= kMaxBufferSize) {idxSerialInt2 = 0;}
         bufferSerial2[idxSerialInt2]= 0;
@@ -58,10 +51,8 @@
     }
 // ----------------------------------------------------------------------------
 void serial7_int_recv()
-    {       
-    if(serial7.readable()) 
-        {           
-        bufferSerial7[idxSerialInt7]=(serial7.getc());
+   { if(serial7.readable()) 
+      { bufferSerial7[idxSerialInt7]=(serial7.getc());
         //printf("%c",bufferSerial7[idxSerialInt7]);
         idxSerialInt7++;
         if (idxSerialInt7 >= kMaxBufferSize) {idxSerialInt7 = 0;}
@@ -72,8 +63,7 @@
     }   
 // --------------------------------------------------------------------------------   
 void initSerial()
-    {
-    serialUSB.baud(115200);
+  { serialUSB.baud(115200);
     serialUSB.attach(&serialUSB_int_recv, Serial::RxIrq);
     serial2.baud(115200);  // required for Tasmota
     //serial2.baud(57600);  // required for UDP bridge
@@ -86,22 +76,17 @@
     }
 // ---------------------------------------------------------------------------      
 void sendSerialUSB(char * str)
-    {
-    serialUSB.printf(str);
+  { serialUSB.printf(str);
     }
 // ---------------------------------------------------------------------------    
 void receiveSerialUSB()
-    {
-    char x;
+  { char x;
     if (stringSerialUSBok == 0)     // string user dispo flag a mettre a 0 par user a chaque lecture de string
-        {
-        while(idxSerialIntUSB != idxSerialUserUSB)
-            {
-            x=bufferSerialUSB[idxSerialUserUSB];
+      { while(idxSerialIntUSB != idxSerialUserUSB)
+         {  x=bufferSerialUSB[idxSerialUserUSB];
             //printf("%c",x);  
             idxSerialUserUSB = idxSerialUserUSB + 1;
-            if (idxSerialUserUSB >= kMaxBufferSize) {idxSerialUserUSB = 0;} 
-            
+            if (idxSerialUserUSB >= kMaxBufferSize) {idxSerialUserUSB = 0;}            
             stringSerialUSB[idxSerialStringUSB] = x;
             idxSerialStringUSB = idxSerialStringUSB + 1;stringSerialUSB[idxSerialStringUSB] = 0;
             if (idxSerialStringUSB >= kMaxBufferSize) 
@@ -113,22 +98,17 @@
     }
 // ------------------------------------------------------------------------------    
 void sendSerial2(char * str)
-    {
-    serial2.printf(str);
-    }
+  { serial2.printf(str);
+  }
 // ------------------------------------------------------------------------------    
 void receiveSerial2()
-    {
-    char x;
-    if (stringSerial2ok == 0)     // string user dispo flag a mettre a 0 par user a chaque lecture de string
-        {
-        while(idxSerialInt2 != idxSerialUser2)
-            {
-            x=bufferSerial2[idxSerialUser2];
+    {char x;
+     if (stringSerial2ok == 0)     // string user dispo flag a mettre a 0 par user a chaque lecture de string
+       { while(idxSerialInt2 != idxSerialUser2)
+          { x=bufferSerial2[idxSerialUser2];
             //printf("%c",x);  
             idxSerialUser2 = idxSerialUser2 + 1;
-            if (idxSerialUser2 >= kMaxBufferSize) {idxSerialUser2 = 0;} 
-            
+            if (idxSerialUser2 >= kMaxBufferSize) {idxSerialUser2 = 0;}             
             stringSerial2[idxSerialString2] = x;
             idxSerialString2 = idxSerialString2 + 1;stringSerial2[idxSerialString2] = 0;
             if (idxSerialString2 >= kMaxBufferSize) 
@@ -140,18 +120,14 @@
     }
 // --------------------------------------------------------------------------------       
 void sendSerial7(char * str)
-    {
-    serial7.printf(str);
+    { serial7.printf(str);
     }
 // -------------------------------------------------------------------------------    
 void receiveSerial7()
-    {
-    char x;
+    { char x;
     if (stringSerial7 == 0)     // string user dispo flag a mettre a 0 par user a chaque lecture de string
-        {
-        while(idxSerialInt7 != idxSerialUser7)
-            {
-            x=bufferSerial7[idxSerialUser7];
+        { while(idxSerialInt7 != idxSerialUser7)
+            { x=bufferSerial7[idxSerialUser7];
             //printf("%c",x);  
             idxSerialUser7 = idxSerialUser7 + 1;
             if (idxSerialUser7 >= kMaxBufferSize) {idxSerialUser7 = 0;}