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

Optional templates #2

Open
AshayAswale opened this issue Jan 14, 2021 · 1 comment
Open

Optional templates #2

AshayAswale opened this issue Jan 14, 2021 · 1 comment

Comments

@AshayAswale
Copy link
Member

on hold:
services:
nodelets:
@Ronoman
Copy link
Contributor

Ronoman commented Mar 25, 2021

That's odd, the above commit message was the auto-generated commit message, but apparently it thinks we were referring to this issue

AshayAswale added a commit that referenced this issue Mar 31, 2021
@AshayAswale
Merged with demo_main.
f635c38 
Squashed commit of the following:

commit 3ec31e4
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 15:00:49 2021 -0400

    resource localiser out of range fix

commit fb7c173
Merge: ced51ce e0b5d12
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 13:36:15 2021 -0400

    Merge branch 'eli_demo' into demo_main

commit e0b5d12
Author: Eli Benevedes <[email protected]>
Date:   Fri Mar 26 12:35:46 2021 -0400

    Scout state machine works with resource localiser

    Previously, we were incorrectly checking if the nav client was done in LOCATE, instead of the resource localiser client. Fixed.

    Backed off BASE_SPEED from 0.75 to 0.6

    Ignored duplicate transforms in publish cheat odom.

commit ced51ce
Merge: 8864c30 cae20e4
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 08:41:06 2021 -0400

    Merge branch 'mahi_eli_main' into demo_main

commit 8864c30
Merge: fd674d8 62c248b
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 08:05:22 2021 -0400

    Merge branch 'chintan_rohan' into demo_main

commit fd674d8
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 07:45:34 2021 -0400

    Compilation fix after merge

commit 71ca088
Merge: 3fd213f 528ecee
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 07:41:41 2021 -0400

    Merge branch 'mahi_main' into demo_main

commit 528ecee
Merge: c82da82 1683d9e
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 07:38:33 2021 -0400

    Merge branch 'eli_fork' into mahi_main

commit 3fd213f
Merge: 4822550 dbd394c
Author: Ashay Aswale <[email protected]>
Date:   Fri Mar 26 07:24:25 2021 -0400

    Merge branch 'forked_main' into demo_main

commit 62c248b
Author: chintujaguar <[email protected]>
Date:   Fri Mar 26 05:03:03 2021 +0000

    Updated excavator nodes with target position and smoother movement of joints

commit cae20e4
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 20:15:48 2021 -0400

    debug--it works!

commit 1683d9e
Merge: 49cd687 4822550
Author: Eli Benevedes <[email protected]>
Date:   Thu Mar 25 19:31:05 2021 -0400

    Merge branch 'main' of github.com:WPI-NASA-SRC-P2/capricorn_competition_round into main

commit 49cd687
Author: Eli Benevedes <[email protected]>
Date:   Thu Mar 25 19:28:52 2021 -0400

    Scout state machine works!

commit 5911c84
Author: chintujaguar <[email protected]>
Date:   Thu Mar 25 23:01:22 2021 +0000

    updated action server client nodes with x,y target for shoulder yaw joint

commit 0d00e4f
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 18:03:07 2021 -0400

    print

commit 87b71e1
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:59:43 2021 -0400

    threshold change

commit c3b0dea
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:56:47 2021 -0400

    default velocities

commit 6fcf184
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:52:09 2021 -0400

    fix width

commit a693411
Author: WaliaRohan <[email protected]>
Date:   Thu Mar 25 17:51:23 2021 -0400

    Made preliminary changes to Excavator action file, client and server

commit f474b9c
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:50:41 2021 -0400

    curly braces

commit e39722a
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:50:15 2021 -0400

    write callback, specify object as repair station

commit f2d05c0
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:43:50 2021 -0400

    nav vision

commit e61ed33
Merge: 5c6ffdc 41e6cba
Author: MahimanaGIT <[email protected]>
Date:   Thu Mar 25 17:12:59 2021 -0400

    updating nav vision

commit 5c6ffdc
Author: MahimanaGIT <[email protected]>
Date:   Thu Mar 25 17:10:48 2021 -0400

    updating navigation vision

commit 41e6cba
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:07:14 2021 -0400

    write callback function

commit de5f41b
Author: chrisdemaio <[email protected]>
Date:   Thu Mar 25 17:02:49 2021 -0400

    remove errors/unnecessary

commit d4fb36b
Author: MahimanaGIT <[email protected]>
Date:   Thu Mar 25 16:56:03 2021 -0400

    Adding nav vision/ eli main

commit 16cfaaa
Merge: fff20e7 825bbc7
Author: WaliaRohan <[email protected]>
Date:   Thu Mar 25 16:45:48 2021 -0400

    Merge branch 'rocinante_main' into Rohan
    Merging with rocinante_main to reflect changes made to excavator code.

