[openrtm-commit:02356] r2905 - in branches/FSM4RTC/OpenRTM-aist: . examples examples/StaticFsm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-01-31 10:39:01 +0900 (Tue, 31 Jan 2017)
New Revision: 2905

Modified:
   branches/FSM4RTC/OpenRTM-aist/configure.ac
   branches/FSM4RTC/OpenRTM-aist/examples/Makefile.am
   branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/Microwave.h
   branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp
Log:
[FSM4RTC,example] StaticFsm sample which is for new Static FSM framework has been added. refs #3655

Modified: branches/FSM4RTC/OpenRTM-aist/configure.ac
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/configure.ac	2017-01-30 05:43:42 UTC (rev 2904)
+++ branches/FSM4RTC/OpenRTM-aist/configure.ac	2017-01-31 01:39:01 UTC (rev 2905)
@@ -1681,9 +1681,11 @@
 	examples/SeqIO/Makefile
 	examples/SimpleService/Makefile
 	examples/ExtTrigger/Makefile
+	examples/MultiInPort/Makefile
 	examples/Templates/Makefile
 	examples/tests/Makefile
 	examples/Fsm/Makefile
+	examples/StaticFsm/Makefile
 	docs/Makefile
 	win32/Makefile
 	win32/OpenRTM-aist/Makefile

Modified: branches/FSM4RTC/OpenRTM-aist/examples/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/Makefile.am	2017-01-30 05:43:42 UTC (rev 2904)
+++ branches/FSM4RTC/OpenRTM-aist/examples/Makefile.am	2017-01-31 01:39:01 UTC (rev 2905)
@@ -8,10 +8,10 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger Fsm StaticFsm Templates @UNITTEST@
+SUBDIRS = Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger Fsm StaticFsm MultiInPort Templates @UNITTEST@
 
 EXTRA_DIST =               \
 	rtc.vcproj.yaml    \
 	rtcdll.vcproj.yaml
 
-DIST_SUBDIRS = Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger AutoTest Fsm StaticFsm Templates tests
+DIST_SUBDIRS = Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger AutoTest Fsm StaticFsm MultiInPort Templates tests

Modified: branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/Microwave.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/Microwave.h	2017-01-30 05:43:42 UTC (rev 2904)
+++ branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/Microwave.h	2017-01-31 01:39:01 UTC (rev 2905)
@@ -17,8 +17,6 @@
 #include <rtm/DataInPort.h>
 #include <rtm/DataOutPort.h>
 #include <rtm/EventPort.h>
-#include <rtm/ConnectorListener.h>
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 
 #include "MicrowaveFsm.h"
 
@@ -124,7 +122,7 @@
   // EventPort declaration
   // <rtc-template block="event_declare">
   
-  EventInPort< Macho::Machine<MicrowaveFsm::Top> > m_eventIn;
+  EventInPort< RTC::Machine<MicrowaveFsm::Top> > m_eventIn;
   // </rtc-template>
 
  private:

Modified: branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp	2017-01-30 05:43:42 UTC (rev 2904)
+++ branches/FSM4RTC/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp	2017-01-31 01:39:01 UTC (rev 2905)
@@ -6,9 +6,7 @@
 
 
 #include <iostream>
-#include <rtm/Macho.h>
 #include "MicrowaveFsm.h"
-#include "Microwave.h"
 
 namespace MicrowaveFsm
 {