[openrtm-commit:02027] r2766 - branches/FSM4RTC/OpenRTM-aist/examples/Fsm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-10-07 14:46:59 +0900 (Fri, 07 Oct 2016)
New Revision: 2766

Removed:
   branches/FSM4RTC/OpenRTM-aist/examples/Fsm/.deps/
Modified:
   branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Fsm.cc
   branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Makefile.am
   branches/FSM4RTC/OpenRTM-aist/examples/Fsm/rtc.conf
Log:
[FSM4RTC,2.0] Fsm component build complete, but it still has some bugs.  refs #3655

Modified: branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Fsm.cc
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Fsm.cc	2016-10-07 05:42:00 UTC (rev 2765)
+++ branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Fsm.cc	2016-10-07 05:46:59 UTC (rev 2766)
@@ -51,14 +51,14 @@
 
 RTC::ReturnCode_t Fsm::onInitialize() {
   getInstanceName();
-//  addInPort("EvConfig", in_port_ev_config_);
-//  addInPort("EvInFocus", in_port_ev_in_focus_);
-//  addInPort("EvOff", in_port_ev_off_);
-//  addInPort("EvOn", in_port_ev_on_);
-//  addInPort("EvShutterFull", in_port_ev_shutter_full_);
-//  addInPort("EvShutterHalf", in_port_ev_shutter_half_);
-//  addInPort("EvShutterReleased", in_port_ev_shutter_released_);
-//  addOutPort("out", out_port_out_);
+  addInPort("EvConfig", in_port_ev_config_);
+  addInPort("EvInFocus", in_port_ev_in_focus_);
+  addInPort("EvOff", in_port_ev_off_);
+  addInPort("EvOn", in_port_ev_on_);
+  addInPort("EvShutterFull", in_port_ev_shutter_full_);
+  addInPort("EvShutterHalf", in_port_ev_shutter_half_);
+  addInPort("EvShutterReleased", in_port_ev_shutter_released_);
+  addOutPort("out", out_port_out_);
 
   Top::set_component(this);
   machine_ = new hrtm::sc::Machine<Top>(new Top::Data());

Modified: branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Makefile.am	2016-10-07 05:42:00 UTC (rev 2765)
+++ branches/FSM4RTC/OpenRTM-aist/examples/Fsm/Makefile.am	2016-10-07 05:46:59 UTC (rev 2766)
@@ -24,18 +24,22 @@
 Fsm_la_SOURCES = Fsm.cc Fsm.h camera.cc camera.h camera_functions.cc camera_functions.h
 Fsm_la_LDFLAGS = -module
 Fsm_la_FLAGS   = -L$(top_builddir)/src/lib/rtm/.lib
-Fsm_la_LIBADD  = $(top_builddir)/src/lib/rtm/libRTC.la \
+Fsm_la_LIBADD  = -lPocoFoundation \
+	$(top_builddir)/src/lib/hrtm/libHRTM.la \
+	$(top_builddir)/src/lib/rtm/libRTC.la  \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la
 
 # Standalone RTCs
 example_PROGRAMS = FsmComp
-example_DATA = rtc.conf fsm.conf
+example_DATA = rtc.conf
 
 FsmComp_SOURCES = FsmMain.cc
 FsmComp_DEPENDENCIES = Fsm.la
 FsmComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-FsmComp_LDADD   =  Fsm.o \
-	$(top_builddir)/src/lib/rtm/libRTC.la \
+FsmComp_LDADD   =  Fsm.o camera.o camera_functions.o \
+	-lPocoFoundation \
+	$(top_builddir)/src/lib/hrtm/libHRTM.la \
+	$(top_builddir)/src/lib/rtm/libRTC.la  \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la
 
 # Example sources

Modified: branches/FSM4RTC/OpenRTM-aist/examples/Fsm/rtc.conf
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/Fsm/rtc.conf	2016-10-07 05:42:00 UTC (rev 2765)
+++ branches/FSM4RTC/OpenRTM-aist/examples/Fsm/rtc.conf	2016-10-07 05:46:59 UTC (rev 2766)
@@ -3,6 +3,7 @@
 
 exec_cxt.periodic.rate: 1.0
 
-logger.enable: NO
+logger.enable: YES
+logger.log_level: PARANOID
 logging.loggers.root.level: trace
 logging.loggers.HRTM.level: trace