Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

diff --cc src/common/can_ids.h
index d9e3e394b8b8f58801b61873fb1212b0247f657b,80f59de046c5a3c5984ba0c894491392fb3a1b9d..925119e5438038e6e50269e33c64af6699006b30
--- 1/src/common/can_ids.h
--- 2/src/common/can_ids.h
+++ b/src/common/can_ids.h
@@@ -57,28 -42,7 +42,15 @@@
  #define CAN_PWR_ADC2 to_boa(0x42)     /* PER->BOA */
                                        /* napeti na jednotlivych vetvich, 4B hodnoty */
  
- //#define CAN_BRUSHES_STATUS  to_boa(0x44)    // FIXME: (F.J.) rename me, ...
- 
- #define CAN_PUCK              to_boa(0x43)
- 
- 
- #define CAN_CMU                       to_boa(0x46)            /* PER->BOA */
- #define CAN_HOKUYO_PITCH      to_per(0x47)            /* BOA->PER */
- 
- //#define CAN_ERROR           to_boa(0x48)    // FIXME: (F.J.) rename me, ...
- 
- 
- #define CAN_VIDLE_STATUS      to_boa(0x48)
- #define CAN_VIDLE_CMD         to_per(0x49)
  
 +#define CAN_JAW_RIGHT_STATUS  to_boa(0x50)
 +#define CAN_JAW_RIGHT_CMD     to_per(0x51)
 +
 +#define CAN_JAW_LEFT_STATUS   to_boa(0x52)
 +#define CAN_JAW_LEFT_CMD      to_per(0x53)
 +
 +#define CAN_LIFT_STATUS       to_boa(0x54)
 +#define CAN_LIFT_CMD          to_per(0x55)
  // #undef to_boa
  // #undef to_mot
  // #undef to_per