Skip to content

Commit da93f71

Browse files
alex-lotzalex-lotz
authored
Update for SmartMDSD Toolchain v3.11
This update requires the SmartMDSD Toolchain version 3.11
2 parents 16d9043 + 6766017 commit da93f71

6 files changed

Lines changed: 72 additions & 40 deletions

File tree

‎BehaviorNavigationScenario/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
43
<classpathentry kind="src" path="model"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
55
<classpathentry kind="src" path="/CommBasicObjects"/>
66
<classpathentry kind="src" path="/CommLocalizationObjects"/>
77
<classpathentry kind="src" path="/CommNavigationObjects"/>

‎BehaviorNavigationScenario/.cproject‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.675787612." name="/" resourcePath="">
1919
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.655270899" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
2020
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1822093078" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
21-
<builder buildPath="${workspace_loc:/BehaviorNavigationScenario}/Release" id="cdt.managedbuild.config.gnu.exe.release.675787612" name="SmartMDSD Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.smartmdsd.utils.smartmdsd.builder"/>
21+
<builder buildPath="${workspace_loc:/BehaviorNavigationScenario}/Release" id="cdt.managedbuild.config.gnu.exe.release.675787612" keepEnvironmentInBuildfile="false" name="SmartMDSD Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.smartmdsd.utils.smartmdsd.builder"/>
2222
<tool id="cdt.managedbuild.tool.gnu.archiver.base.443045390" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
2323
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.80933860" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
24-
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.248887601" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
25-
<option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.2135694801" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
24+
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.248887601" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
25+
<option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.2135694801" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
2626
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.639794007" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
2727
</tool>
2828
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1646907765" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
29-
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1824165605" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
30-
<option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.1633653680" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
29+
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1824165605" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
30+
<option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.1633653680" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
3131
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1965867031" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
3232
</tool>
3333
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1575387049" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
@@ -63,16 +63,16 @@
6363
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1495533714." name="/" resourcePath="">
6464
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1339257641" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
6565
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.790611455" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
66-
<builder buildPath="${workspace_loc:/BehaviorNavigationScenario}/Debug" id="cdt.managedbuild.config.gnu.exe.debug.1495533714" name="SmartMDSD Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.smartmdsd.utils.smartmdsd.builder"/>
66+
<builder buildPath="${workspace_loc:/BehaviorNavigationScenario}/Debug" id="cdt.managedbuild.config.gnu.exe.debug.1495533714" keepEnvironmentInBuildfile="false" name="SmartMDSD Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.smartmdsd.utils.smartmdsd.builder"/>
6767
<tool id="cdt.managedbuild.tool.gnu.archiver.base.776311427" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
6868
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1681596869" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
69-
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.79765811" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
70-
<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1893478556" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
69+
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.79765811" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
70+
<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1893478556" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
7171
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1753315241" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
7272
</tool>
7373
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.994183903" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
74-
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1949520160" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
75-
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.44062105" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
74+
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1949520160" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
75+
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.44062105" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
7676
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.957301566" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
7777
</tool>
7878
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.658466669" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>

‎BehaviorNavigationScenario/.project‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
<project>CommNavigationObjects</project>
99
</projects>
1010
<buildSpec>
11-
<buildCommand>
12-
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
13-
<triggers>clean,full,incremental,</triggers>
14-
<arguments>
15-
</arguments>
16-
</buildCommand>
1711
<buildCommand>
1812
<name>org.eclipse.jdt.core.javabuilder</name>
1913
<arguments>
@@ -24,20 +18,12 @@
2418
<arguments>
2519
</arguments>
2620
</buildCommand>
27-
<buildCommand>
28-
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
29-
<triggers>full,incremental,</triggers>
30-
<arguments>
31-
</arguments>
32-
</buildCommand>
3321
</buildSpec>
3422
<natures>
3523
<nature>org.eclipse.cdt.core.cnature</nature>
36-
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
3724
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
3825
<nature>org.eclipse.jdt.core.javanature</nature>
3926
<nature>org.eclipse.cdt.core.ccnature</nature>
4027
<nature>org.smartmdsd.utils.natures.BehaviorNature</nature>
41-
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
4228
</natures>
4329
</projectDescription>

