From 2156ed94a4edf1cfbd26a4b46dc6371b6ada812c Mon Sep 17 00:00:00 2001 From: Timothee Wintz <timothee.wintz@inria.fr> Date: Mon, 10 Jan 2022 10:43:30 +0100 Subject: [PATCH] switched to motor controller master branch with pygco separate --- .gitmodules | 5 ++++- Dockerfile | 6 ++++++ modules/Motor_Controller | 2 +- modules/pygco | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 160000 modules/pygco diff --git a/.gitmodules b/.gitmodules index 387a190..a837fd0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "modules/Motor_Controller"] path = modules/Motor_Controller url = git@gitlab.inria.fr:spring/wp6_robot_behavior/Motor_Controller.git - branch = devel [submodule "modules/2D_Simulator"] path = modules/2D_Simulator url = git@gitlab.inria.fr:spring/wp6_robot_behavior/2D_Simulator.git @@ -9,3 +8,7 @@ [submodule "modules/omnicam"] path = modules/omnicam url = git@gitlab.inria.fr:twintz/omnicam.git +[submodule "modules/pygco"] + path = modules/pygco + url = git@gitlab.inria.fr:robotlearn/pygco.git + branch = main diff --git a/Dockerfile b/Dockerfile index 1d44f83..b9bf81b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,12 @@ WORKDIR /home/ros/robot_behavior_ws/modules/2D_Simulator RUN pip3 install -r requirements.txt RUN pip3 install -e . + +ADD modules/pygco /home/ros/robot_behavior_ws/modules/pygco +WORKDIR /home/ros/robot_behavior_ws/modules/pygco +RUN apt-get update && apt-get install -y wget +RUN pip3 install --global-option=build_ext . + ADD modules/Motor_Controller /home/ros/robot_behavior_ws/modules/Motor_Controller WORKDIR /home/ros/robot_behavior_ws/modules/Motor_Controller diff --git a/modules/Motor_Controller b/modules/Motor_Controller index 06e2cd3..4078006 160000 --- a/modules/Motor_Controller +++ b/modules/Motor_Controller @@ -1 +1 @@ -Subproject commit 06e2cd3d888de5054e2616e57dc710c568a4f9c1 +Subproject commit 40780064de227ee1691d297d78fcc3480823698c diff --git a/modules/pygco b/modules/pygco new file mode 160000 index 0000000..31267e7 --- /dev/null +++ b/modules/pygco @@ -0,0 +1 @@ +Subproject commit 31267e74d1d4efab66557fcb595bbd33f7bde045 -- GitLab