-
Notifications
You must be signed in to change notification settings - Fork 97
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
[WIP] Merge develop/fetch branch #1593
base: master
Are you sure you want to change the base?
Conversation
91adad1
to
b6bc4ca
Compare
@sktometometo L515 Head Realsense関連のコミットをPRとして出して下さい. @mqcmd196 @tkmtnt7000 euslisp/navigation-utils.lへの変更コミットをPRとして出してください. @mqcmd196 @tkmtnt7000 trashbin関連の変更コミットをPRとして出してください.
@708yamaguchi co2検出関連の変更コミットをPRとして出してください. |
update_workspace.sh関連のコミットは #1630 に取り出しました. |
👑 commit ranking in
|
I may have made a mistake when I cherry-picked these three commits because it seemed that these commits have already been merged in master branch.
|
May I resolve current conflicts? |
08ef5f1
to
23f3d9b
Compare
@mqcmd196 sorry I resolved the conflicts. |
Thank you! |
7fec55d
to
cb89d3b
Compare
cf5c911
to
dd4249a
Compare
1809c68
to
8c1c5e1
Compare
573cd3d
to
31181dc
Compare
2b68b2c
to
72ecfb2
Compare
609ad33
to
a66ea9c
Compare
7e8a648
to
cda483b
Compare
* [jsk_fetch_startup] add write-message-on-message-board to navigation-utils.l * [jsk_fetch_startup] Use write-message-on-message-board in kitchen-demo * Update jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l add package existence check for esp_now_ros Co-authored-by: Naoto Tsukamoto <[email protected]> * [jsk_fetch_startup] publish dummy packet before write message on message board * Add more message and debug output * [jsk_fetch_startup] fix error * [jsk_fetch_starup] get rid of dummy message writing * [jsk_fetch_startup] Change enr_message_board address --------- Co-authored-by: Naoto Tsukamoto <[email protected]>
This reverts commit 3ab1283.
Author: Naoto Tsukamoto <[email protected]>
] Change nodelet name to adjust existing nodelet
a94818f
to
23037db
Compare
... current commit ranking
|
Move from #1236
Current fetch branch.
This branch have these features follows;
Go to kitchen
Others
Upstream depencency
jsk-ros-pkg/jsk_3rdparty
ZebraDevs/fetch_open_auto_dock
New package dependency
Merged
jsk-ros-pkg/jsk_robot
nav_speak.py
tojsk_robot_startup
and use it in pr2 #1310jsk-ros-pkg/jsk_pr2eus
jsk-ros-pkg/jsk_3rdparty
jsk-ros-pkg/jsk_demos
fetchrobotics/fetch_ros
PR2/app_manager
ros-planning/navigation
tork-a/roswww
jsk-ros-pkg/jsk_common
Rebase history
cc. @708yamaguchi @sktometometo @mqcmd196 @tkmtnt7000