Skip to content
Snippets Groups Projects
Commit 9159b7f8 authored by armar-user's avatar armar-user
Browse files

fixing statechart

parent 11612be4
No related branches found
No related tags found
No related merge requests found
armarx_add_statechart(NavigationGroup armarx_add_statechart(NavigationGroup
SOURCES SOURCES
NavigationGroupRemoteStateOfferer.cpp NavigationGroupRemoteStateOfferer.cpp
NavigateToLocation.cpp
HEADERS HEADERS
NavigationGroupRemoteStateOfferer.h NavigationGroupRemoteStateOfferer.h
DEPENDENCIES DEPENDENCIES
......
...@@ -66,3 +66,4 @@ ...@@ -66,3 +66,4 @@
</Transition> </Transition>
</Transitions> </Transitions>
</State> </State>
...@@ -85,7 +85,7 @@ namespace armarx::navigation::statecharts::navigation_group ...@@ -85,7 +85,7 @@ namespace armarx::navigation::statecharts::navigation_group
// assemble the path, which might consist of waypoints and a goal (the goal is just the last `waypoint`) // assemble the path, which might consist of waypoints and a goal (the goal is just the last `waypoint`)
client::PathBuilder builder; client::PathBuilder builder;
builder.add(in.getlocation(), client::GlobalPlanningStrategy::Free); builder.add(in.getlocation(), client::GlobalPlanningStrategy::Point2Point);
// execute // execute
ARMARX_INFO << "Sending navigation request"; ARMARX_INFO << "Sending navigation request";
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<State version="1.2" name="NavigateToLocation" uuid="11145B85-CD8C-4B7C-AF2F-65FCB07F6568" width="800" height="600" type="Normal State"> <State version="1.2" name="NavigateToLocation" uuid="11145B85-CD8C-4B7C-AF2F-65FCB07F6568" width="800" height="600" type="Normal State">
<InputParameters> <InputParameters>
<Parameter name="location" type="::armarx::StringVariantData" docType="string" optional="yes"> <Parameter name="location" type="::armarx::StringVariantData" docType="string" optional="yes">
<DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"R003/home"}}' docValue="R003/home"/> <DefaultValue value='{"type":"::armarx::SingleVariantBase","variant":{"typeName":"::armarx::StringVariantData","value":"R003/sh_center"}}' docValue="R003/sh_center"/>
</Parameter> </Parameter>
</InputParameters> </InputParameters>
<OutputParameters/> <OutputParameters/>
...@@ -16,3 +16,4 @@ ...@@ -16,3 +16,4 @@
</Events> </Events>
<Transitions/> <Transitions/>
</State> </State>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<Proxy value="RobotAPIInterfaces.MemoryNameSystem"/> <Proxy value="RobotAPIInterfaces.MemoryNameSystem"/>
<Proxy value="armarx_navigation::client.navigator"/> <Proxy value="armarx_navigation::client.navigator"/>
</Proxies> </Proxies>
<Configurations/>
<State filename="NavigateBetweenLocations.xml" visibility="public"/> <State filename="NavigateBetweenLocations.xml" visibility="public"/>
<State filename="NavigateToLocation.xml" visibility="public"/> <State filename="NavigateToLocation.xml" visibility="public"/>
</StatechartGroup> </StatechartGroup>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment