Diff: dwm_uart.cpp

Revision:

2:bfd4fcab6a0f

Parent:

0:bb732ce5e423

--- a/dwm_uart.cpp	Mon Mar 25 20:46:14 2019 +0000
+++ b/dwm_uart.cpp	Fri Jun 14 09:04:20 2019 +0000
@@ -4,7 +4,7 @@
 // ici, on met le temps timeout = 600us
 //dans le cas de reception, si il n'y a pas de reponse pendant 100ms, 
 //c'est un echec
-Timer timer; 
+Timer timera; 
 
 
 dwm::dwm(PinName tx_pin, PinName rx_pin, int baudrate):
@@ -17,21 +17,21 @@
 {
     
     int i, begin, end;
-    timer.start();
+    timera.start();
     
     for(i=0; i<len; i++)
     {
-        begin = timer.read_us();
+        begin = timera.read_us();
         //while(dwm_uart.writeable() == false){}
         while(dwm_uart.writeable())
         {
             dwm_uart.putc(tx_buffer[i]);
         }
-        end = timer.read_us();
+        end = timera.read_us();
         wait_us(50);
         if((end-begin)>DWM_WRITE_TIMEOUT) return RV_ERR; //echec
     }
-    timer.stop();
+    timera.stop();
     return RV_OK; //reussi
 }
 
@@ -47,15 +47,15 @@
 {
     int i, len=0;
     int begin, end;
-    timer.start();
-    begin = timer.read_ms();
+    timera.start();
+    begin = timera.read_ms();
     //recuperer le type et la longeur des donnees
     for(i=0; i<3; i++)
     {
         while(dwm_uart.readable() == false)
         {
             
-            end = timer.read_ms();
+            end = timera.read_ms();
             //wait_us(2);
             if((end-begin)>DWM_READ_TIMEOUT) return RV_TIME; //echec
                    
@@ -74,7 +74,7 @@
             while(dwm_uart.readable() == false)
             {
                 
-                end = timer.read_ms();
+                end = timera.read_ms();
                 //wait_us(2);
                 if((end-begin)>DWM_READ_TIMEOUT) return RV_TIME; //echec
                   
@@ -87,7 +87,7 @@
         }
     }
     
-    timer.stop();
+    timera.stop();
     if(len != len_prevu) return RV_ERR; 
     return RV_OK; 
 }