Conflicts: stm32/include/strategie.h stm32/src/pince.cpp stm32/src/simul/robot.cpp stm32/src/strategie.cpp