Diff: main.cpp

Revision:

14:dd3c756c6d48

Parent:

13:a72b0752aa6f

Child:

16:4c0b1647e8ae

--- a/main.cpp	Fri Sep 11 14:15:57 2020 +0000
+++ b/main.cpp	Wed Sep 16 12:31:54 2020 +0000
@@ -1,11 +1,12 @@
 // Nom du fichier : main.cpp
 #include "pins.h"
 
-void btnFct(){
+void btnFct()
+{
     mot_dis();
     aff_cd[0] = 0;
     aff_cd[1] = 0;
-    
+
     pc.printf("comptG = %d\r\n",comptG);
     pc.printf("comptD = %d\r\n",comptD);
     bt.printf("comptG = %d\r\n",comptG);
@@ -29,10 +30,9 @@
 
     //ticker_US.attach(&captUS_trig,0.2); // On apelle cette fonction toutes 0.2 secondes
     //ticker_affUS.attach(&affUltrasons,1.0);
-    //ticker_affcd.attach(&affCodeurs,1.0);
-    //tickTest.attach(&test4,0.1);
-    ticker_odo.attach(&odometrie,0.02); 
-    ticker_affodo.attach(&affOdo,1);
+    ticker_affcd.attach(&affCodeurs,1.0);
+    //ticker_odo.attach(&odoGeonobot1,0.2);
+    //ticker_affodo.attach(&affOdo,1.0);
 
     // Init capteurs à ultrasons
     captUS_init();
@@ -57,10 +57,8 @@
     cddA.rise(&cddaRise);
     cdgA.mode(PullUp);
     cddA.mode(PullUp);
-    
-    // Odometrie
-    
 
-
-    while(1) {}
+    while(1) {
+        
+    }
 }