Changeset 10:88492250e4aa in finroc_projects_crash_course


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • CrashCourse.finroc

    r0 r10  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <FinstructableGroup defaultname="CrashCourse" dependencies="finroc_projects_crash_course, finroc_projects_crash_course_control"> 
     2<Finstructable defaultname="CrashCourse" dependencies="finroc_projects_crash_course, finroc_projects_crash_course_control"> 
    33  <element name="Simulation" group="finroc_projects_crash_course" type="Simulation"> 
    44    <parameters/> 
     
    1515  <parameter link="Simulation/AddNoise Front/Parameters/Standard Deviation" config="/noiselevel" cmdline="front-noise"/> 
    1616  <parameter link="Simulation/AddNoise Rear/Parameters/Standard Deviation" config="/noiselevel"/> 
    17 </FinstructableGroup> 
     17</Finstructable> 
  • control/gControl.h.xml

    r0 r10  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <FinstructableGroup dependencies="finroc_projects_crash_course_control"> 
     2<Finstructable dependencies="finroc_projects_crash_course_control"> 
    33  <element name="NoiseFilter Front" group="finroc_projects_crash_course_control" type="NoiseFilter"> 
    44    <parameters/> 
     
    99  <edge src="Sensor Input/Ir Distance Front" dest="NoiseFilter Front/Input/Input"/> 
    1010  <edge src="Sensor Input/Ir Distance Rear" dest="NoiseFilter Rear/Input/Input"/> 
    11 </FinstructableGroup> 
     11</Finstructable> 
  • gSimulation.h.xml

    r8 r10  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <FinstructableGroup dependencies="finroc_projects_crash_course"> 
     2<Finstructable dependencies="finroc_projects_crash_course"> 
    33  <element name="AddNoise Rear" group="finroc_projects_crash_course" type="AddNoise"> 
    44    <parameters/> 
     
    66  <edge src="MainSimulation/Sensor Output/Ir Distance Rear" dest="AddNoise Rear/Input/Input"/> 
    77  <edge src="AddNoise Rear/Output/Output" dest="Sensor Output/Ir Distance Rear"/> 
    8 </FinstructableGroup> 
     8</Finstructable> 
  • mAddNoise.cpp

    r9 r10  
    7171// mAddNoise constructor 
    7272//---------------------------------------------------------------------- 
    73 mAddNoise::mAddNoise(finroc::core::tFrameworkElement *parent, const std::string &name) 
    74   : tModule(parent, name), 
     73mAddNoise::mAddNoise(core::tFrameworkElement *parent, const std::string &name) 
     74  : tModule(parent, name, false), 
    7575    standard_deviation(0.05), 
    7676    normal_distribution(0, 0.05), 
  • mMainSimulation.cpp

    r8 r10  
    7373// mMainSimulation constructor 
    7474//---------------------------------------------------------------------- 
    75 mMainSimulation::mMainSimulation(finroc::core::tFrameworkElement *parent, const std::string &name) : 
    76   tSenseControlModule(parent, name), 
     75mMainSimulation::mMainSimulation(core::tFrameworkElement *parent, const std::string &name) : 
     76  tSenseControlModule(parent, name, false), 
    7777  max_acceleration(0.3), 
    7878  destructive_collision_speed(0.9), 
Note: See TracChangeset for help on using the changeset viewer.