[openrtm-commit:01236] r2431 - in branches/work_ForDoil/OpenRTM-aist/src/lib: doil/utils/omniidl_be/tests rtc/corba/idl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 2月 11日 (火) 14:00:15 JST
Author: win-ei
Date: 2014-02-11 14:00:15 +0900 (Tue, 11 Feb 2014)
New Revision: 2431
Modified:
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/BasicDataType.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/DataPort.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OpenRTM.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTC.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOPackage.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/BasicDataType.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/DataPort.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/OpenRTM.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/RTC.idl
branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/SDOPackage.idl
Log:
Updated Idl files
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/BasicDataType.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/BasicDataType.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/BasicDataType.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -12,7 +12,7 @@
* Advanced Industrial Science and Technology (AIST), Japan
* All rights reserved.
*
- * $Id: BasicDataType.idl 990 2008-10-29 06:30:09Z n-ando $
+ * $Id: BasicDataType.idl 1580 2009-12-07 08:54:10Z kurihara $
*
*/
@@ -77,6 +77,12 @@
char data;
};
+ struct TimedWChar
+ {
+ Time tm;
+ wchar data;
+ };
+
struct TimedBoolean
{
Time tm;
@@ -96,6 +102,13 @@
};
+ struct TimedWString
+ {
+ Time tm;
+ wstring data;
+ };
+
+
/*!
* Sequence data type
*/
@@ -141,6 +154,12 @@
sequence<char> data;
};
+ struct TimedWCharSeq
+ {
+ Time tm;
+ sequence<wchar> data;
+ };
+
struct TimedBooleanSeq
{
Time tm;
@@ -159,6 +178,12 @@
sequence<string> data;
};
+ struct TimedWStringSeq
+ {
+ Time tm;
+ sequence<wstring> data;
+ };
+
};
#endif // end of BasicDataType_idl
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/DataPort.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/DataPort.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/DataPort.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -14,25 +14,35 @@
*
* All rights reserved.
*
- * $Id: DataPort.idl 990 2008-10-29 06:30:09Z n-ando $
+ * $Id: DataPort.idl 1597 2009-12-22 02:26:17Z n-ando $
*
*/
#ifndef DataInPort_idl
#define DataInPort_idl
-module RTC
+module OpenRTM
{
- interface InPortAny
+ enum PortStatus
{
- void put(in any data);
+ PORT_OK,
+ PORT_ERROR,
+ BUFFER_FULL,
+ BUFFER_EMPTY,
+ BUFFER_TIMEOUT,
+ UNKNOWN_ERROR
};
+ typedef sequence<octet> CdrData;
- interface OutPortAny
+ interface InPortCdr
{
- any get();
+ PortStatus put(in CdrData data);
};
+ interface OutPortCdr
+ {
+ PortStatus get(out CdrData data);
+ };
};
#endif
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OpenRTM.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OpenRTM.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OpenRTM.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -12,7 +12,7 @@
* Advanced Industrial Science and Technology (AIST), Japan
* All rights reserved.
*
- * $Id: OpenRTM.idl 990 2008-10-29 06:30:09Z n-ando $
+ * $Id: OpenRTM.idl 1338 2009-05-18 05:58:25Z n-ando $
*
*/
@@ -28,33 +28,33 @@
{
};
- interface FiniteStateMachineComponent
- : RTC::RTObject, RTC::FsmParticipant
- {
- };
+// interface FiniteStateMachineComponent
+// : RTC::RTObject, RTC::FsmParticipant
+// {
+// };
+//
+// interface DataFlowFiniteStateMachineComponent
+// : RTC::RTObject, RTC::DataFlowComponent, RTC::FsmParticipant
+// {
+// };
+//
+// interface DataFlowMultiModeComponent
+// : RTC::RTObject, RTC::DataFlowComponent, RTC::MultiModeObject
+// {
+// };
+//
+// interface FiniteStateMachineMultiModeComponent
+// : RTC::RTObject, RTC::FsmParticipant, RTC::MultiModeObject
+// {
+// };
+//
+// interface DataFlowFiniteStateMachineMultiModeComponent
+// : RTC::RTObject, RTC::DataFlowComponent,
+// RTC::FsmParticipant, RTC::MultiModeObject
+// {
+// };
- interface DataFlowFiniteStateMachineComponent
- : RTC::RTObject, RTC::DataFlowComponent, RTC::FsmParticipant
- {
- };
- interface DataFlowMultiModeComponent
- : RTC::RTObject, RTC::DataFlowComponent, RTC::MultiModeObject
- {
- };
-
- interface FiniteStateMachineMultiModeComponent
- : RTC::RTObject, RTC::FsmParticipant, RTC::MultiModeObject
- {
- };
-
- interface DataFlowFiniteStateMachineMultiModeComponent
- : RTC::RTObject, RTC::DataFlowComponent,
- RTC::FsmParticipant, RTC::MultiModeObject
- {
- };
-
-
interface ExtTrigExecutionContextService
: RTC::ExecutionContextService
{
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTC.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTC.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTC.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -1,5 +1,8 @@
// RTC.idl
+#ifndef RTC_IDL
+#define RTC_IDL
+
#include "SDOPackage.idl"
#pragma prefix "omg.org"
@@ -2647,3 +2650,4 @@
};
};
+#endif // RTC_IDL
\ No newline at end of file
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOPackage.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOPackage.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOPackage.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -1,5 +1,5 @@
//Platform Independent Model (PIM) and Platform Specific Model (PSM)
-//for Super Distributed Objects (SDO) Specification, v1.0 - OMG IDL Summary File
+//for Super Distributed Objects (SDO) Specification, v1.1 - OMG IDL Summary File
//Object Management Group, Inc.
//Copyright (c) 2003, Fraunhofer FOKUS
//Copyright (c) 2003, Hitachi, Ltd.
@@ -21,6 +21,10 @@
//their own code, or use it for documentation purposes. Having the code lines
//available electronically means there is less likelihood of a transcription
//error.
+//
+// ver 1.0 formal/2004-11-02
+// ver 1.1 (RTF report: dtc/2008-03-05)
+//
//SDOPackage.idl
#ifndef _SDO_PACKAGE_IDL_
@@ -32,9 +36,7 @@
#ifdef USE_MONITORING
#include <CosNotifyComm.idl>
#endif
-#ifndef ORBIT2_IDL
-#define TypeCode CORBA::TypeCode
-#endif
+
/** CORBA specific model for SDOs */
#pragma prefix "org.omg"
@@ -48,7 +50,7 @@
interface Configuration;
interface Monitoring;
interface Organization;
-
+
/** ------- Data Types -------*/
typedef sequence<string> StringList;
typedef sequence<SDO> SDOList;
@@ -57,18 +59,18 @@
struct NameValue
{
- string name;
- any value;
+ string name;
+ any value;
};
typedef sequence<NameValue> NVList;
enum NumericType
{
- SHORT_TYPE,
- LONG_TYPE,
- FLOAT_TYPE,
- DOUBLE_TYPE
+ SHORT_TYPE,
+ LONG_TYPE,
+ FLOAT_TYPE,
+ DOUBLE_TYPE
};
union Numeric switch (NumericType)
@@ -81,211 +83,214 @@
struct EnumerationType
{
- StringList enumerated_values;
+ StringList enumerated_values;
};
struct RangeType
{
- Numeric min;
- Numeric max;
- boolean min_inclusive;
- boolean max_inclusive;
+ Numeric min;
+ Numeric max;
+ boolean min_inclusive;
+ boolean max_inclusive;
};
struct IntervalType
{
- Numeric min;
- Numeric max;
- boolean min_inclusive;
- boolean max_inclusive;
- Numeric step;
+ Numeric min;
+ Numeric max;
+ boolean min_inclusive;
+ boolean max_inclusive;
+ Numeric step;
};
enum ComplexDataType
{
- ENUMERATION, RANGE, INTERVAL
+ ENUMERATION, RANGE, INTERVAL
};
union AllowedValues switch (ComplexDataType)
{
- case ENUMERATION: EnumerationType allowed_enum;
- case INTERVAL: IntervalType allowed_interval;
- case RANGE: RangeType allowed_range;
+ case ENUMERATION: EnumerationType allowed_enum;
+ case INTERVAL: IntervalType allowed_interval;
+ case RANGE: RangeType allowed_range;
};
struct Parameter
{
- string name;
- TypeCode type;
- AllowedValues allowed_values;
+ string name;
+#ifdef __ORBIT_IDL__
+ TypeCode type;
+#else
+ CORBA::TypeCode type;
+#endif
+ AllowedValues allowed_values;
};
typedef sequence<Parameter> ParameterList;
struct OrganizationProperty
{
- NVList properties;
+ NVList properties;
};
-
enum DependencyType
{
- OWN,
- OWNED,
- NO_DEPENDENCY
+ OWN,
+ OWNED,
+ NO_DEPENDENCY
};
-
+
struct DeviceProfile
{
- string device_type;
- string manufacturer;
- string model;
- string version;
- NVList properties;
+ string device_type;
+ string manufacturer;
+ string model;
+ string version;
+ NVList properties;
};
struct ServiceProfile
{
- string id;
- string interface_type;
- NVList properties;
- SDOService service;
+ string id;
+ string interface_type;
+ NVList properties;
+ SDOService service;
};
typedef sequence <ServiceProfile> ServiceProfileList;
struct ConfigurationSet
{
- string id;
- string description;
- NVList configuration_data;
+ string id;
+ string description;
+ NVList configuration_data;
};
typedef sequence<ConfigurationSet> ConfigurationSetList;
-
+
+
/** ------- Exceptions -------*/
- exception NotAvailable exception_body;
+ exception NotAvailable exception_body;
exception InterfaceNotImplemented exception_body;
- exception InvalidParameter exception_body;
- exception InternalError exception_body;
-
+ exception InvalidParameter exception_body;
+ exception InternalError exception_body;
+
/** ------- Interfaces -------*/
interface SDOSystemElement
{
- OrganizationList get_owned_organizations()
- raises (NotAvailable);
+ OrganizationList get_owned_organizations()
+ raises (NotAvailable,InternalError);
};
-
interface SDO : SDOSystemElement
{
- UniqueIdentifier get_sdo_id()
- raises (NotAvailable, InternalError);
- string get_sdo_type()
- raises (NotAvailable, InternalError);
- DeviceProfile get_device_profile ()
- raises (NotAvailable, InternalError);
- ServiceProfileList get_service_profiles ()
- raises (NotAvailable, InternalError);
- ServiceProfile get_service_profile (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOService get_sdo_service (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- Configuration get_configuration ()
- raises (InterfaceNotImplemented, NotAvailable, InternalError);
- Monitoring get_monitoring ()
- raises (InterfaceNotImplemented, NotAvailable, InternalError);
- OrganizationList get_organizations ()
- raises (NotAvailable, InternalError);
- NVList get_status_list ()
- raises (NotAvailable, InternalError);
- any get_status (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
+ UniqueIdentifier get_sdo_id()
+ raises (NotAvailable, InternalError);
+ string get_sdo_type()
+ raises (NotAvailable, InternalError);
+ DeviceProfile get_device_profile ()
+ raises (NotAvailable, InternalError);
+ ServiceProfileList get_service_profiles ()
+ raises (NotAvailable, InternalError);
+ ServiceProfile get_service_profile (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOService get_sdo_service (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ Configuration get_configuration ()
+ raises (InterfaceNotImplemented, NotAvailable, InternalError);
+ Monitoring get_monitoring ()
+ raises (InterfaceNotImplemented, NotAvailable, InternalError);
+ OrganizationList get_organizations ()
+ raises (NotAvailable, InternalError);
+ NVList get_status_list ()
+ raises (NotAvailable, InternalError);
+ any get_status (in string nme)
+ raises (InvalidParameter, NotAvailable, InternalError);
};
-
+
+
interface Configuration
{
- boolean set_device_profile (in DeviceProfile dProfile)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_service_profile (in ServiceProfile sProfile)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean add_organization (in Organization org)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_service_profile (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_organization (in UniqueIdentifier organization_id)
- raises (InvalidParameter, NotAvailable, InternalError);
- ParameterList get_configuration_parameters ()
- raises (NotAvailable, InternalError);
- NVList get_configuration_parameter_values ()
- raises (NotAvailable, InternalError);
- any get_configuration_parameter_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_configuration_parameter (in string name,
- in any value)
- raises (InvalidParameter, NotAvailable, InternalError);
- ConfigurationSetList get_configuration_sets ()
- raises (NotAvailable, InternalError);
- ConfigurationSet get_configuration_set (in UniqueIdentifier config_id)
- raises (NotAvailable, InternalError);
- boolean set_configuration_set_values (in UniqueIdentifier config_id,
- in ConfigurationSet configuration_set)
- raises (InvalidParameter, NotAvailable, InternalError);
- ConfigurationSet get_active_configuration_set ()
- raises (NotAvailable, InternalError);
- boolean add_configuration_set (in ConfigurationSet configuration_set)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_configuration_set (in UniqueIdentifier config_id)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean activate_configuration_set (in UniqueIdentifier config_id)
- raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_device_profile (in DeviceProfile dProfile)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_service_profile (in ServiceProfile sProfile)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_organization (in Organization organization_object)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_service_profile (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_organization (in UniqueIdentifier organization_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ParameterList get_configuration_parameters ()
+ raises (NotAvailable, InternalError);
+ NVList get_configuration_parameter_values ()
+ raises (NotAvailable, InternalError);
+ any get_configuration_parameter_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_configuration_parameter (in string name,
+ in any value)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ConfigurationSetList get_configuration_sets ()
+ raises (NotAvailable, InternalError);
+ ConfigurationSet get_configuration_set (in UniqueIdentifier config_id)
+ raises (NotAvailable, InternalError);
+ boolean set_configuration_set_values (in ConfigurationSet configuration_set)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ConfigurationSet get_active_configuration_set ()
+ raises (NotAvailable, InternalError);
+ boolean add_configuration_set (in ConfigurationSet configuration_set)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_configuration_set (in UniqueIdentifier config_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean activate_configuration_set (in UniqueIdentifier config_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
};
-
+
+
#ifdef USE_MONITORING
interface Monitoring : CosNotifyComm::StructuredPushConsumer,
- CosNotifyComm::StructuredPushSupplier
+ CosNotifyComm::StructuredPushSupplier
{
- any get_monitoring_parameter_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- ParameterList get_monitoring_parameters ()
- raises (NotAvailable, InternalError);
- NVList get_monitoring_parameter_values ()
- raises (NotAvailable, InternalError);
+ any get_monitoring_parameter_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ParameterList get_monitoring_parameters ()
+ raises (NotAvailable, InternalError);
+ NVList get_monitoring_parameter_values ()
+ raises (NotAvailable, InternalError);
};
#else
interface Monitoring {};
#endif
interface SDOService {};
-
+
interface Organization
{
- UniqueIdentifier get_organization_id ()
- raises (InvalidParameter, NotAvailable, InternalError);
- OrganizationProperty get_organization_property ()
- raises (NotAvailable, InternalError);
- any get_organization_property_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_organization_property (in OrganizationProperty organization_property)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_organization_property_value (in string name,
- in any value )
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_organization_property ( in string name )
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOSystemElement get_owner ()
- raises (NotAvailable, InternalError);
- boolean set_owner (in SDOSystemElement sdo)
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOList get_members ()
- raises (NotAvailable, InternalError);
- boolean set_members (in SDOList sdos)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean add_members ( in SDOList sdo_list)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_member (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- DependencyType get_dependency()
- raises (NotAvailable, InternalError);
- boolean set_dependency (in DependencyType dependency)
- raises (NotAvailable, InternalError);
+ UniqueIdentifier get_organization_id ()
+ raises (InvalidParameter, NotAvailable, InternalError);
+ OrganizationProperty get_organization_property ()
+ raises (NotAvailable, InternalError);
+ any get_organization_property_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_organization_property (in OrganizationProperty organization_property)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_organization_property_value (in string name,
+ in any value)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_organization_property ( in string name )
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOSystemElement get_owner ()
+ raises (NotAvailable, InternalError);
+ boolean set_owner (in SDOSystemElement sdo)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOList get_members ()
+ raises (NotAvailable, InternalError);
+ boolean set_members (in SDOList sdos)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_members ( in SDOList sdo_list)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_member (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ DependencyType get_dependency()
+ raises (NotAvailable, InternalError);
+ boolean set_dependency (in DependencyType dependency)
+ raises (NotAvailable, InternalError);
};
};
-
#endif //_SDO_PACKAGE_IDL_
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/BasicDataType.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/BasicDataType.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/BasicDataType.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -77,6 +77,12 @@
char data;
};
+ struct TimedWChar
+ {
+ Time tm;
+ wchar data;
+ };
+
struct TimedBoolean
{
Time tm;
@@ -96,6 +102,13 @@
};
+ struct TimedWString
+ {
+ Time tm;
+ wstring data;
+ };
+
+
/*!
* Sequence data type
*/
@@ -141,6 +154,12 @@
sequence<char> data;
};
+ struct TimedWCharSeq
+ {
+ Time tm;
+ sequence<wchar> data;
+ };
+
struct TimedBooleanSeq
{
Time tm;
@@ -159,6 +178,12 @@
sequence<string> data;
};
+ struct TimedWStringSeq
+ {
+ Time tm;
+ sequence<wstring> data;
+ };
+
};
#endif // end of BasicDataType_idl
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/DataPort.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/DataPort.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/DataPort.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -21,18 +21,28 @@
#ifndef DataInPort_idl
#define DataInPort_idl
-module RTC
+module OpenRTM
{
- interface InPortAny
+ enum PortStatus
{
- void put(in any data);
+ PORT_OK,
+ PORT_ERROR,
+ BUFFER_FULL,
+ BUFFER_EMPTY,
+ BUFFER_TIMEOUT,
+ UNKNOWN_ERROR
};
+ typedef sequence<octet> CdrData;
- interface OutPortAny
+ interface InPortCdr
{
- any get();
+ PortStatus put(in CdrData data);
};
+ interface OutPortCdr
+ {
+ PortStatus get(out CdrData data);
+ };
};
#endif
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/OpenRTM.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/OpenRTM.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/OpenRTM.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -28,33 +28,33 @@
{
};
- interface FiniteStateMachineComponent
- : RTC::RTObject, RTC::FsmParticipant
- {
- };
+// interface FiniteStateMachineComponent
+// : RTC::RTObject, RTC::FsmParticipant
+// {
+// };
+//
+// interface DataFlowFiniteStateMachineComponent
+// : RTC::RTObject, RTC::DataFlowComponent, RTC::FsmParticipant
+// {
+// };
+//
+// interface DataFlowMultiModeComponent
+// : RTC::RTObject, RTC::DataFlowComponent, RTC::MultiModeObject
+// {
+// };
+//
+// interface FiniteStateMachineMultiModeComponent
+// : RTC::RTObject, RTC::FsmParticipant, RTC::MultiModeObject
+// {
+// };
+//
+// interface DataFlowFiniteStateMachineMultiModeComponent
+// : RTC::RTObject, RTC::DataFlowComponent,
+// RTC::FsmParticipant, RTC::MultiModeObject
+// {
+// };
- interface DataFlowFiniteStateMachineComponent
- : RTC::RTObject, RTC::DataFlowComponent, RTC::FsmParticipant
- {
- };
- interface DataFlowMultiModeComponent
- : RTC::RTObject, RTC::DataFlowComponent, RTC::MultiModeObject
- {
- };
-
- interface FiniteStateMachineMultiModeComponent
- : RTC::RTObject, RTC::FsmParticipant, RTC::MultiModeObject
- {
- };
-
- interface DataFlowFiniteStateMachineMultiModeComponent
- : RTC::RTObject, RTC::DataFlowComponent,
- RTC::FsmParticipant, RTC::MultiModeObject
- {
- };
-
-
interface ExtTrigExecutionContextService
: RTC::ExecutionContextService
{
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/RTC.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/RTC.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/RTC.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -1,5 +1,8 @@
// RTC.idl
+#ifndef RTC_IDL
+#define RTC_IDL
+
#include "SDOPackage.idl"
#pragma prefix "omg.org"
@@ -2647,3 +2650,4 @@
};
};
+#endif // RTC_IDL
\ No newline at end of file
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/SDOPackage.idl
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/SDOPackage.idl 2014-02-10 15:31:19 UTC (rev 2430)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/rtc/corba/idl/SDOPackage.idl 2014-02-11 05:00:15 UTC (rev 2431)
@@ -1,5 +1,5 @@
//Platform Independent Model (PIM) and Platform Specific Model (PSM)
-//for Super Distributed Objects (SDO) Specification, v1.0 - OMG IDL Summary File
+//for Super Distributed Objects (SDO) Specification, v1.1 - OMG IDL Summary File
//Object Management Group, Inc.
//Copyright (c) 2003, Fraunhofer FOKUS
//Copyright (c) 2003, Hitachi, Ltd.
@@ -21,6 +21,10 @@
//their own code, or use it for documentation purposes. Having the code lines
//available electronically means there is less likelihood of a transcription
//error.
+//
+// ver 1.0 formal/2004-11-02
+// ver 1.1 (RTF report: dtc/2008-03-05)
+//
//SDOPackage.idl
#ifndef _SDO_PACKAGE_IDL_
@@ -32,9 +36,7 @@
#ifdef USE_MONITORING
#include <CosNotifyComm.idl>
#endif
-#ifndef ORBIT2_IDL
-#define TypeCode CORBA::TypeCode
-#endif
+
/** CORBA specific model for SDOs */
#pragma prefix "org.omg"
@@ -48,7 +50,7 @@
interface Configuration;
interface Monitoring;
interface Organization;
-
+
/** ------- Data Types -------*/
typedef sequence<string> StringList;
typedef sequence<SDO> SDOList;
@@ -57,18 +59,18 @@
struct NameValue
{
- string name;
- any value;
+ string name;
+ any value;
};
typedef sequence<NameValue> NVList;
enum NumericType
{
- SHORT_TYPE,
- LONG_TYPE,
- FLOAT_TYPE,
- DOUBLE_TYPE
+ SHORT_TYPE,
+ LONG_TYPE,
+ FLOAT_TYPE,
+ DOUBLE_TYPE
};
union Numeric switch (NumericType)
@@ -81,210 +83,214 @@
struct EnumerationType
{
- StringList enumerated_values;
+ StringList enumerated_values;
};
struct RangeType
{
- Numeric min;
- Numeric max;
- boolean min_inclusive;
- boolean max_inclusive;
+ Numeric min;
+ Numeric max;
+ boolean min_inclusive;
+ boolean max_inclusive;
};
struct IntervalType
{
- Numeric min;
- Numeric max;
- boolean min_inclusive;
- boolean max_inclusive;
- Numeric step;
+ Numeric min;
+ Numeric max;
+ boolean min_inclusive;
+ boolean max_inclusive;
+ Numeric step;
};
enum ComplexDataType
{
- ENUMERATION, RANGE, INTERVAL
+ ENUMERATION, RANGE, INTERVAL
};
union AllowedValues switch (ComplexDataType)
{
- case ENUMERATION: EnumerationType allowed_enum;
- case INTERVAL: IntervalType allowed_interval;
- case RANGE: RangeType allowed_range;
+ case ENUMERATION: EnumerationType allowed_enum;
+ case INTERVAL: IntervalType allowed_interval;
+ case RANGE: RangeType allowed_range;
};
struct Parameter
{
- string name;
- TypeCode type;
- AllowedValues allowed_values;
+ string name;
+#ifdef __ORBIT_IDL__
+ TypeCode type;
+#else
+ CORBA::TypeCode type;
+#endif
+ AllowedValues allowed_values;
};
typedef sequence<Parameter> ParameterList;
struct OrganizationProperty
{
- NVList properties;
+ NVList properties;
};
-
enum DependencyType
{
- OWN,
- OWNED,
- NO_DEPENDENCY
+ OWN,
+ OWNED,
+ NO_DEPENDENCY
};
-
+
struct DeviceProfile
{
- string device_type;
- string manufacturer;
- string model;
- string version;
- NVList properties;
+ string device_type;
+ string manufacturer;
+ string model;
+ string version;
+ NVList properties;
};
struct ServiceProfile
{
- string id;
- string interface_type;
- NVList properties;
- SDOService service;
+ string id;
+ string interface_type;
+ NVList properties;
+ SDOService service;
};
typedef sequence <ServiceProfile> ServiceProfileList;
struct ConfigurationSet
{
- string id;
- string description;
- NVList configuration_data;
+ string id;
+ string description;
+ NVList configuration_data;
};
typedef sequence<ConfigurationSet> ConfigurationSetList;
-
+
+
/** ------- Exceptions -------*/
- exception NotAvailable exception_body;
+ exception NotAvailable exception_body;
exception InterfaceNotImplemented exception_body;
- exception InvalidParameter exception_body;
- exception InternalError exception_body;
-
+ exception InvalidParameter exception_body;
+ exception InternalError exception_body;
+
/** ------- Interfaces -------*/
interface SDOSystemElement
{
- OrganizationList get_owned_organizations()
- raises (NotAvailable);
+ OrganizationList get_owned_organizations()
+ raises (NotAvailable,InternalError);
};
-
interface SDO : SDOSystemElement
{
- UniqueIdentifier get_sdo_id()
- raises (NotAvailable, InternalError);
- string get_sdo_type()
- raises (NotAvailable, InternalError);
- DeviceProfile get_device_profile ()
- raises (NotAvailable, InternalError);
- ServiceProfileList get_service_profiles ()
- raises (NotAvailable, InternalError);
- ServiceProfile get_service_profile (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOService get_sdo_service (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- Configuration get_configuration ()
- raises (InterfaceNotImplemented, NotAvailable, InternalError);
- Monitoring get_monitoring ()
- raises (InterfaceNotImplemented, NotAvailable, InternalError);
- OrganizationList get_organizations ()
- raises (NotAvailable, InternalError);
- NVList get_status_list ()
- raises (NotAvailable, InternalError);
- any get_status (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
+ UniqueIdentifier get_sdo_id()
+ raises (NotAvailable, InternalError);
+ string get_sdo_type()
+ raises (NotAvailable, InternalError);
+ DeviceProfile get_device_profile ()
+ raises (NotAvailable, InternalError);
+ ServiceProfileList get_service_profiles ()
+ raises (NotAvailable, InternalError);
+ ServiceProfile get_service_profile (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOService get_sdo_service (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ Configuration get_configuration ()
+ raises (InterfaceNotImplemented, NotAvailable, InternalError);
+ Monitoring get_monitoring ()
+ raises (InterfaceNotImplemented, NotAvailable, InternalError);
+ OrganizationList get_organizations ()
+ raises (NotAvailable, InternalError);
+ NVList get_status_list ()
+ raises (NotAvailable, InternalError);
+ any get_status (in string nme)
+ raises (InvalidParameter, NotAvailable, InternalError);
};
-
+
+
interface Configuration
{
- boolean set_device_profile (in DeviceProfile dProfile)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_service_profile (in ServiceProfile sProfile)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean add_organization (in Organization org)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_service_profile (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_organization (in UniqueIdentifier organization_id)
- raises (InvalidParameter, NotAvailable, InternalError);
- ParameterList get_configuration_parameters ()
- raises (NotAvailable, InternalError);
- NVList get_configuration_parameter_values ()
- raises (NotAvailable, InternalError);
- any get_configuration_parameter_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_configuration_parameter (in string name,
- in any value)
- raises (InvalidParameter, NotAvailable, InternalError);
- ConfigurationSetList get_configuration_sets ()
- raises (NotAvailable, InternalError);
- ConfigurationSet get_configuration_set (in UniqueIdentifier config_id)
- raises (NotAvailable, InternalError);
- boolean set_configuration_set_values (in UniqueIdentifier config_id,
- in ConfigurationSet configuration_set)
- raises (InvalidParameter, NotAvailable, InternalError);
- ConfigurationSet get_active_configuration_set ()
- raises (NotAvailable, InternalError);
- boolean add_configuration_set (in ConfigurationSet configuration_set)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_configuration_set (in UniqueIdentifier config_id)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean activate_configuration_set (in UniqueIdentifier config_id)
- raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_device_profile (in DeviceProfile dProfile)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_service_profile (in ServiceProfile sProfile)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_organization (in Organization organization_object)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_service_profile (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_organization (in UniqueIdentifier organization_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ParameterList get_configuration_parameters ()
+ raises (NotAvailable, InternalError);
+ NVList get_configuration_parameter_values ()
+ raises (NotAvailable, InternalError);
+ any get_configuration_parameter_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_configuration_parameter (in string name,
+ in any value)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ConfigurationSetList get_configuration_sets ()
+ raises (NotAvailable, InternalError);
+ ConfigurationSet get_configuration_set (in UniqueIdentifier config_id)
+ raises (NotAvailable, InternalError);
+ boolean set_configuration_set_values (in ConfigurationSet configuration_set)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ConfigurationSet get_active_configuration_set ()
+ raises (NotAvailable, InternalError);
+ boolean add_configuration_set (in ConfigurationSet configuration_set)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_configuration_set (in UniqueIdentifier config_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean activate_configuration_set (in UniqueIdentifier config_id)
+ raises (InvalidParameter, NotAvailable, InternalError);
};
-
+
+
#ifdef USE_MONITORING
interface Monitoring : CosNotifyComm::StructuredPushConsumer,
- CosNotifyComm::StructuredPushSupplier
+ CosNotifyComm::StructuredPushSupplier
{
- any get_monitoring_parameter_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- ParameterList get_monitoring_parameters ()
- raises (NotAvailable, InternalError);
- NVList get_monitoring_parameter_values ()
- raises (NotAvailable, InternalError);
+ any get_monitoring_parameter_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ ParameterList get_monitoring_parameters ()
+ raises (NotAvailable, InternalError);
+ NVList get_monitoring_parameter_values ()
+ raises (NotAvailable, InternalError);
};
#else
interface Monitoring {};
#endif
interface SDOService {};
-
+
interface Organization
{
- UniqueIdentifier get_organization_id ()
- raises (InvalidParameter, NotAvailable, InternalError);
- OrganizationProperty get_organization_property ()
- raises (NotAvailable, InternalError);
- any get_organization_property_value (in string name)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_organization_property (in OrganizationProperty organization_property)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean set_organization_property_value (in string name,
- in any value )
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_organization_property ( in string name )
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOSystemElement get_owner ()
- raises (NotAvailable, InternalError);
- boolean set_owner (in SDOSystemElement sdo)
- raises (InvalidParameter, NotAvailable, InternalError);
- SDOList get_members ()
- raises (NotAvailable, InternalError);
- boolean set_members (in SDOList sdos)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean add_members ( in SDOList sdo_list)
- raises (InvalidParameter, NotAvailable, InternalError);
- boolean remove_member (in UniqueIdentifier id)
- raises (InvalidParameter, NotAvailable, InternalError);
- DependencyType get_dependency()
- raises (NotAvailable, InternalError);
- boolean set_dependency (in DependencyType dependency)
- raises (NotAvailable, InternalError);
+ UniqueIdentifier get_organization_id ()
+ raises (InvalidParameter, NotAvailable, InternalError);
+ OrganizationProperty get_organization_property ()
+ raises (NotAvailable, InternalError);
+ any get_organization_property_value (in string name)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_organization_property (in OrganizationProperty organization_property)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean set_organization_property_value (in string name,
+ in any value)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_organization_property ( in string name )
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOSystemElement get_owner ()
+ raises (NotAvailable, InternalError);
+ boolean set_owner (in SDOSystemElement sdo)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ SDOList get_members ()
+ raises (NotAvailable, InternalError);
+ boolean set_members (in SDOList sdos)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean add_members ( in SDOList sdo_list)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ boolean remove_member (in UniqueIdentifier id)
+ raises (InvalidParameter, NotAvailable, InternalError);
+ DependencyType get_dependency()
+ raises (NotAvailable, InternalError);
+ boolean set_dependency (in DependencyType dependency)
+ raises (NotAvailable, InternalError);
};
};
#endif //_SDO_PACKAGE_IDL_
More information about the openrtm-commit
mailing list