[WIP] Merge develop/fetch branch #1593

knorth55 · 2022-09-11T13:31:44Z

Move from #1236
Current fetch branch.
This branch have these features follows;

Go to kitchen

[fetch] Update go-to-kitchen demo #1149

Others

Upstream depencency

jsk-ros-pkg/jsk_3rdparty
- Add VOICEVOX (AI speech synthesis) package for ROS Interface jsk_3rdparty#337
ZebraDevs/fetch_open_auto_dock
- Add timeout to pre orientation during docking ZebraDevs/fetch_open_auto_dock#9
- Add undock timeout duration parameter ZebraDevs/fetch_open_auto_dock#8

New package dependency

Merged

jsk-ros-pkg/jsk_robot
jsk-ros-pkg/jsk_pr2eus
- [pr2eus] Add correction arg in :move-to-wait jsk_pr2eus#418
jsk-ros-pkg/jsk_3rdparty
- [dialogflow_task_executive] Change mux namespace for speech_to_text jsk_3rdparty#221
jsk-ros-pkg/jsk_demos
- Add dock spot for fetch1075 jsk_demos#1319
- Update 73B2 layout jsk_demos#1329
fetchrobotics/fetch_ros
PR2/app_manager
- Add app manager plugin PR2/app_manager#25
- Add timeout field to ctx PR2/app_manager#49
ros-planning/navigation
- [move_slow_and_clear] Add rosparam representing max vel rosparam name ros-planning/navigation#1039
tork-a/roswww
- add basic authentication tork-a/roswww#51
jsk-ros-pkg/jsk_common
- add audio_video_recorder in jsk_common jsk_common#1672
- [speak_and_wait_recovery] add speak_and_wait_recovery jsk_common#1681

Rebase history

2023/06/17 from https://github.com/jsk-ros-pkg/jsk_robot/tree/develop/fetch_20230617 to a4b99e4
2023/06/26 from https://github.com/jsk-ros-pkg/jsk_robot/tree/develop/fetch_20230626 to 93f8039

cc. @708yamaguchi @sktometometo @mqcmd196 @tkmtnt7000

knorth55 · 2022-10-03T16:48:54Z

@sktometometo L515 Head Realsense関連のコミットをPRとして出して下さい．
config/config.bash, config_outside.bash周りとjsk_fetch_accessories, urdfなど

@mqcmd196 @tkmtnt7000 euslisp/navigation-utils.lへの変更コミットをPRとして出してください．
色々PRがマージされていますが，そこから抜けているコミットが多くあるように見えます．

@mqcmd196 @tkmtnt7000 trashbin関連の変更コミットをPRとして出してください．
これは上のeuslisp/navigation-utils.lへの変更とも関わっているかな．
#1492 がconflictしているので解決してもらえると嬉しいです．

$ git log origin/master..origin/develop/fetch jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l
commit 01dddd9b709560a2d6c3e511ceef73479f5d9cf9
Author: Koki Shinjo <sktometometo@gmail.com>
Date:   Fri Aug 13 14:34:17 2021 +0900

    [jsk_fetch_startup] add rotate_in_place to dock func

commit c9536ea9073e52ffc2497aeca928a624c9a93138
Author: Koki Shinjo <sktometometo@gmail.com>
Date:   Mon Aug 16 18:53:20 2021 +0900

    [jsk_fetch_startup] rename arg name rotate_in_place to rotate-in-place

commit d8f460169557ad13003849dbc029e1a67ac16a8e
Author: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date:   Wed Dec 8 00:02:05 2021 +0900

    Publish CO2 concentration in go-to-kitchen app

commit 59118f3a3067ecc9835a472e4994b37915b7334d
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Sun Dec 19 17:25:47 2021 +0900

    [jsk_fetch_startup] Add take-photo function

commit 7bbe1bf60798fa14b6f39dbcba203ea117ca0744
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Sun Dec 19 18:06:35 2021 +0900

    Add trashcan occupancy detection to navigation-utils.l

commit 577417d368765ba370a0c84ca4de87fc6d3fee73
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Tue Dec 21 17:37:02 2021 +0900

    fix topic name and topic method

commit 32e51e228a991ad94fd1f0bb8beff737fee9ec30
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Tue Dec 21 17:37:25 2021 +0900

    update notify text

