Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes from RobotLocomotion/libbot #3

Open
wants to merge 9 commits into
base: libbot-openhumanoids
Choose a base branch
from
Open

Merge upstream changes from RobotLocomotion/libbot #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
810d5ee
typo in variable name in schedule_cmd_for_removal
joeromano Nov 20, 2015
fb9b62f
Merge pull request #14 from joeromano/schedule_removal_cmd_typo
RussTedrake Nov 21, 2015
066bbdb
Add "dummy" install target
mwoehlke-kitware Mar 17, 2016
cc8d228
Merge pull request #15 from mwoehlke-kitware/add-install-target
RussTedrake Mar 17, 2016
cdb3e4e
fix typo
peterkty Apr 1, 2016
70a6f43
Merge pull request #16 from peterkty/master
RussTedrake Apr 1, 2016
647915b
Changed so builds happen out of source.
Jul 11, 2016
6d932c8
Merge pull request #18 from jhoare/out_of_source_builds
RussTedrake Jul 11, 2016
c9b9365
Merge remote-tracking branch 'upstream/master' into libbot-openhumanoids
gizatt Aug 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,25 @@ set(default_cmake_args

ExternalProject_Add(bot2-core
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-core
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-core/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-core
CMAKE_CACHE_ARGS ${default_cmake_args})
checkbuild(bot2-core)

ExternalProject_Add(bot2-procman
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-procman
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-procman/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-procman
CMAKE_CACHE_ARGS ${default_cmake_args})
checkbuild(bot2-procman)

ExternalProject_Add(bot2-lcm-utils
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcm-utils
CMAKE_CACHE_ARGS ${default_cmake_args})
checkbuild(bot2-lcm-utils)

ExternalProject_Add(bot2-param
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-param
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-param/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-param
CMAKE_CACHE_ARGS ${default_cmake_args}
DEPENDS bot2-core)

Expand All @@ -90,13 +90,13 @@ if (WITH_BOT_VIS)
set(bot2_vis_depends bot2-vis)
ExternalProject_Add(bot2-vis
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-vis
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-vis/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-vis
CMAKE_CACHE_ARGS ${default_cmake_args}
DEPENDS bot2-core)

ExternalProject_Add(bot2-lcmgl
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl
CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}
DEPENDS bot2-vis)

Expand All @@ -106,16 +106,16 @@ else()

ExternalProject_Add(bot2-lcmgl
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl
CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS})

endif()

ExternalProject_Add(bot2-frames
SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-frames
BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-frames/pod-build
BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-frames
CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}
DEPENDS bot2-core bot2-param bot2-lcmgl ${bot2_vis_depends})

# dummy install step
install(FILES)
install(CODE "message(\"Nothing to do for install.\")")
8 changes: 4 additions & 4 deletions bot2-procman/python/src/bot_procman/sheriff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ def owns_command(self, cmd_object):

@return True if this deputy object manages \p command, False if not.
"""
return command.sheriff_id in self._commands and \
self._commands [command.sheriff_id] is command
return cmd_object.sheriff_id in self._commands and \
self._commands [cmd_object.sheriff_id] is cmd_object

def _update_from_deputy_info2(self, dep_info_msg):
"""
Expand Down Expand Up @@ -1042,8 +1042,8 @@ def schedule_command_for_removal(self, cmd):
"""
if self._is_observer:
raise ValueError("Can't remove commands in Observer mode")
deputy = self.get_command_deputy(command)
status_changes = deputy._schedule_for_removal(command)
deputy = self.get_command_deputy(cmd)
status_changes = deputy._schedule_for_removal(cmd)
self._maybe_emit_status_change_signals(deputy, status_changes)
self.send_orders()

Expand Down