Changeset 81:fb166df52fb1 in finroc


Ignore:
Timestamp:
17.12.2010 18:07:53 (9 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Convert:
svn:0d8a5021-5494-44f0-90d4-f209c29a5145/trunk@82
Message:

Adapted to finroc_core rev. 65

Location:
etc/templates
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • etc/templates/FinrocGroup.cpp.template

    r80 r81  
    6767    : tGroup(parent, name), 
    6868 
    69     ci_signal_1(this->RegisterControllerInput(this->ci_signal_1, "Signal 1")), 
    70     ci_signal_2(this->RegisterControllerInput(this->ci_signal_2, "Signal 2")), 
    71  
    72     co_signal_3(this->RegisterControllerOutput(this->co_signal_3, "Signal 3")), 
    73  
    74     si_signal_4(this->RegisterSensorInput(this->si_signal_4, "Signal 4")), 
    75     si_signal_5(this->RegisterSensorInput(this->si_signal_5, "Signal 5")), 
    76  
    77     so_signal_6(this->RegisterSensorOutput(this->so_signal_6, "Signal 6")) 
     69    ci_signal_1(this, "Signal 1") 
    7870{} 
  • etc/templates/FinrocGroup.h.template

    r80 r81  
    4040// External includes (system with <>, local with "") 
    4141//---------------------------------------------------------------------- 
     42#include "core/finstructable/tFinstructableGroup.h" 
     43#include "rrlib/util/patterns/final_class.h" 
    4244 
    4345//---------------------------------------------------------------------- 
     
    6870 *  
    6971 */ 
    70 class g<NAME> : public finroc::core::structure::tGroup 
     72class g<NAME>Impl : public finroc::core::structure::tGroup 
    7173{ 
    72   static finroc::core::tStandardCreateModuleAction<g<NAME>> cCREATE_ACTION; 
     74//---------------------------------------------------------------------- 
     75// Private attributes 
     76//---------------------------------------------------------------------- 
    7377 
    7478//---------------------------------------------------------------------- 
     
    8185public: 
    8286 
    83   g<NAME>(finroc::core::tFrameworkElement *parent, const finroc::util::tString &name = "<NAME>"); 
     87  g<NAME>Impl(finroc::core::tFrameworkElement *parent, const finroc::util::tString &name); 
     88   
     89  tCI<> ci_signal_1; 
     90 
     91}; 
     92 
     93class g<NAME> : public finroc::core::tFinstructableGroup<g<NAME>Impl>, RRLIB_FINAL_CLASS 
     94{ 
     95  static finroc::core::tStandardCreateModuleAction<g<NAME>> cCREATE_ACTION; 
     96 
     97public: 
     98 
     99  g<NAME>Impl(finroc::core::tFrameworkElement *parent, const finroc::util::tString &name = "<NAME>"); 
     100    : finroc::core::tFinstructableGroup<g<NAME>Impl>(parent, name, __FILE__) 
     101  {}; 
    84102 
    85103}; 
  • etc/templates/FinrocModule.cpp.template

    r80 r81  
    6565//---------------------------------------------------------------------- 
    6666m<NAME>::m<NAME>(finroc::core::tFrameworkElement *parent, const finroc::util::tString &name) 
    67     : tModule(parent, name), 
     67    : tSenseControlModule(parent, name), 
    6868 
    69     ci_signal_1(this->RegisterControllerInput(this->ci_signal_1, "Signal 1")), 
    70     ci_signal_2(this->RegisterControllerInput(this->ci_signal_2, "Signal 2")), 
     69    ci_signal_1(this, "Signal 1"), 
     70    ci_signal_2(this, "Signal 2"), 
    7171 
    72     co_signal_3(this->RegisterControllerOutput(this->co_signal_3, "Signal 3")), 
     72    co_signal_3(this, "Signal 3"), 
    7373 
    74     si_signal_4(this->RegisterSensorInput(this->si_signal_4, "Signal 4")), 
    75     si_signal_5(this->RegisterSensorInput(this->si_signal_5, "Signal 5")), 
     74    si_signal_4(this, "Signal 4"), 
     75    si_signal_5(this, "Signal 5"), 
    7676 
    77     so_signal_6(this->RegisterSensorOutput(this->so_signal_6, "Signal 6")) 
     77    so_signal_6(this, "Signal 6"), 
    7878{} 
    7979 
  • etc/templates/FinrocModule.h.template

    r80 r81  
    3535#define <SENTINEL> 
    3636 
    37 #include "core/structure/tModule.h" 
     37#include "core/structure/tSenseControlModule.h" 
    3838 
    3939//---------------------------------------------------------------------- 
     
    6868 *  
    6969 */ 
    70 class m<NAME> : public finroc::core::structure::tModule 
     70class m<NAME> : public finroc::core::structure::tSenseControlModule 
    7171{ 
    7272  static finroc::core::tStandardCreateModuleAction<m<NAME>> cCREATE_ACTION; 
Note: See TracChangeset for help on using the changeset viewer.