[openrtm-commit:01822] r569 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template: common cpp

[openrtm ＠ openrtm.org]

Author: ga
Date: 2016-03-07 18:20:02 +0900 (Mon, 07 Mar 2016)
New Revision: 569

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl
Log:
Modified Configuration Parameter #3072

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2016-03-06 14:30:59 UTC (rev 568)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2016-03-07 09:20:02 UTC (rev 569)
@@ -24,12 +24,6 @@
 ${sharp}
 ${sharp} configuration.active_config: mode0
 
-#if( ${rtcParam.configParams.size()} > 0 )
-#foreach($configParam in ${rtcParam.configParams})
-${sharp} conf.default.__${configParam.name}: ${configParam.type}
-#end
-#end
-
 ${sharp} Additional configuration-set example named "mode0"
 ${sharp}
 ${sharp} conf.mode0.int_param0: 0
@@ -134,6 +128,12 @@
 #end
 #end
 
+#if( ${rtcParam.configParams.size()} > 0 )
+#foreach($configParam in ${rtcParam.configParams})
+${sharp} conf.__type__.${configParam.name}: ${configParam.type}
+#end
+#end
+
 ${sharp}${sharp}============================================================
 ${sharp}${sharp} Execution context settings
 ${sharp}${sharp}============================================================

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl	2016-03-06 14:30:59 UTC (rev 568)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl	2016-03-07 09:20:02 UTC (rev 569)
@@ -30,12 +30,6 @@
     "conf.default.${configParam.name}", "${configParam.defaultVal}",
 #end
 
-#foreach($configParam in ${rtcParam.configParams})
-    "conf.default.__${configParam.name}", "${configParam.type}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end",
-#end
-#end
-#if( ${rtcParam.configParams.size()} > 0 )
-
     // Widget
 #foreach($configParam in ${rtcParam.configParams})
 #if( ${configParam.widget.length()} > 0 )
@@ -48,7 +42,12 @@
     "conf.__constraints__.${configParam.name}", "${configParam.constraint}",
 #end
 #end
+
+#foreach($configParam in ${rtcParam.configParams})
+    "conf.__type__.${configParam.name}", "${configParam.type}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end",
 #end
+
+#end
 #if( ${rtcParam.configParameterParams.size()} > 0 )
     // System Configuration
 #foreach($parameterParam in ${rtcParam.configParameterParams})