Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/eurobot

Conflicts:

	src/robofsm/eb2008/robot_orte.c

diff --cc src/robofsm/eb2008/fsmdisplay.cc
Simple merge

diff --cc src/robofsm/eb2008/roboevent_eb2008.py
index 622aab0e6500b3a35c21e094e3d3b3e8bb4bf490,c44b6b905cf726e9a30697a3ea5936afe74a0733..65cd590b0a42e9ef5789a5f0394cea7a825c7ebb
--- 1/src/robofsm/eb2008/roboevent_eb2008.py
--- 2/src/robofsm/eb2008/roboevent_eb2008.py
+++ b/src/robofsm/eb2008/roboevent_eb2008.py
@@@ -24,9 -25,9 +24,9 @@@ events = 
          "EV_TRAJECTORY_LOST" : "Actual position of the robot is too far from reference",
          "EV_TRAJECTORY_DONE" : "Reference position is at the end of the previously submitted trajectory",
        "EV_TRAJECTORY_DONE_AND_CLOSE" : "::EV_TRAJECTORY_DONE + distance of actual position to the target is less than XXX",
 -      "EV_LOC_UPDATED" : "Localization updated the estimate of the robot position",
 +      "EV_FOUND_AFTER_RESET" : "MCL estimated position after reset",
      },
-     "joystick" : {
+     "joy" : {
      },
      "disp" : {
      }

diff --cc src/robofsm/eb2008/robot_eb2008.h
Simple merge

diff --cc src/robofsm/eb2008/robot_orte.c
index 48e6679a2faddd5d571d1374d94b7f20fe4550ad,de6b5c1440c7f13fa04b720fcdc1756fd2d9acd7..ce9a4a867bc00e189c05756513536eaad8fa3738
--- 1/src/robofsm/eb2008/robot_orte.c
--- 2/src/robofsm/eb2008/robot_orte.c
+++ b/src/robofsm/eb2008/robot_orte.c
@@@ -17,8 -17,7 +17,8 @@@
  #include <math.h>
  #include <robomath.h>
  #include <laser-nav.h>
- 
 +#include "map_handling.h"
+ #include <oledlib.h>
  /* ---------------------------------------------------------------------- 
   * PUBLISHER CALLBACKS - GENERIC
   * ---------------------------------------------------------------------- */