From ba3caf531d015b4f766035c0b213c88c343dc3d1 Mon Sep 17 00:00:00 2001 From: marvin <marvin@marvin-TERRA-MOBILE-1529H> Date: Sun, 1 Mar 2020 03:43:25 +0100 Subject: [PATCH] Changed adapter.config, modelsetup.config --- src/var/FeatureModelConfigurator/adapter.config | 11 +++++++++-- src/var/FeatureModelImplGenerator/modelsetup.config | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/var/FeatureModelConfigurator/adapter.config b/src/var/FeatureModelConfigurator/adapter.config index 2e3d247..f0a7150 100644 --- a/src/var/FeatureModelConfigurator/adapter.config +++ b/src/var/FeatureModelConfigurator/adapter.config @@ -6,14 +6,21 @@ <!-- Path to and name of feature model generated by Feature IDE. --> <featuremodel type="file" name="featuremodel.xml" path="./resources/output/" /> <!-- Path to all available sensor configuration files. --> + <!-- Files with other endings are allowed and will be ignored, unless this path is also used by ModelSetup (see ModelSetup) --> <sensorconfig type="directory" path="./resources/input/sensorconfig/" /> <!-- Path to all available .gazebo.xacro files. --> - <gazebomodel type="directory" path="./resources/input/bot_description/" /> - <!-- <gazebomodel type="directory" path="./../../sim/bot_description/" /> --> + <!-- Files with other endings are allowed and will be ignored. --> + <gazebomodel type="directory" path="./../../sim/turtlebot3/turtlebot3/turtlebot3_description/urdf_raw_for_testing/" /> + <!-- <gazebomodel type="directory" path="./resources/input/bot_description/" /> --> + <!-- Path to all available .urdf.xacro files. --> + <!-- Files with other endings are allowed and will be ignored. --> + <urdfmodel type="directory" path="./../../sim/turtlebot3/turtlebot3/turtlebot3_description/urdf_raw_for_testing/" /> </input> <output> <!-- Path to and name of the generated .gazebo.xacro file. --> <gazebomodel type="file" name="bot.gazebo.xacro" path="./../../../build/sim/" /> + <!-- Path to and name of the generated .urdf.xacro file. --> + <urdfmodel type="file" name="bot.urdf.xacro" path="./../../../build/sim/" /> <!-- Path to and name of the file stating the selected bots name. --> <botname type="file" name="botname.txt" path="./../../../build/sim/" /> </output> diff --git a/src/var/FeatureModelImplGenerator/modelsetup.config b/src/var/FeatureModelImplGenerator/modelsetup.config index 679684d..c9861ed 100644 --- a/src/var/FeatureModelImplGenerator/modelsetup.config +++ b/src/var/FeatureModelImplGenerator/modelsetup.config @@ -6,10 +6,12 @@ <!-- Path to and name of model template for Feature IDE. --> <model type="file" name="modelTemplate.xml" path="./../FeatureModelConfigurator/resources/input/" /> <!-- Path to all available sensor configuration files. --> + <!-- Only sensor configuration files are allowed inside this directory! --> <sensorconfig type="directory" path="./../FeatureModelConfigurator/resources/input/sensorconfig/" /> <!-- Path to all available .gazebo.xacro files. --> - <gazebomodel type="directory" path="./../FeatureModelConfigurator/resources/input/bot_description/" /> - <!-- <gazebomodel type="directory" path="./../../sim/bot_description/" /> --> + <!-- Files with other endings are allowed and will be ignored. --> + <gazebomodel type="directory" path="./../../sim/turtlebot3/turtlebot3/turtlebot3_description/urdf/" /> + <!-- <gazebomodel type="directory" path="./../FeatureModelConfigurator/resources/input/bot_description/" /> --> </input> <output> <!-- Path to and name of the generated Feature IDE model file. --> -- GitLab