[openrtm-commit:02187] r892 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC: . idl/fsm4rtc

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-12-22 15:00:21 +0900 (Thu, 22 Dec 2016)
New Revision: 892

Added:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/idl/fsm4rtc/ExtendedFsmService.idl
Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
Log:
[FSM4RTC]Added ExtendedFsmService.idl for FSM4RTC.

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-12-22 04:21:32 UTC (rev 891)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-12-22 06:00:21 UTC (rev 892)
@@ -102,6 +102,7 @@
 	<property name="idl.ManipulatorCommonInterface_Middle" value="${idl.path}/ManipulatorCommonInterface_Middle.idl" />
 	<property name="idl.SharedMemory" value="${idl.path}/SharedMemory.idl" />
 	<property name="idl.RTC_ComponentObserver" value="${idl.path}/fsm4rtc/ComponentObserver.idl" />
+	<property name="idl.ExtendedFsmService" value="${idl.path}/fsm4rtc/ExtendedFsmService.idl" />
 
 	<property name="idl.test.CorbaConsumer" value="${idl.path.tests}/CorbaConsumer/Hello.idl" />
 
@@ -344,6 +345,10 @@
 		</exec>
 
 		<exec executable="${java.home}\..\bin\idlj">
+			<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.ExtendedFsmService}"/>
+		</exec>
+
+		<exec executable="${java.home}\..\bin\idlj">
 			<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.Logger}"/>
 		</exec>
 
@@ -715,6 +720,7 @@
 			-->
 			<test name="jp.go.aist.rtm.RTC.NamingManagerTest"/>
 			<!--
+			<test name="jp.go.aist.rtm.RTC.RTC.ComponentObserverConsumerTest"/>
 			<batchtest todir="${build.dir.test}/reports">
 				<fileSet dir="${build.dir.test}">
 					<include name="jp/go/aist/rtm/RTC/*Tests.class" />

Added: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/idl/fsm4rtc/ExtendedFsmService.idl
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/idl/fsm4rtc/ExtendedFsmService.idl	                        (rev 0)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/idl/fsm4rtc/ExtendedFsmService.idl	2016-12-22 06:00:21 UTC (rev 892)
@@ -0,0 +1,37 @@
+#ifndef _EXTENDED_FSM_SERVICE_IDL_
+#define _EXTENDED_FSM_SERVICE_IDL_
+
+#include <RTC.idl>
+
+#pragma prefix "omg.org"
+
+module RTC
+{
+    struct FsmEventProfile
+    {
+        string name;
+        string data_type;
+    };
+    #pragma version FsmEventProfile 1.0
+    typedef sequence<FsmEventProfile> FsmEventProfileList;
+
+    struct FsmStructure
+    {
+        string name;
+        string structure;
+        FsmEventProfileList event_profiles;
+        NVList properties;
+    };
+    #pragma version FsmStructure 1.0
+
+    interface ExtendedFsmService : SDOPackage::SDOService
+    {
+        string get_current_state();
+        ReturnCode_t set_fsm_structure(in FsmStructure fsm_structure);
+        ReturnCode_t get_fsm_structure(out FsmStructure fsm_structure);
+    };
+    #pragma version ExtendedFsmService 1.0
+};
+
+#endif // _EXTENDED_FSM_SERVICE_IDL_
+