Diff: main.cpp

Revision:

20:2840a749fb55

Parent:

17:f360e21d3307

Parent:

15:ae29e83947ff

Child:

21:5443f93819db

--- a/main.cpp	Sun Dec 14 17:22:12 2014 +0000
+++ b/main.cpp	Sun Dec 14 17:30:27 2014 +0000
@@ -2,10 +2,13 @@
 #include "QEI.h"
 #include "Odometry.h"
 #include <iostream>
+#include "Map.h"
+
 
 /*---------------------------------------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------------------*/
 /*KalmanFilter*/
+
 #include "EKF.h"
 Mat<double> motion_bicycle3( Mat<double> state, Mat<double> command, double dt = 0.5);
 Mat<double> sensor_bicycle3( Mat<double> state, Mat<double> command, Mat<double> d_state, double dt = 0.5 );
@@ -19,10 +22,15 @@
 /*---------------------------------------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------------------*/
 
+<<<<<<< local
 /*----------------------------------------------------------------------------------------------*/
     /*Serial*/    
     Serial pcs(USBTX, USBRX); // tx, rx
 /*----------------------------------------------------------------------------------------------*/
+=======
+/* --- Initialisation de la liste des obstable --- */
+int Obstacle::lastId = 0;
+>>>>>>> other
 
 int main()
 {