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

Fix missing param manual recovery #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix missing param manual recovery #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a12b80
Added missing argument for manual placement recovery
Apr 27, 2023
0fcfa9d
Merge branch 'master' of https://github.com/mujin/mujinplanningclient…
Apr 27, 2023
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# 0.1.0 (2022-11-17)
# 0.1.1 (2023-04-27)

- Added missing param for manual placement recovery
- Port from mujincontrollerclientpy
Comment on lines +1 to 4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog needs to be in chronological order, so more like this:

Suggested change
# 0.1.1 (2023-04-27)
- Added missing param for manual placement recovery
- Port from mujincontrollerclientpy
# 0.1.4 (2023-04-27)
- Added missing param for manual placement recovery
# 0.1.0 (2022-11-17)
- Port from mujincontrollerclientpy

4 changes: 3 additions & 1 deletion python/mujinplanningclient/binpickingplanningclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ def GetPackItemPoseInWorld(self, timeout=10, fireandforget=False, **kwargs):
taskparameters.update(kwargs)
return self.ExecuteCommand(taskparameters, timeout=timeout, fireandforget=fireandforget)

def ManuallyPlacePackItem(self, packFormationComputationResult=None, inputPartIndex=None, placeLocationNames=None, placedTargetPrefix=None, dynamicGoalsGeneratorParameters=None, orderNumber=None, numLeftToPick=None, timeout=10, fireandforget=False):
def ManuallyPlacePackItem(self, packFormationComputationResult=None, inputPartIndex=None, placeLocationNames=None, placedTargetPrefix=None, dynamicGoalsGeneratorParameters=None, intMaxPackageTranslationOffsetXY=None, orderNumber=None, numLeftToPick=None, timeout=10, fireandforget=False):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the parameter to the end so there is no breaking API change

"""
Places an item according to the pack formation assuming the item is placed manually and updates robotbridge state
"""
Expand All @@ -596,6 +596,8 @@ def ManuallyPlacePackItem(self, packFormationComputationResult=None, inputPartIn
taskparameters['placedTargetPrefix'] = placedTargetPrefix
if dynamicGoalsGeneratorParameters is not None:
taskparameters['dynamicGoalsGeneratorParameters'] = dynamicGoalsGeneratorParameters
if intMaxPackageTranslationOffsetXY is not None:
taskparameters['intMaxPackageTranslationOffsetXY'] = intMaxPackageTranslationOffsetXY
return self.ExecuteCommand(taskparameters, timeout=timeout, fireandforget=fireandforget)

def SendPackFormationComputationResult(self, timeout=10, fireandforget=False, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion python/mujinplanningclient/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '0.1.3'
__version__ = '0.1.4'

# Do not forget to update CHANGELOG.md