‎BehaviorNavigationScenario/model/BehaviorNavigationScenario.smartTcl‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,54 @@
1818
(backward-dist 500)))
1919

2020

21+
(tcl-kb-update
22+
:key '(is-a name)
23+
:value '(
24+
(is-a location)
25+
(name sofa)
26+
(speech "sofa")
27+
(approach-type (region))
28+
(approach-region-pose (0 8000 0))
29+
(approach-region-dist 150)
30+
(approach-exact-pose (0 8000 0))
31+
(approach-exact-dist 100)
32+
(approach-exact-safetycl 0)
33+
(orientation-region (position 1000 9000))
34+
(orientation-exact (position 1000 9000))
35+
(backward-dist 500)))
36+
37+
(tcl-kb-update
38+
:key '(is-a name)
39+
:value '(
40+
(is-a location)
41+
(name table)
42+
(speech "table")
43+
(approach-type (region))
44+
(approach-region-pose (2500 -2000 0))
45+
(approach-region-dist 150)
46+
(approach-exact-pose (2500 -2000 0))
47+
(approach-exact-dist 100)
48+
(approach-exact-safetycl 0)
49+
(orientation-region (position 2500 -3000))
50+
(orientation-exact (position 2500 -3000))
51+
(backward-dist 500)))
52+
53+
(tcl-kb-update
54+
:key '(is-a name)
55+
:value '(
56+
(is-a location)
57+
(name bench)
58+
(speech "bench")
59+
(approach-type (region))
60+
(approach-region-pose (-3000 2200 0))
61+
(approach-region-dist 150)
62+
(approach-exact-pose (-3000 2200 0))
63+
(approach-exact-dist 100)
64+
(approach-exact-safetycl 0)
65+
(orientation-region (position -4000 2200))
66+
(orientation-exact (position -4000 2200))
67+
(backward-dist 500)))
68+
2169
(tcl-kb-update
2270
:key '(is-a name)
2371
:value '(
@@ -116,8 +164,6 @@
116164

117165
; (execute '(navigationTestTask))
118166

119-
120-
121167
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
122168
;; REACTIVE NAV
123169
; (execute '(nav1.tcb-reactive-navigation))
@@ -127,8 +173,18 @@
127173
; (execute '(nav1.tcb-joystick-navigation))
128174
; (execute '(nav1.tcb-stop-joystick-navigation))
129175
;;
176+
; (execute '(localizationModInst.tcb-activate-localization))
130177
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
131178

179+
;;
180+
;; (execute '(cameraInst.activateCameraPush))
181+
;; (execute '(cameraInst.activateCameraQuery))
182+
;; (execute '(cameraInst.deactivateCamera))
183+
184+
;; (execute '(laserfromrgbdInst.activateLaserGenaration))
185+
;; (execute '(laserfromrgbdInst.dectivateLaserGenaration))
186+
187+
132188

133189
(realize-tcb (navigationTestTask)
134190
(action (

‎BehaviorSLAMRGBdLaserCompare/.project‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
<project>DomainVision</project>
1010
</projects>
1111
<buildSpec>
12-
<buildCommand>
13-
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
14-
<triggers>clean,full,incremental,</triggers>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
1812
<buildCommand>
1913
<name>org.eclipse.jdt.core.javabuilder</name>
2014
<arguments>
@@ -25,12 +19,6 @@
2519
<arguments>
2620
</arguments>
2721
</buildCommand>
28-
<buildCommand>
29-
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
30-
<triggers>full,incremental,</triggers>
31-
<arguments>
32-
</arguments>
33-
</buildCommand>
3422
</buildSpec>
3523
<natures>
3624
<nature>org.eclipse.cdt.core.cnature</nature>

‎BehaviorSLAMRGBdLaserCompare/model/BehaviorSLAMRGBdLaserCompare.taskRealization‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ TaskRealizationModel BehaviorSLAMRGBdLaserCompare {
1313

1414
//this task realization is a dummy (see smartTCL file)
1515
//TaskRealization CommNavigationObjects.testTask { }
16-
}
16+
//(visLaser.startVisualizationOf 'laser1 "ComponentRobotinoLaserServer" "pushNewestServer")
17+
18+
}

0 commit comments

Comments
 (0)