commit 2c95c576c5d31e56e74306bdc97c213a58ca72a1
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Dec 22 16:33:37 2021 +0900

    [jsk_fetch_startup] Auto-dock when failing to move to sink front

commit 89d86f48b4e7258c6b712ffe0a7c6b70c8c5ee8e
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Dec 22 17:06:59 2021 +0900

    [jsk_fetch_startup] Add behavior when auto-dock fails

commit 79bbc9fd22317859f4465baca4fadd8dcfb61d11
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Sat Dec 25 22:03:34 2021 +0900

    [jsk_fetch_startup] Fix the process for no recognition result of trashcan occupancy

commit 6ab9201ef148c88bb0460df093964e0e24c018a9
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Sat Dec 25 22:39:32 2021 +0900

    [jsk_fetch_startup] Remove setq in notify-trashcan-occupancy

commit 3983112441ba2cfd9944f05d100400e5914accdf
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Sat Dec 25 22:40:03 2021 +0900

    [jsk_fetch_startup] Add occupancy value to ros-info

commit d686a82ffbf1295b526eb105510564dd95c833e0
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Jun 15 11:40:12 2022 +0900

    [jsk_fetch_startup] Wait for a certain time in get-battery-charge-state

commit c0b2873a4b6b3fbdfde6b326ee459b3656d73bd3
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Jun 15 15:25:03 2022 +0900

    [jsk_fetch_startup] split method into two; add wait-until-is-charging

commit 313af63fc507feb4a8a3ee14b4351b0a194d4e07
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Jun 15 16:15:13 2022 +0900

    [jsk_fetch_startup] Fix about keyword argument

commit e8edf454d2ca0bf1c027156e0698a7db6d7d9c2b
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Jun 15 16:16:21 2022 +0900

    [jsk_fetch_startup] Return charging state in wait-until-is-charging

commit f34f9cdb452738b63af359cc8d471c53b0cf3877
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Fri Jun 17 17:08:07 2022 +0900

    [jsk_fetch_startup] Use jsk_pcl_ros/container_occupancy_detector in kithchen demo

commit 8fd035b8439e96f3f8e28a5e98b0c7f754bfd889
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Mon Aug 22 12:12:51 2022 +0900

    [jsk_fetch_startup] Add description tag for kitchen-demo userdata

commit 6a56ffc5c7bae1848d6f65205128b3ec89896c8c
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Mon Aug 22 13:13:08 2022 +0900

    [jsk_fetch_startup/kitchen-demo] Add image tag for kitchen-demo userdata

commit 02e857503342b8fe7c9e9a2de871d9050c6c22ab
Author: Aoi Nakane <nakane@jsk.imi.i.u-tokyo.ac.jp>
Date:   Thu Aug 25 09:56:01 2022 +0900

    [jsk_fetch_startup]Fix report in kitchen demo

commit ee4ca446e4b9d7f95e7efd748425af6485ce4670
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Aug 24 16:28:50 2022 +0900

    [jsk_fetch_startup/kithcen] Change description dependent on success or not

commit 528d2de489d50e7b54b684fc0fe709ae7d0325b4
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Fri Sep 9 21:51:33 2022 +0900

    [jsk_fetch_startup] Fix :inspect-kitchen let --> let*

commit c9bf32c2c87e9a050ada58acf7f9d1704e8ca965
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Fri Sep 9 21:52:44 2022 +0900

    [jsk_fetch_startup] Fix indent in :inspect-kitchen

@708yamaguchi co2検出関連の変更コミットをPRとして出してください．
これはひとつだけかな． #1635

knorth55 · 2022-10-03T16:50:08Z

update_workspace.sh関連のコミットは #1630 に取り出しました．

knorth55 · 2022-10-03T17:09:07Z

👑 commit ranking in origin/develop/fetch

$ git log --pretty=format:"%aN" origin/master..origin/develop/fetch      | sort     | uniq -c | sort -k1nr
     82 Koki Shinjo
     72 Shingo Kitagawa
     69 Naoya Yamaguchi
     32 JSK fetch user
     27 Naoto Tsukamoto
     20 Yoshiki Obinata
     13 Guilherme Affonso
     10 iory
      4 obinata
      3 Aoi Nakane
      3 jsk-fetchuser

