Skip to content

Commit de7ed68

Browse files
Feature implement move (#285)
* Revert build * Add move msgs and action * Delete unused files * Add move * change nav params * delete strategy * implmenet translate action * try fix * fix * fix * Reimplement motion behavior * Bug fix in ROTATE TOWARD GOAL behavior * Add angular velocity for move behavior * fix * fix simulation th]eme and add navigation node (#287) * fix merge confilic * fix move param * test * fix ax --------- Co-authored-by: Darko Lukic <lukicdarkoo@gmail.com>
1 parent 5382297 commit de7ed68

File tree

98 files changed

+1475
-9203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1475
-9203
lines changed

docker/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ vnc:
1414
$(eval IMAGE=ghcr.io/memristor/mep3-vnc)
1515
@true
1616

17+
build:
18+
echo ${NO_CACHE_ARG}
19+
@DOCKER_BUILDKIT=1 docker build ${DOCKER_DIR} -f ${DOCKER_DIR}/Dockerfile.base -t mep3 ${DOCKER_ARGS} --build-arg UID=${UID}
20+
@[ ${FLAVOR} != 'devel' ] && \
21+
DOCKER_BUILDKIT=1 docker build ${DOCKER_DIR} -f ${DOCKER_DIR}/Dockerfile.${FLAVOR} -t ${IMAGE} ${DOCKER_ARGS} || \
22+
true
23+
1724
run:
1825
@${MAKE} -s test-nvidia
1926
@docker run \

mep3_behavior/include/mep3_behavior/joint_position_command_action.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ namespace mep3_behavior
6060

6161
bool setGoal(Goal &goal) override
6262
{
63-
std::cout << "Dynamixel desired position to θ=" << position_ \
64-
<<" max_velocity="<<max_velocity_\
65-
<<" max effort="<<max_effort_\
66-
<<" max_acceleration="<<max_acceleration_<< std::endl;
63+
std::cout << "Dynamixel desired position to θ=" << position_
64+
<< " max_velocity=" << max_velocity_
65+
<< " max effort=" << max_effort_
66+
<< " max_acceleration=" << max_acceleration_ << std::endl;
6767

6868
goal.position = position_ * M_PI / 180;
6969
goal.max_velocity = max_velocity_ * M_PI / 180;
@@ -98,12 +98,12 @@ namespace mep3_behavior
9898
return port_list;
9999
}
100100

101-
BT::NodeStatus onResultReceived(const WrappedResult & wr) override
101+
BT::NodeStatus onResultReceived(const WrappedResult &wr) override
102102
{
103103
setOutput("result", (double)wr.result->result);
104104
setOutput("feedback_effort", wr.result->last_effort);
105105
setOutput("feedback_position", wr.result->last_position);
106-
std::cout << "Last result: " << (double)wr.result->result << "; last effort: " << (double)wr.result->last_effort << "; last position: " << (double)wr.result->last_position << std::endl;
106+
std::cout << "Last result: " << (double)wr.result->result << "; last effort: " << (double)wr.result->last_effort << "; last position: " << (double)wr.result->last_position << std::endl;
107107

108108
return BT::NodeStatus::SUCCESS;
109109
}
@@ -112,7 +112,7 @@ namespace mep3_behavior
112112
{
113113

114114
setOutput("feedback_effort", feedback->effort);
115-
std::cout << "====Max effort: " << feedback->effort <<std::endl;
115+
std::cout << "====Max effort: " << feedback->effort << std::endl;
116116
setOutput("feedback_position", feedback->position);
117117

118118
return BT::NodeStatus::RUNNING;

0 commit comments

Comments
 (0)