Changeset 10:88492250e4aa in finroc_projects_crash_course

Timestamp:

04.11.2014 17:59:13 (8 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Children:

12:b204dab8b951, 14:e5aff35aa969

Phase:

public

Message:

Fixed some inconsistencies that Alex pointed out

Files:

• CrashCourse.finroc (modified) (2 diffs)
• control/gControl.h.xml (modified) (2 diffs)
• gSimulation.h.xml (modified) (2 diffs)
• mAddNoise.cpp (modified) (1 diff)
• mMainSimulation.cpp (modified) (1 diff)

CrashCourse.finroc

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FinstructableGroup defaultname="CrashCourse" dependencies="finroc_projects_crash_course, finroc_projects_crash_course_control">
+<Finstructable defaultname="CrashCourse" dependencies="finroc_projects_crash_course, finroc_projects_crash_course_control">
   <element name="Simulation" group="finroc_projects_crash_course" type="Simulation">
     <parameters/>
@@ -15 +15 @@
   <parameter link="Simulation/AddNoise Front/Parameters/Standard Deviation" config="/noiselevel" cmdline="front-noise"/>
   <parameter link="Simulation/AddNoise Rear/Parameters/Standard Deviation" config="/noiselevel"/>
-</FinstructableGroup>
+</Finstructable>

control/gControl.h.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FinstructableGroup dependencies="finroc_projects_crash_course_control">
+<Finstructable dependencies="finroc_projects_crash_course_control">
   <element name="NoiseFilter Front" group="finroc_projects_crash_course_control" type="NoiseFilter">
     <parameters/>
@@ -9 +9 @@
   <edge src="Sensor Input/Ir Distance Front" dest="NoiseFilter Front/Input/Input"/>
   <edge src="Sensor Input/Ir Distance Rear" dest="NoiseFilter Rear/Input/Input"/>
-</FinstructableGroup>
+</Finstructable>

gSimulation.h.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FinstructableGroup dependencies="finroc_projects_crash_course">
+<Finstructable dependencies="finroc_projects_crash_course">
   <element name="AddNoise Rear" group="finroc_projects_crash_course" type="AddNoise">
     <parameters/>
@@ -6 +6 @@
   <edge src="MainSimulation/Sensor Output/Ir Distance Rear" dest="AddNoise Rear/Input/Input"/>
   <edge src="AddNoise Rear/Output/Output" dest="Sensor Output/Ir Distance Rear"/>
-</FinstructableGroup>
+</Finstructable>

mAddNoise.cpp

@@ -71 +71 @@
 // mAddNoise constructor
 //----------------------------------------------------------------------
-mAddNoise::mAddNoise(finroc::core::tFrameworkElement *parent, const std::string &name)
-  : tModule(parent, name),
+mAddNoise::mAddNoise(core::tFrameworkElement *parent, const std::string &name)
+  : tModule(parent, name, false),
     standard_deviation(0.05),
     normal_distribution(0, 0.05),

mMainSimulation.cpp

@@ -73 +73 @@
 // mMainSimulation constructor
 //----------------------------------------------------------------------
-mMainSimulation::mMainSimulation(finroc::core::tFrameworkElement *parent, const std::string &name) :
-  tSenseControlModule(parent, name),
+mMainSimulation::mMainSimulation(core::tFrameworkElement *parent, const std::string &name) :
+  tSenseControlModule(parent, name, false),
   max_acceleration(0.3),
   destructive_collision_speed(0.9),