[openrtm-commit:01147] r457 - in branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety: bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety src/jp/go/aist/rtm/rtcbuilder/safety/template/safety
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 1月 7日 (火) 19:32:07 JST
Author: win-ei
Date: 2014-01-07 19:32:07 +0900 (Tue, 07 Jan 2014)
New Revision: 457
Modified:
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Doxygen.conf.vsl
Log:
Daily work.
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl 2014-01-07 07:42:29 UTC (rev 456)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl 2014-01-07 10:32:07 UTC (rev 457)
@@ -1,8 +1,9 @@
-// -*- Java -*-
+// -*- RTMSafety -*-
/*!
- * @file ${rtcParam.name}.java
+ * @file ${rtcParam.name}.c
+ * @brief ${rtcParam.description}
+ * @date ${dol}Date${dol}
#set( $Date$ = "dummy" )
- * @date \$Date$
#if( ${rtcParam.docCreator.length()} > 0 )
*
* @author ${tmpltHelper.convertAuthorDoc(${rtcParam.docCreator})}
@@ -16,74 +17,209 @@
* \$Id$
*/
-import jp.go.aist.rtm.RTC.Manager;
-import jp.go.aist.rtm.RTC.RTObject_impl;
-import jp.go.aist.rtm.RTC.RtcDeleteFunc;
-import jp.go.aist.rtm.RTC.RtcNewFunc;
-import jp.go.aist.rtm.RTC.RegisterModuleFunc;
-import jp.go.aist.rtm.RTC.util.Properties;
+${sharp}include "${rtcParam.name}.h"
/*!
- * @class ${rtcParam.name}
* @brief ${rtcParam.description}
+ * @return
+ * @retval
+ * @retval
*/
-public class ${rtcParam.name} implements RtcNewFunc, RtcDeleteFunc, RegisterModuleFunc {
+PUBLIC ReturnCode_t ${rtcParam.name}_create(${rtcParam.name}_t* pself)
+{
+ ReturnCode_t retVal = RTC_OK;
+
+ if( pself == NULL )
+ {
+ retVal = RTC_ERROR;
+ }
+
+ if( retVal == RTC_OK )
+ {
+ pself->onInitialize = ${rtcParam.name}_on_initialize;
+#if(${rtcParam.IsNotImplemented(1)})//#end pself->onFinalize = ${rtcParam.name}_on_finalize;
+#if(${rtcParam.IsNotImplemented(2)})//#end pself->onStartup = ${rtcParam.name}_on_startup;
+#if(${rtcParam.IsNotImplemented(3)})//#end pself->onShutdown = ${rtcParam.name}_on_shutdown;
+#if(${rtcParam.IsNotImplemented(4)})//#end pself->onActivated = ${rtcParam.name}_on_activated;
+#if(${rtcParam.IsNotImplemented(5)})//#end pself->onDeactivated = ${rtcParam.name}_on_deactivated;
+#if(${rtcParam.IsNotImplemented(6)})//#end pself->onAborting = ${rtcParam.name}_on_aborting;
+#if(${rtcParam.IsNotImplemented(7)})//#end pself->onError = ${rtcParam.name}_on_error;
+#if(${rtcParam.IsNotImplemented(8)})//#end pself->onReset = ${rtcParam.name}_on_reset;
+#if(${rtcParam.IsNotImplemented(9)})//#end pself->onExecute = ${rtcParam.name}_on_execute;
+ }
-// Module specification
-// <rtc-template block="module_spec">
- public static String component_conf[] = {
- "implementation_id", "${rtcParam.name}",
- "type_name", "${rtcParam.name}",
- "description", "${rtcParam.description}",
- "version", "${rtcParam.version}",
- "vendor", "${rtcParam.vender}",
- "category", "${rtcParam.category}",
- "activity_type", "${rtcParam.componentType}",
- "max_instance", "${rtcParam.maxInstance}",
- "language", "Java",
- "lang_type", "compile",
-#if( ${rtcParam.configParams.size()} > 0 )
- // Configuration variables
-#foreach($configParam in ${rtcParam.configParams})
- "conf.default.${configParam.name}", "${configParam.defaultVal}",
+ return retVal;
+}
+
+#if(${rtcParam.getDocActionOverView(0).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(0)})}
+ */#end
+#if(${rtcParam.configParams.size()}==0 && ${rtcParam.IsNotImplemented(0)} && ${rtcParam.inports.size()}==0 && ${rtcParam.outports.size()}==0 && ${rtcParam.servicePorts.size()}==0)/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_initialize( void )
+{
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.configParams.size()}==0 && ${rtcParam.IsNotImplemented(0)} && ${rtcParam.inports.size()}==0 && ${rtcParam.outports.size()}==0 && ${rtcParam.servicePorts.size()}==0)*/
#end
+
+#if(${rtcParam.getDocActionOverView(1).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(1)})}
+ */
#end
-#if( ${rtcParam.configParams.size()} > 0 )
- // Widget
-#foreach($configParam in ${rtcParam.configParams})
-#if( ${configParam.widget.length()} > 0 )
- "conf.__widget__.${configParam.name}", "${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end",
+#if(${rtcParam.IsNotImplemented(1)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_finalize( void )
+{
+#if(${tmpltHelper.checkDetailContent(1,${rtcParam})})${rtcParam.getDetailContent(1)}
#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(1)})*/
#end
- // Constraints
-#foreach($configParam in ${rtcParam.configParams})
-#if( ${configParam.constraint.length()} > 0 )
- "conf.__constraints__.${configParam.name}", "${configParam.constraint}",
+
+
+#if(${rtcParam.getDocActionOverView(2).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(2)})}
+ */
#end
+#if(${rtcParam.IsNotImplemented(2)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_startup( void )
+{
+#if(${tmpltHelper.checkDetailContent(2,${rtcParam})})${rtcParam.getDetailContent(2)}
#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(2)})*/
#end
-#if( ${rtcParam.configParameterParams.size()} > 0 )
- // System Configuration
-#foreach($parameterParam in ${rtcParam.configParameterParams})
-#if( ${parameterParam.isNonPeriodic()} )
- "${parameterParam.configName}", "${parameterParam.defaultVal}",
+
+#if(${rtcParam.getDocActionOverView(3).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(3)})}
+ */
#end
+#if(${rtcParam.IsNotImplemented(3)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_shutdown( void )
+{
+#if(${tmpltHelper.checkDetailContent(3,${rtcParam})})${rtcParam.getDetailContent(3)}
#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(3)})*/
#end
- ""
- };
-// </rtc-template>
- public RTObject_impl createRtc(Manager mgr) {
- return new ${rtcParam.name}Impl(mgr);
- }
+#if(${rtcParam.getDocActionOverView(4).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(4)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(4)})/*#end
- public void deleteRtc(RTObject_impl rtcBase) {
- rtcBase = null;
- }
- public void registerModule() {
- Properties prop = new Properties(component_conf);
- final Manager manager = Manager.instance();
- manager.registerFactory(prop, new ${rtcParam.name}(), new ${rtcParam.name}());
- }
+PUBLIC ReturnCode_t ${rtcParam.name}_on_activated( void )
+{
+#if(${tmpltHelper.checkDetailContent(4,${rtcParam})})${rtcParam.getDetailContent(4)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
}
+#if(${rtcParam.IsNotImplemented(4)})*/
+#end
+
+#if(${rtcParam.getDocActionOverView(5).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(5)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(5)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_deactivated( void )
+{
+#if(${tmpltHelper.checkDetailContent(5,${rtcParam})})${rtcParam.getDetailContent(5)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(5)})*/
+#end
+
+#if(${rtcParam.getDocActionOverView(6).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(6)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(6)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_aborting( void )
+{
+#if(${tmpltHelper.checkDetailContent(6,${rtcParam})})${rtcParam.getDetailContent(6)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
+
+}
+#if(${rtcParam.IsNotImplemented(6)})*/
+#end
+
+#if(${rtcParam.getDocActionOverView(7).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(7)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(7)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_error( void )
+{
+#if(${tmpltHelper.checkDetailContent(7,${rtcParam})})${rtcParam.getDetailContent(7)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(7)})*/
+#end
+
+#if(${rtcParam.getDocActionOverView(8).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(8)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(8)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_reset( void )
+{
+#if(${tmpltHelper.checkDetailContent(8,${rtcParam})})${rtcParam.getDetailContent(8)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(8)})*/
+#end
+
+#if(${rtcParam.getDocActionOverView(9).length()}>0)/*!
+ * ${tmpltHelper.convertDoc(${rtcParam.getDocActionOverView(9)})}
+ */
+#end
+#if(${rtcParam.IsNotImplemented(9)})/*#end
+
+PUBLIC ReturnCode_t ${rtcParam.name}_on_execute( void )
+{
+#if(${tmpltHelper.checkDetailContent(9,${rtcParam})})${rtcParam.getDetailContent(9)}
+#end
+ // Please insert your code here
+
+ return RTC_OK;
+}
+#if(${rtcParam.IsNotImplemented(9)})*/
+#end
+
+
+
+
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Doxygen.conf.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Doxygen.conf.vsl 2014-01-07 07:42:29 UTC (rev 456)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Doxygen.conf.vsl 2014-01-07 10:32:07 UTC (rev 457)
@@ -26,13 +26,13 @@
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.
-PROJECT_NAME = "My Project"
+PROJECT_NAME = "${rtcParam.name}"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER = ${rtcParam.version}
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
@@ -74,7 +74,8 @@
# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-OUTPUT_LANGUAGE = English
+#OUTPUT_LANGUAGE = English
+OUTPUT_LANGUAGE = Japanese
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
# include brief member descriptions after the members that are listed in
@@ -100,7 +101,18 @@
# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+#ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF = "The ${dol}name class" \
+ "The ${dol}name widget" \
+ "The ${dol}name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
# Doxygen will generate a detailed section even if there is only a brief
@@ -151,7 +163,8 @@
# comments will behave just like regular Qt-style comments
# (thus requiring an explicit @brief command for a brief description.)
-JAVADOC_AUTOBRIEF = NO
+#JAVADOC_AUTOBRIEF = NO
+JAVADOC_AUTOBRIEF = YES
# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
# interpret the first line (until the first dot) of a Qt-style
@@ -184,7 +197,8 @@
# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
-TAB_SIZE = 8
+#TAB_SIZE = 8
+TAB_SIZE = 2
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
@@ -355,7 +369,8 @@
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+#EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -602,7 +617,8 @@
# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
-QUIET = NO
+#QUIET = NO
+QUIET = YES
# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated by doxygen. Possible values are YES and NO. If left blank
@@ -638,7 +654,7 @@
# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
-WARN_FORMAT = "$file:$line: $text"
+WARN_FORMAT = "${dol}file:${dol}line: ${dol}text"
# The WARN_LOGFILE tag can be used to specify a file to which warning
# and error messages should be written. If left blank the output is written
@@ -673,13 +689,17 @@
# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
# *.f90 *.f *.for *.vhd *.vhdl
-FILE_PATTERNS =
+#FILE_PATTERNS =
+FILE_PATTERNS = *.h \
+ *.hpp \
+ *.doxy
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
-RECURSIVE = NO
+#RECURSIVE = NO
+RECURSIVE = YES
# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
@@ -693,7 +713,8 @@
# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
-EXCLUDE_SYMLINKS = NO
+#EXCLUDE_SYMLINKS = NO
+EXCLUDE_SYMLINKS = YES
# If the value of the INPUT tag contains directories, you can use the
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
@@ -722,7 +743,8 @@
# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
-EXAMPLE_PATTERNS =
+#EXAMPLE_PATTERNS =
+EXAMPLE_PATTERNS = *
# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
# searched for input files to be used with the \include or \dontinclude
@@ -782,7 +804,8 @@
# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
-SOURCE_BROWSER = NO
+#SOURCE_BROWSER = NO
+SOURCE_BROWSER = YES
# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
@@ -969,7 +992,8 @@
# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
# for more information.
-GENERATE_DOCSET = NO
+#GENERATE_DOCSET = NO
+GENERATE_DOCSET = YES
# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
# feed. A documentation feed provides an umbrella under which multiple
@@ -983,17 +1007,20 @@
# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name.
-DOCSET_BUNDLE_ID = org.doxygen.Project
+#DOCSET_BUNDLE_ID = org.doxygen.Project
+DOCSET_BUNDLE_ID = ${rtcParam.name}.${rtcParam.vender}
# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
# the documentation publisher. This should be a reverse domain-name style
# string, e.g. com.mycompany.MyDocSet.documentation.
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+#DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+DOCSET_PUBLISHER_ID = ${rtcParam.name}.${rtcParam.vender}.Publisher
# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-DOCSET_PUBLISHER_NAME = Publisher
+#DOCSET_PUBLISHER_NAME = Publisher
+DOCSET_PUBLISHER_NAME = ${rtcParam.vender}/${rtcParam.vender}
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
@@ -1007,7 +1034,8 @@
# can add a path in front of the file if the result should not be
# written to the html output directory.
-CHM_FILE =
+#CHM_FILE =
+CHM_FILE = "${rtcParam.name}-${rtcParam.version}.chm"
# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
# be used to specify the location (absolute path including file name) of
@@ -1056,7 +1084,8 @@
# Qt Help Project output. For more information please see
# http://doc.trolltech.com/qthelpproject.html#namespace
-QHP_NAMESPACE = org.doxygen.Project
+#QHP_NAMESPACE = org.doxygen.Project
+QHP_NAMESPACE = ${rtcParam.vender}.${rtcParam.vender}.Project
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
@@ -1107,7 +1136,8 @@
# the directory name containing the HTML and XML files should also have
# this name.
-ECLIPSE_DOC_ID = org.doxygen.Project
+#ECLIPSE_DOC_ID = org.doxygen.Project
+ECLIPSE_DOC_ID = ${rtcParam.vender}.${rtcParam.vender}.Project
# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
# at top of each HTML page. The value NO (the default) enables the index and
@@ -1216,7 +1246,8 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = YES
+#GENERATE_LATEX = YES
+GENERATE_LATEX = NO
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1248,7 +1279,8 @@
# by the printer. Possible values are: a4, letter, legal and
# executive. If left blank a4wide will be used.
-PAPER_TYPE = a4
+#PAPER_TYPE = a4
+PAPER_TYPE = a4wide
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
@@ -1499,7 +1531,8 @@
# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
-INCLUDE_FILE_PATTERNS =
+#INCLUDE_FILE_PATTERNS =
+INCLUDE_FILE_PATTERNS = *.h
# The PREDEFINED tag can be used to specify one or more macro names that
# are defined before the preprocessor is started (similar to the -D option of
@@ -1599,7 +1632,8 @@
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = NO
+#HAVE_DOT = NO
+HAVE_DOT = YES
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
# allowed to run in parallel. When set to 0 (the default) doxygen will
@@ -1616,8 +1650,10 @@
# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
# directory containing the font.
-DOT_FONTNAME = Helvetica
+#DOT_FONTNAME = Helvetica
+DOT_FONTNAME = FreeSans.ttf
+
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
More information about the openrtm-commit
mailing list