commit 2805904
Author: Eli Benevedes <[email protected]>
Date:   Thu Mar 25 12:55:43 2021 -0400

    Removed extra comments and loud debugs

commit 299a897
Author: Eli Benevedes <[email protected]>
Date:   Thu Mar 25 12:53:58 2021 -0400

    Matching final orientation works

commit dbd394c
Author: Ashay Aswale <[email protected]>
Date:   Thu Mar 25 01:10:40 2021 -0400

    compilation error fix

commit da66e59
Author: Ashay Aswale <[email protected]>
Date:   Thu Mar 25 01:00:20 2021 -0400

    Can set orientation in resource_localiser.

commit 568b46b
Author: Eli Benevedes <[email protected]>
Date:   Wed Mar 24 23:55:49 2021 -0400

    Nav actionlib server, tests, and scout state machine

    Actionlib server (and nodes in this repo interacting with it) now depend on drive_mode, which is a NAV_TYPE in common_names.h. New dispatch has not been tested.
    Added tests to operations to test NavigationAlgo::changeInPosition. Tests have not been tested
    Implemented scout state machine states used for the demo. Have not tested.

commit c82da82
Author: MahimanaGIT <[email protected]>
Date:   Wed Mar 24 23:27:42 2021 -0400

    Updating navigation vision cpp

commit 20963a8
Author: chrisdemaio <[email protected]>
Date:   Wed Mar 24 23:12:47 2021 -0400

    more variable declarations, include files

commit 0ce9cba
Author: chrisdemaio <[email protected]>
Date:   Wed Mar 24 23:09:35 2021 -0400

    variable declarations

commit 7eacda5
Author: chrisdemaio <[email protected]>
Date:   Wed Mar 24 23:05:16 2021 -0400

    Fix string declaration

commit aa17e5f
Author: MahimanaGIT <[email protected]>
Date:   Wed Mar 24 23:00:00 2021 -0400

    Adding navigation to Cmake operations

commit 8174e96
Author: MahimanaGIT <[email protected]>
Date:   Wed Mar 24 22:54:31 2021 -0400

    Resolving merge conflict

commit 0485293
Merge: 7ad2ff6 d09b65e
Author: Eli Benevedes <[email protected]>
Date:   Wed Mar 24 15:23:15 2021 -0400

    Merge remote-tracking branch 'ashay/main' into main

commit d09b65e
Author: Ashay Aswale <[email protected]>
Date:   Wed Mar 24 12:25:09 2021 -0400

    scout SM skeleton

commit 7ad2ff6
Merge: a954090 06e9214
Author: Eli Benevedes <[email protected]>
Date:   Wed Mar 24 12:05:18 2021 -0400

    Merged from main repo'

commit a954090
Author: Eli Benevedes <[email protected]>
Date:   Wed Mar 24 11:55:26 2021 -0400

    Small style changes

commit e88ef7d
Merge: 1a28576 06e9214
Author: Ashay Aswale <[email protected]>
Date:   Wed Mar 24 11:38:24 2021 -0400

    Merge branch 'main' into forked_main

commit 825bbc7
Merge: f509636 c7dcd93
Author: Chintan Desai <[email protected]>
Date:   Wed Mar 24 00:30:35 2021 -0400

    Merge branch 'main' into rocinante_main

commit f509636
Author: chintujaguar <[email protected]>
Date:   Wed Mar 24 00:24:53 2021 -0400

    updated Excavator.action file to not rely on wrist position for deciding task

commit 9b9fdf8
Author: chintujaguar <[email protected]>
Date:   Tue Mar 23 23:57:38 2021 -0400

    tested and commented excavator action nodes

commit e30d014
Merge: a89c927 89f1e47
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 23:08:52 2021 -0400

    Merge branch 'main' of https://github.com/MahimanaGIT/capricorn_competition_round into main

commit a89c927
Merge: 5f34454 c7dcd93
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 23:08:34 2021 -0400

    Merging commit

commit 89f1e47
Author: chrisdemaio <[email protected]>
Date:   Tue Mar 23 22:40:07 2021 -0400

    Add some comments

commit 6a78229
Author: chrisdemaio <[email protected]>
Date:   Tue Mar 23 22:35:13 2021 -0400

    Change "size" to "height"

commit 9abf44c
Author: chrisdemaio <[email protected]>
Date:   Tue Mar 23 22:30:44 2021 -0400

    Generalize for any object

commit a2ed691
Author: chrisdemaio <[email protected]>
Date:   Tue Mar 23 22:24:20 2021 -0400

    Fill in objects_callback

commit 5f34454
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 21:19:24 2021 -0400

    Adding new labels to object detection model

