-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
fix for Noetic #4
Conversation
please split this into 3 commits, I'm not sure if print((a+b)) is more appropriate than print(a+b), so I'll have to wait for Pythonista's comments... |
We have to use |
fix bugs to run sample simulations in https://github.com/fkanehiro/hrpsys-base/blob/master/sample/SampleRobot/README.md except for KalmanFilter. This rtc could not invoke resetKalmanFilterState().
This KalmanFilter sample works well in melodic. |
Fixed Kalmanfilter sample problem. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have cherry picked reliable commits. I am sorry for the conflict, but hop you can rebase and fix it.
jython/waitInput.py
Outdated
@@ -1,247 +1,247 @@ | |||
from javax.swing import * |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please split PR for python3 and style change. I would recommend revert this fix and apply 2to3.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is originally written in ASCII (CRLF), but 2to3 changed into UTF-8 (LF). style change
means this? or should I keep this file as ASCII style?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
style change means this?
Yes
or should I keep this file as ASCII style?
I prefer this option, because I personally won't be using waitInput.py in the future and do not want to make unncessary changes to this file.
package.xml
Outdated
@@ -51,6 +51,7 @@ | |||
<run_depend>openhrp3</run_depend> | |||
<run_depend>python-tk</run_depend> | |||
<run_depend>sdl</run_depend> | |||
<run_depend>python3-packaging</run_depend> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use <exec_depend condition="$ROS_PYTHON_VERSION == 3" />
@@ -772,7 +772,7 @@ def demoStandingPosResetting(): | |||
def demo(): | |||
start_time = time.time() | |||
init() | |||
from distutils.version import StrictVersion | |||
from packaging.version import parse as StrictVersion |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the pupose of this chnage? to support parse('"314.0.0"') > parse('"314.10.0"')
? but it not work with parse('"314.0.0"') > parse('314.10.0')
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this problem when parsing a version string with double quatations. kirohy@9488858 can avoid such situations.
This change is because you have already replaced distutils
into packaging
in ecfefb9#diff-9a55a4c37694757a5f9204a027881ffaa4793e2f5c144b586d7248ae5db441a5R15. Should I revert them? Then kirohy@10b4db8 will be deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this works for both python2/python3 this is ok, if not, then we need to make changes as small as possibe and switch the code using python2/python3 conditional branches.
345fc1c
to
f07ba6a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
check simulation on melodic and noetic, and edit code. To revert old changes, force pushed
CMakeLists.txt
Outdated
@@ -190,7 +190,7 @@ install(FILES | |||
${CMAKE_CURRENT_BINARY_DIR}/hrpsys-base.pc | |||
DESTINATION lib/pkgconfig) | |||
|
|||
add_definitions(-DHRPSYS_PACKAGE_VERSION=\"\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\"\") | |||
add_definitions(-DHRPSYS_PACKAGE_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kirohy what happens without this changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, this change cannot built in Melodic. In Noetic wthout this change, hrpsys sample fails with ValueError: invalid version number '"315.15.0"'
. This caued by python3 problem, so I'll revert this file and edit hrpsys python sample scripts.
To run
rtmlaunch hrpsys_ros_bridge samplerobot.launch USE_UNSTABLE_RTC:=true
, this pull req and k-okada/rtmros_common#11 are needed.