tkmtnt7000 · 2022-10-05T08:44:29Z

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.

commit 8fd035b8439e96f3f8e28a5e98b0c7f754bfd889
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Mon Aug 22 12:12:51 2022 +0900

    [jsk_fetch_startup] Add description tag for kitchen-demo userdata

commit 6a56ffc5c7bae1848d6f65205128b3ec89896c8c
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Mon Aug 22 13:13:08 2022 +0900

    [jsk_fetch_startup/kitchen-demo] Add image tag for kitchen-demo userdata

commit ee4ca446e4b9d7f95e7efd748425af6485ce4670
Author: Naoto Tsukamoto <naototukka0413@gmail.com>
Date:   Wed Aug 24 16:28:50 2022 +0900

    [jsk_fetch_startup/kithcen] Change description dependent on success or not

mqcmd196 · 2022-10-07T04:31:41Z

May I resolve current conflicts?

knorth55 · 2022-10-07T04:57:48Z

@mqcmd196 sorry I resolved the conflicts.

mqcmd196 · 2022-10-07T06:45:26Z

Thank you!

* [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 <naototukka0413@gmail.com> * [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 <naototukka0413@gmail.com>

This reverts commit 3ab1283.

…k_3rdparty@58b852e

Author: Naoto Tsukamoto <tsukamoto@jsk.imi.i.u-tokyo.ac.jp>

… common logger

] Change nodelet name to adjust existing nodelet

…r adopt cra-ros-pkg/robot_localization#595

tkmtnt7000 · 2023-11-09T05:18:20Z

... current commit ranking

$ git log --pretty=format:"%aN" origin/master..origin/develop/fetch      | sort     | uniq -c | sort -k1nr
    105 Koki Shinjo
     96 Naoto Tsukamoto
     88 Shingo Kitagawa
     58 Naoya Yamaguchi
     27 JSK fetch user
     24 Yoshiki Obinata
     10 iory
      7 Guilherme Affonso
      4 obinata
      3 Kei Okada
      3 MiyabiTane
      2 Aoi Nakane
      2 Kanazawa Naoaki
      1 jsk-fetchuser

knorth55 changed the title ~~[WIP]a~~ [WIP] Merge develop/fetch branch Sep 11, 2022

knorth55 added fetch15 fetch1075 labels Sep 11, 2022

knorth55 marked this pull request as ready for review September 11, 2022 13:32

knorth55 mentioned this pull request Sep 11, 2022

[WIP] Merge Fetch15 branch #1236

Closed

knorth55 force-pushed the develop/fetch branch 2 times, most recently from 91adad1 to b6bc4ca Compare October 3, 2022 15:34

knorth55 force-pushed the develop/fetch branch from 08ef5f1 to 23f3d9b Compare October 7, 2022 04:57

knorth55 force-pushed the develop/fetch branch from 7fec55d to cb89d3b Compare October 19, 2022 06:12

knorth55 added the develop/fetch label Oct 19, 2022

knorth55 force-pushed the develop/fetch branch 2 times, most recently from cf5c911 to dd4249a Compare October 24, 2022 14:19

This was referenced Nov 18, 2022

[develop/fetch] control tweet speak volume and speak enable by dynamic reconfigure #1734

Merged

[develop/pr2] control tweet speak volume and speak enable by dynamic reconfigure #1735

Merged

knorth55 force-pushed the develop/fetch branch from 1809c68 to 8c1c5e1 Compare November 30, 2022 05:19

knorth55 force-pushed the develop/fetch branch from 573cd3d to 31181dc Compare January 16, 2023 11:20

knorth55 force-pushed the develop/fetch branch from 2b68b2c to 72ecfb2 Compare February 10, 2023 12:37

sktometometo force-pushed the develop/fetch branch from 609ad33 to a66ea9c Compare June 17, 2023 02:13

github-actions bot added Fetch jsk_robot_startup PR2 labels Jun 21, 2023

sktometometo mentioned this pull request Jun 21, 2023

develop/fetch での実験・開発について #1821

Open

sktometometo force-pushed the develop/fetch branch from 7e8a648 to cda483b Compare June 26, 2023 04:14

sktometometo and others added 25 commits October 31, 2023 18:31

Revert "[Fetch] Use bugfix branch of executive_smach_visualization"

108b56b

This reverts commit 3ab1283.

[jsk_fetch_startup] Add TimeSignal.cfg

c22ed40

[jsk_fetch_startup] Add dynamic_reconfigure to dependency

016e764

[jsk_fetch_startup] Enable dynamic_recongiure

e6a3526

[jsk_fetch_startup] Set volume dynamically in time_signal.py

cd0e41f

[jsk_robot_startup] Add time_signal to auto speak volume control app

00eab7a

[Fetch] Use run-name-entry-fetch15 branch in app_manager

d53930a

[jsk_fetch_startup] Add run_name to time_signal.py to specify node name

f6ea30c

[jsk_robot_startup] Fix mongodb_replicate_on_write param

d2aeb9c

[jsk_fetch_startup] Use pubsub mode in google chat ros

a369716

[jsk_fetch_robot] update esp_now_ros version to v0.4.0

0cd4118

add sample launch code for database_talker

c7401ad

use override_project_id, to work with latest commit of jsk-ros-pkg/js…

77a922f

…k_3rdparty@58b852e

Adopt to fetch1075 default environment

5b94a6c

Author: Naoto Tsukamoto <tsukamoto@jsk.imi.i.u-tokyo.ac.jp>

[jsk_robot_startup] Add override_project_id true

132109c

[jsk_robot_startup] Add launch_common_logger arg to disable launching…

a8014fd

… common logger

[jsk_robot_startup] save_speech and save_google_chat false

ec86b97

[jsk_robot_startup] Comment out lifelog.launch

4ac1afb

[jsk_fetch_startup] Launch lifelog.launch as default

69d7472

[jsk_robot_startup][jsk_fetch_startup

af11550

] Change nodelet name to adjust existing nodelet

[jsk_fetch_robot] add noetic version of robot_localization to rosinstall

d823142

[jsk_fetch_startup] set permit_corrected_publication to true

fc4b059

[jsk_fetch_robot] use 2.6.9-suppress version of robot_localization fo…

44223c2

…r adopt cra-ros-pkg/robot_localization#595

[jsk_fetch_startup] set permit_corrected_publication false by default

23037db

tkmtnt7000 force-pushed the develop/fetch branch from a94818f to 23037db Compare November 9, 2023 05:15

sktometometo and others added 3 commits January 11, 2024 15:13

[jsk_fetch_robot] use smart_device_protocol instead of esp_now_ros

102a89b

[jsk_fetch_startup] add smart_devicE_protocol udev

0c5c3ad

[jsk_fetch_startup] add tag_id for sdp

cbaeb70

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Merge develop/fetch branch #1593

[WIP] Merge develop/fetch branch #1593

knorth55 commented Sep 11, 2022 •

edited by sktometometo

Loading

knorth55 commented Oct 3, 2022 •

edited

Loading

knorth55 commented Oct 3, 2022

knorth55 commented Oct 3, 2022 •

edited

Loading

tkmtnt7000 commented Oct 5, 2022

mqcmd196 commented Oct 7, 2022

knorth55 commented Oct 7, 2022

mqcmd196 commented Oct 7, 2022

tkmtnt7000 commented Nov 9, 2023

[WIP] Merge develop/fetch branch #1593

Are you sure you want to change the base?

[WIP] Merge develop/fetch branch #1593

Conversation

knorth55 commented Sep 11, 2022 • edited by sktometometo Loading

Go to kitchen

Others

Upstream depencency

New package dependency

Merged

Rebase history

knorth55 commented Oct 3, 2022 • edited Loading

knorth55 commented Oct 3, 2022

knorth55 commented Oct 3, 2022 • edited Loading

tkmtnt7000 commented Oct 5, 2022

mqcmd196 commented Oct 7, 2022

knorth55 commented Oct 7, 2022

mqcmd196 commented Oct 7, 2022

tkmtnt7000 commented Nov 9, 2023

knorth55 commented Sep 11, 2022 •

edited by sktometometo

Loading

knorth55 commented Oct 3, 2022 •

edited

Loading

knorth55 commented Oct 3, 2022 •

edited

Loading