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

[WIP] Add PR2 demo of soup-from-boil #1346

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

[WIP] Add PR2 demo of soup-from-boil #1346

wants to merge 66 commits into from

Commits on Oct 18, 2021

  1. Add PR2 demo of soup-from-boil

    @Kanazawanaoaki @708yamaguchi
    Kanazawanaoaki authored and 708yamaguchi committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    d114562 View commit details
    Browse the repository at this point in the history

  2. Make stable motion and use thermography temperature if possible

    @708yamaguchi
    708yamaguchi committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    1fefe82 View commit details
    Browse the repository at this point in the history

  3. Create ROS package

    @708yamaguchi
    708yamaguchi committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    2670600 View commit details
    Browse the repository at this point in the history

  4. Fix file path

    @708yamaguchi
    708yamaguchi committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    4e6c74d View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2022

  1. Rename files and remove unused functions

    @708yamaguchi
    708yamaguchi committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    29a0327 View commit details
    Browse the repository at this point in the history

  2. Fix load errors

    @708yamaguchi
    708yamaguchi committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    ffa813e View commit details
    Browse the repository at this point in the history

  3. PR2 can do soup-from-boil demo

    @708yamaguchi
    708yamaguchi committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    616bdbf View commit details
    Browse the repository at this point in the history

  4. Remove global variables

    @708yamaguchi
    708yamaguchi committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    abb436e View commit details
    Browse the repository at this point in the history

  5. Remove unused load

    @708yamaguchi
    708yamaguchi committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    dc89c58 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2022

  1. Move files and functions

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    2a08bc0 View commit details
    Browse the repository at this point in the history

  2. Update README

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    132be5f View commit details
    Browse the repository at this point in the history

  3. Create wrench.l for PR2 to detect touch with wrench

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    0526aab View commit details
    Browse the repository at this point in the history

  4. Update README

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    c396f4e View commit details
    Browse the repository at this point in the history

  5. Fix load error

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    9bf2f25 View commit details
    Browse the repository at this point in the history

  6. Detect IH position by touching

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    54d22da View commit details
    Browse the repository at this point in the history

  7. Correct z position of IH kitchen by using touch detection

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    b36b935 View commit details
    Browse the repository at this point in the history

  8. Parameter tunings

    @708yamaguchi
    708yamaguchi committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    7e36399 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. Seperate README

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    48d2eea View commit details
    Browse the repository at this point in the history

  2. Use (move-to-xx-ri), not direct

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    ceb307d View commit details
    Browse the repository at this point in the history

  3. PR2 opens and closes shelf

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    c055a03 View commit details
    Browse the repository at this point in the history

  4. Move functions to make the demo programs clear

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    daa6758 View commit details
    Browse the repository at this point in the history

  5. Wait to finish speak before speech recognition

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    74f8b52 View commit details
    Browse the repository at this point in the history

  6. Add main part for shelf demo

    @708yamaguchi
    708yamaguchi committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    286a025 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Fix for stable demo

    @708yamaguchi
    708yamaguchi committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    e7700fd View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Close *shelf-door* euslisp model before PR2 motion

    @708yamaguchi
    708yamaguchi committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    7ddde51 View commit details
    Browse the repository at this point in the history

  2. Remove global variables

    @708yamaguchi
    708yamaguchi committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    24f3f6b View commit details
    Browse the repository at this point in the history

  3. Correct *pr2* worldpos instead of *ih-knob-coords*

    @708yamaguchi
    708yamaguchi committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    8e3a15b View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. PR2 can set ladle

    @708yamaguchi
    708yamaguchi committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    e95d2b2 View commit details
    Browse the repository at this point in the history

  2. PR2 can take the ladle from the shelf

    @708yamaguchi
    708yamaguchi committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    2efde42 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2022

  1. change ladle position name; 0,1,a -> at-shelf, at-kitchen, at-arrange

    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    ac4affd View commit details
    Browse the repository at this point in the history

  2. fix ladle position name in /demo; now-set-ladle-a-and-plate-with-dial… 

    …ogue -> now-set-ladle-at-arrange-and-plate-with-dialogue
    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    bc76124 View commit details
    Browse the repository at this point in the history

  3. remove now- from funcation's name

    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    4c51c43 View commit details
    Browse the repository at this point in the history

  4. update correct-ih-knob-coords for more robust

    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    5963d66 View commit details
    Browse the repository at this point in the history

  5. In order to organize files and stabilize IK, set-ladle-at-arrange-and… 

    …-plate-with-dialogue was divided into 3 parts, and the plate was placed 10 cm in front.
    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    99aa6d9 View commit details
    Browse the repository at this point in the history

  6. remove white space

    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    791fca8 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Merge pull request #2 from Kanazawanaoaki/rename-functions

    @708yamaguchi
    708yamaguchi authored Mar 17, 2022
    Configuration menu
    Copy the full SHA
    591d0d7 View commit details
    Browse the repository at this point in the history

  2. Change ladle placement position

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    fc329e2 View commit details
    Browse the repository at this point in the history

  3. Fix bugs

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    09f7b9c View commit details
    Browse the repository at this point in the history

  4. Fix load

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    9d54466 View commit details
    Browse the repository at this point in the history

  5. Remove *arrow* from arrangement-at-arrange.l

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    e2b2e20 View commit details
    Browse the repository at this point in the history

  6. Remove *arrow* from ih-at-arrange.l

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    6589220 View commit details
    Browse the repository at this point in the history

  7. Remove *arrow* from tool-at-arrange.l

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    7e8a147 View commit details
    Browse the repository at this point in the history

  8. Correct pot position and angle-vector for (pour-soup)

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    f4ee0c7 View commit details
    Browse the repository at this point in the history

  9. speed up shelf knob search

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    a84018f View commit details
    Browse the repository at this point in the history

  10. Update shelf handling

    @708yamaguchi
    708yamaguchi committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    12b5226 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2022

  1. Combine soup-from-boil and take-tools-off-shelf

    @708yamaguchi
    708yamaguchi committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    5abefc8 View commit details
    Browse the repository at this point in the history

  2. Fix up move functions

    @708yamaguchi
    708yamaguchi committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    676775d View commit details
    Browse the repository at this point in the history

  3. Stable IK when putting ladle in the shelf

    @708yamaguchi
    708yamaguchi committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    a101a6f View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. demos can be executed with Kinematics Simulator

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    e36aede View commit details
    Browse the repository at this point in the history

  2. Add rostest for each demo

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    72353db View commit details
    Browse the repository at this point in the history

  3. Override :inverse-kinematics and assert when IK fails

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    e830f92 View commit details
    Browse the repository at this point in the history

  4. Do not move *ri* in simulation-mode

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    7e033ca View commit details
    Browse the repository at this point in the history

  5. Remove old comment

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    4621e20 View commit details
    Browse the repository at this point in the history

  6. add random coords pr2 in kinematics simulator test

    @Kanazawanaoaki
    Kanazawanaoaki committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    ad02ba8 View commit details
    Browse the repository at this point in the history

  7. Make test time short by skipping *ri* functions

    @708yamaguchi
    708yamaguchi committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    1206b3a View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Merge pull request jsk-ros-pkg#8 from 708yamaguchi/add-random-coords

    @Kanazawanaoaki
    Kanazawanaoaki authored Mar 23, 2022
    Configuration menu
    Copy the full SHA
    bd97aa4 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge pull request #5 from Kanazawanaoaki/add-random-coords

    @708yamaguchi
    708yamaguchi authored Apr 4, 2022
    Configuration menu
    Copy the full SHA
    cd01152 View commit details
    Browse the repository at this point in the history

  2. soup-from-boil IK test pass

    @708yamaguchi
    708yamaguchi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    5c6f071 View commit details
    Browse the repository at this point in the history

  3. take-tools-off-shelf IK test pass

    @708yamaguchi
    708yamaguchi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    4f11a51 View commit details
    Browse the repository at this point in the history

  4. Add (update-view) for irtviewer visualization

    @708yamaguchi
    708yamaguchi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    0758ba9 View commit details
    Browse the repository at this point in the history

  5. Move (update-view) in each move function

    @708yamaguchi
    708yamaguchi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    5ad2249 View commit details
    Browse the repository at this point in the history

  6. Minor changes for demo

    @708yamaguchi
    708yamaguchi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    4e98330 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2022

  1. Take ladle and cup from shelf (not tested with real robot)

    @708yamaguchi
    708yamaguchi committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    b319c46 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Move ladle at kitchen

    @708yamaguchi
    708yamaguchi committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    557ce9c View commit details
    Browse the repository at this point in the history

  2. Print force when touch is not detected for debug

    @708yamaguchi
    708yamaguchi committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    7ad13a0 View commit details
    Browse the repository at this point in the history

  3. Do not ask task status when interactive is nil

    @708yamaguchi
    708yamaguchi committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    3c9a3ff View commit details
    Browse the repository at this point in the history