diff --git a/.docker/build_docker.sh b/.docker/build_docker.sh index d619aa3b4..d1ed8f3aa 100755 --- a/.docker/build_docker.sh +++ b/.docker/build_docker.sh @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" # Can be changed, choices are: amd64 or arm64 ARCHITECTURE=amd64 -VERSION=v4.0.0 +VERSION=v4.0.1 DOCKER_IMAGE_NAME=registry.gitlab.com/niryo/niryo-one-s/ned_ros_stack/${VERSION} ## Tag to push image on gitlab diff --git a/.docker/run_docker.sh b/.docker/run_docker.sh index 246914285..59f2e5107 100755 --- a/.docker/run_docker.sh +++ b/.docker/run_docker.sh @@ -1,6 +1,6 @@ # Can be changed, choices are: amd64 or arm64 ARCHITECTURE=amd64 -VERSION=v4.0.0 +VERSION=v4.0.1 DOCKER_IMAGE_NAME=registry.gitlab.com/niryo/niryo-one-s/ned_ros_stack/${VERSION} diff --git a/niryo_robot_tools_commander/scripts/tool_commander_node.py b/niryo_robot_tools_commander/scripts/tool_commander_node.py index 2876845c3..4c6ff744a 100755 --- a/niryo_robot_tools_commander/scripts/tool_commander_node.py +++ b/niryo_robot_tools_commander/scripts/tool_commander_node.py @@ -204,14 +204,15 @@ def __callback_update_tool(self, _req): return self.create_response(CommandStatus.TOOL_FAILURE, "Impossible to set new tool") - if id_ not in self.__available_tools: + if id_ < 0: + id_ = self.__dict_tool_str_to_id['No Tool'] + elif id_ not in self.__available_tools: # no tool found in available tools return self.create_response(CommandStatus.TOOL_ID_INVALID, "This ID does not match any available tool ID") self.set_tool(self.__available_tools[id_]) - return self.create_response(CommandStatus.SUCCESS, - "New tool has been set, id : {}".format(id_)) + return self.create_response(CommandStatus.SUCCESS, "New tool has been set, id : {}".format(id_)) def __callback_equip_electromagnet(self, req): id_ = req.value diff --git a/sphinx_doc/conf.py b/sphinx_doc/conf.py index 5ffe62b74..f3d920286 100644 --- a/sphinx_doc/conf.py +++ b/sphinx_doc/conf.py @@ -22,7 +22,7 @@ # The short X.Y version version = u'v4.0' # The full version, including alpha/beta/rc tags -release = u'v4.0.0' +release = u'v4.0.1' # -- General configuration --------------------------------------------------- diff --git a/sphinx_doc/locale/en/LC_MESSAGES/source/quick_start.po b/sphinx_doc/locale/en/LC_MESSAGES/source/quick_start.po index 5059247a8..2a804d26b 100644 --- a/sphinx_doc/locale/en/LC_MESSAGES/source/quick_start.po +++ b/sphinx_doc/locale/en/LC_MESSAGES/source/quick_start.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Ned ROS Documentation v4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-01 09:26+0000\n" +"POT-Creation-Date: 2022-02-09 10:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -294,9 +294,7 @@ msgid ":red:`Advanced`" msgstr "" #: ../../source/quick_start.rst:100 -msgid "" -"`Niryo Ros " -"`_" +msgid "`Niryo Ros `_" msgstr "" #: ../../source/quick_start.rst @@ -515,8 +513,8 @@ msgstr "" msgid "" "When no program is running you can also start a program by pressing the " "same button once. To set it up, go to the `Program Autorun " -"`_." +"`_." msgstr "" #~ msgid "There are 6 ways to connect program the Niryo robots:" @@ -685,3 +683,17 @@ msgstr "" #~ "programmed a robot at lightning speed!" #~ msgstr "" +#~ msgid "" +#~ "`Niryo Ros " +#~ "`_" +#~ msgstr "" + +#~ msgid "" +#~ "When no program is running you can" +#~ " also start a program by pressing " +#~ "the same button once. To set it" +#~ " up, go to the `Program Autorun " +#~ "`_." +#~ msgstr "" + diff --git a/sphinx_doc/locale/fr/LC_MESSAGES/source/quick_start.po b/sphinx_doc/locale/fr/LC_MESSAGES/source/quick_start.po index 55195636d..c02c19847 100644 --- a/sphinx_doc/locale/fr/LC_MESSAGES/source/quick_start.po +++ b/sphinx_doc/locale/fr/LC_MESSAGES/source/quick_start.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Ned ROS Documentation v4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-01 09:26+0000\n" +"POT-Creation-Date: 2022-02-09 10:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" "**Description :** Le robot émet son propre réseau Wi-Fi. Dans ce mode, " "vous pouvez vous connecter au robot comme n'importe quel autre réseau Wi-" "Fi. |br| Le nom du réseau est au format **NiryoRobot xx-xx-xx** et le mot" -" de passe par défaut est **niryrobot**. Pour changer le nom du robot, " +" de passe par défaut est **niryorobot**. Pour changer le nom du robot, " "reportez-vous à la section : `Nom du robot " "`_." @@ -344,12 +344,10 @@ msgid ":red:`Advanced`" msgstr ":red:`Avancé`" #: ../../source/quick_start.rst:100 -msgid "" -"`Niryo Ros " -"`_" +msgid "`Niryo Ros `_" msgstr "" "`Niryo Ros " -"`_" +"`_" #: ../../source/quick_start.rst msgid "Program and run your ROS node directly on the robot," @@ -638,12 +636,12 @@ msgstr "Lorsque le programme est en pause, la LED à l'arrière clignote en blan msgid "" "When no program is running you can also start a program by pressing the " "same button once. To set it up, go to the `Program Autorun " -"`_." +"`_." msgstr "" "Lorsqu'aucun programme n'est en cours, vous pouvez également démarrer un " "programme en appuyant une fois sur le même bouton. Pour le configurer, " "référez vous à la section `Programme Autorun " "`_." +"studio/source/programs.html#program-autorun>`_." diff --git a/sphinx_doc/source/quick_start.rst b/sphinx_doc/source/quick_start.rst index d1a46986b..8e77d7ccd 100644 --- a/sphinx_doc/source/quick_start.rst +++ b/sphinx_doc/source/quick_start.rst @@ -97,7 +97,7 @@ There are 6 ways to program Niryo's robots: * - ROS - Python, C++ - :red:`Advanced` - - `Niryo Ros `_ + - `Niryo Ros `_ - | Program and run your ROS node directly on the robot, | or remotely through ROS Multimachine. @@ -201,7 +201,7 @@ When a program is paused: When the program is paused, the LED at the back flashes white. When no program is running you can also start a program by pressing the same button once. -To set it up, go to the `Program Autorun `_. +To set it up, go to the `Program Autorun `_. .. |br| raw:: html