commit a10ac3c
Merge: cd1c7af 3a2a47a
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 20:02:23 2021 -0400

    Merge remote-tracking branch 'upstream/main' into main

commit cd1c7af
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 20:01:46 2021 -0400

    Adding sample files for navigation vision

commit daee499
Author: MahimanaGIT <[email protected]>
Date:   Tue Mar 23 19:58:16 2021 -0400

    Updating object detection model

commit e90caf9
Author: Eli Benevedes <[email protected]>
Date:   Tue Mar 23 16:38:31 2021 -0400

    Fixed PR comments

commit 1a28576
Author: Ashay Aswale <[email protected]>
Date:   Tue Mar 23 15:41:40 2021 -0400

    WIP: state machine and resource localiser

commit fff20e7
Author: WaliaRohan <[email protected]>
Date:   Tue Mar 23 15:08:14 2021 -0400

    Added test file

commit 40a9944
Author: chintujaguar <[email protected]>
Date:   Tue Mar 23 14:55:31 2021 -0400

    Added comments to hauler nodes and creatated excavator nodes

commit 495056d
Author: Eli Benevedes <[email protected]>
Date:   Mon Mar 22 21:32:20 2021 -0400

    Remove extra waypoint in navigation server planner function call

commit 9dc4a1f
Merge: c062e5f 3a2a47a
Author: Eli Benevedes <[email protected]>
Date:   Mon Mar 22 21:26:27 2021 -0400

    Merged upstream with local repo

commit c062e5f
Author: Eli Benevedes <[email protected]>
Date:   Mon Mar 22 21:21:11 2021 -0400

    Nav code in a functional state for demo

commit 6327484
Author: Eli Benevedes <[email protected]>
Date:   Mon Mar 22 18:22:39 2021 -0400

    Lots of work done. Trajectory following now seems to work (roslaunch operations nav_test.launch, publish anything to cmd_vel). Next steps: Cleanup, refactor, comment, fully implement manual driving, then PR

commit 04506d1
Author: Eli Benevedes <[email protected]>
Date:   Mon Mar 22 00:24:47 2021 -0400

    Builds. Next step: test the navigation actionlib server.

commit fd3bfd9
Author: Eli Benevedes <[email protected]>
Date:   Sun Mar 21 14:42:59 2021 -0400

    Mid testing, tf2 is not working

commit 22085bf
Author: chintujaguar <[email protected]>
Date:   Fri Mar 19 18:34:51 2021 -0400

    Hauler bin position action client and server

commit 671cb2a
Merge: 084b005 911a72b
Author: Eli Benevedes <[email protected]>
Date:   Fri Mar 19 18:32:34 2021 -0400

    Merged + testing now running, but are failing (too many sig figs on output)

commit 911a72b
Merge: e34b74a c97380b
Author: Eli Benevedes <[email protected]>
Date:   Fri Mar 19 17:09:38 2021 -0400

    Merge pull request #1 from denniscr98/main

    Merging for further Gtesting and debugging

commit 084b005
Author: Eli Benevedes <[email protected]>
Date:   Fri Mar 19 17:09:23 2021 -0400

    More work done on navigation system. About to merge in test code.

commit c97380b
Author: Dennis Chavez Romero <[email protected]>
Date:   Thu Mar 11 17:00:52 2021 +0000

    unfinished testing for gtest.

commit bbdc326
Author: Dennis Chavez Romero <[email protected]>
Date:   Thu Mar 11 16:24:59 2021 +0000

    Began working on gtest for Nav algo.

commit f80e035
Merge: 683b477 e34b74a
Author: Dennis Chavez <[email protected]>
Date:   Thu Mar 11 10:24:35 2021 -0500

    Merge pull request #2 from Ronoman/navigation

    Update Navigation branch

commit 683b477
Merge: 04fefc7 39b65c7
Author: Dennis Chavez <[email protected]>
Date:   Thu Mar 11 10:18:58 2021 -0500

    Merge pull request #1 from Ronoman/main

    Updating fork

commit e34b74a
Author: Eli Benevedes <[email protected]>
Date:   Sun Mar 7 15:44:54 2021 -0500

    Updated tests to pull a function from another package. Began implementing a simple point-and-turn navigation solution.

commit c762d4d
Author: Eli Benevedes <[email protected]>
Date:   Fri Mar 5 15:11:02 2021 -0500

    Started updating actionlib server. Currently not working.

commit 4e34937
Author: Eli Benevedes <[email protected]>
Date:   Thu Mar 4 17:00:45 2021 -0500

    Added trajectory with velocities message, wrote test node to intake and process
AshayAswale pushed a commit that referenced this issue Apr 13, 2021
@MahimanaGIT
Merge pull request #2 from MahimanaGIT/eli/main
0bb1ceb 
Eli/main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Ronoman @AshayAswale