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.

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

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

[WIP] Merge develop/fetch branch #1593

wants to merge 433 commits into from

Conversation

knorth55
Copy link
Member

@knorth55 knorth55 commented Sep 11, 2022

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

Go to kitchen

Others

Upstream depencency

New package dependency

Merged

Rebase history

cc. @708yamaguchi @sktometometo @mqcmd196 @tkmtnt7000

@knorth55 knorth55 changed the title [WIP]a [WIP] Merge develop/fetch branch Sep 11, 2022
@knorth55 knorth55 marked this pull request as ready for review September 11, 2022 13:32
@knorth55 knorth55 force-pushed the develop/fetch branch 2 times, most recently from 91adad1 to b6bc4ca Compare October 3, 2022 15:34
@knorth55
Copy link
Member Author

knorth55 commented Oct 3, 2022

@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 <[email protected]>
Date:   Fri Aug 13 14:34:17 2021 +0900

    [jsk_fetch_startup] add rotate_in_place to dock func

commit c9536ea9073e52ffc2497aeca928a624c9a93138
Author: Koki Shinjo <[email protected]>
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 <[email protected]>
Date:   Wed Dec 8 00:02:05 2021 +0900

    Publish CO2 concentration in go-to-kitchen app

commit 59118f3a3067ecc9835a472e4994b37915b7334d
Author: Naoto Tsukamoto <[email protected]>
Date:   Sun Dec 19 17:25:47 2021 +0900

    [jsk_fetch_startup] Add take-photo function

commit 7bbe1bf60798fa14b6f39dbcba203ea117ca0744
Author: Naoto Tsukamoto <[email protected]>
Date:   Sun Dec 19 18:06:35 2021 +0900

    Add trashcan occupancy detection to navigation-utils.l

commit 577417d368765ba370a0c84ca4de87fc6d3fee73
Author: Naoto Tsukamoto <[email protected]>
Date:   Tue Dec 21 17:37:02 2021 +0900

    fix topic name and topic method

commit 32e51e228a991ad94fd1f0bb8beff737fee9ec30
Author: Naoto Tsukamoto <[email protected]>
Date:   Tue Dec 21 17:37:25 2021 +0900

    update notify text

commit 2c95c576c5d31e56e74306bdc97c213a58ca72a1
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
Date:   Wed Dec 22 17:06:59 2021 +0900

    [jsk_fetch_startup] Add behavior when auto-dock fails

commit 79bbc9fd22317859f4465baca4fadd8dcfb61d11
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
Date:   Sat Dec 25 22:39:32 2021 +0900

    [jsk_fetch_startup] Remove setq in notify-trashcan-occupancy

commit 3983112441ba2cfd9944f05d100400e5914accdf
Author: Naoto Tsukamoto <[email protected]>
Date:   Sat Dec 25 22:40:03 2021 +0900

    [jsk_fetch_startup] Add occupancy value to ros-info

commit d686a82ffbf1295b526eb105510564dd95c833e0
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Wed Jun 15 16:15:13 2022 +0900

    [jsk_fetch_startup] Fix about keyword argument

commit e8edf454d2ca0bf1c027156e0698a7db6d7d9c2b
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Aug 22 12:12:51 2022 +0900

    [jsk_fetch_startup] Add description tag for kitchen-demo userdata

commit 6a56ffc5c7bae1848d6f65205128b3ec89896c8c
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
Date:   Thu Aug 25 09:56:01 2022 +0900

    [jsk_fetch_startup]Fix report in kitchen demo

commit ee4ca446e4b9d7f95e7efd748425af6485ce4670
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
Date:   Fri Sep 9 21:51:33 2022 +0900

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

commit c9bf32c2c87e9a050ada58acf7f9d1704e8ca965
Author: Naoto Tsukamoto <[email protected]>
Date:   Fri Sep 9 21:52:44 2022 +0900

    [jsk_fetch_startup] Fix indent in :inspect-kitchen

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

@knorth55
Copy link
Member Author

knorth55 commented Oct 3, 2022

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

@knorth55
Copy link
Member Author

knorth55 commented Oct 3, 2022

👑 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
Copy link
Member

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 <[email protected]>
Date:   Mon Aug 22 12:12:51 2022 +0900

    [jsk_fetch_startup] Add description tag for kitchen-demo userdata

commit 6a56ffc5c7bae1848d6f65205128b3ec89896c8c
Author: Naoto Tsukamoto <[email protected]>
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 <[email protected]>
Date:   Wed Aug 24 16:28:50 2022 +0900

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

@mqcmd196
Copy link
Member

mqcmd196 commented Oct 7, 2022

May I resolve current conflicts?

@knorth55
Copy link
Member Author

knorth55 commented Oct 7, 2022

@mqcmd196 sorry I resolved the conflicts.

@mqcmd196
Copy link
Member

mqcmd196 commented Oct 7, 2022

Thank you!

sktometometo and others added 25 commits October 31, 2023 18:31
* [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]>
] Change nodelet name to adjust existing nodelet
@tkmtnt7000
Copy link
Member

... 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.