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

Let triplets accept a pari in their constructors #69

Merged
merged 1 commit into from
Jan 26, 2024

Conversation

PatribotsProgramming
Copy link
Member

No description provided.

@PatribotsProgramming PatribotsProgramming added the enhancement New feature or request label Jan 26, 2024
@Jacob1010-h Jacob1010-h merged commit 3d12d32 into 27-handoff-command Jan 26, 2024
@Jacob1010-h Jacob1010-h deleted the triplet-my-beloved branch January 26, 2024 00:37
@Jacob1010-h Jacob1010-h mentioned this pull request Jan 31, 2024
GalexY727 added a commit that referenced this pull request Jan 31, 2024
commit c5b427e
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 20:39:14 2024 -0800

    fix null pointer for emptyCommand

commit 9964648
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 20:39:04 2024 -0800

    fix null pointer exception on INTERPOLATION_MAP

commit 5d83f78
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 20:38:38 2024 -0800

    fix elevator and climbing axis for simulation translation

commit 891d8d2
Merge: daec28a 2bebc02
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 19:59:28 2024 -0800

    It's as shrimple as that! 🦐🦐🦐

commit 2bebc02
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 19:57:20 2024 -0800

    🦐🦐🦐
    Additional changes to soothe the catastrophies that just happened with that merge.

    Co-authored-by: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
    Co-authored-by: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
    Co-authored-by: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
    Co-authored-by: HHQB <145621751+HHQB@users.noreply.github.com>
    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
    Co-authored-by: BredPerson <155865812+BredPerson@users.noreply.github.com>
    Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
    Co-authored-by: Tina H <tina.hague42@gmail.com>

commit 2374676
Merge: 5a1b226 daec28a
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 19:56:30 2024 -0800

    Merge branch 'main' into 27-handoff-command into MAIN

    Co-authored-by: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
    Co-authored-by: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
    Co-authored-by: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
    Co-authored-by: HHQB <145621751+HHQB@users.noreply.github.com>
    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
    Co-authored-by: BredPerson <155865812+BredPerson@users.noreply.github.com>
    Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
    Co-authored-by: Tina H <tina.hague42@gmail.com>

commit 5a1b226
Merge: 6df9548 c3b3260
Author: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Date:   Tue Jan 30 19:38:40 2024 -0800

    Add mechanisms to the 27 branch (#88)

commit c3b3260
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 19:36:08 2024 -0800

    Fix up desired position when it shouldve been non desired (thanks frank!)

commit 2a05772
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 19:28:28 2024 -0800

    only update pivot desired when we change it

commit e766807
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 19:27:44 2024 -0800

    Shrimply move the mechanisms using pose3d 🦐

    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
    Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
    Co-authored-by: Tina H <tina.hague42@gmail.com>

commit daec28a
Author: PaulPad <78040067+Xander228@users.noreply.github.com>
Date:   Tue Jan 30 18:59:04 2024 -0800

    Update components on advantagescope bot

commit 92e68ba
Merge: 5f80931 48fdc6f
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 18:53:05 2024 -0800

    81 auto turning command a swd 73 side quest (#94)

commit 48fdc6f
Merge: ed7fd69 5f80931
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 18:52:56 2024 -0800

    Merge branch 'main' into 81-auto-turning-command-a-swd-73-side-quest

commit ed7fd69
Author: rin-star <148642180+rin-star@users.noreply.github.com>
Date:   Tue Jan 30 18:52:26 2024 -0800

    Update RobotContainer.java

commit b9c213d
Merge: e1923c7 6df9548
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 18:48:30 2024 -0800

    Merge branch '27-handoff-command' into mechanisms-2d

commit 6df9548
Merge: 6f73e4d 677fc28
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 30 18:28:47 2024 -0800

    Added named commands edited piececontrol (#93)

commit 677fc28
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 30 18:28:31 2024 -0800

    added changes

commit 0682e7c
Merge: ef152b8 6f73e4d
Author: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Date:   Tue Jan 30 18:18:44 2024 -0800

    Merge branch '27-handoff-command' into NamedCommands

commit 94dadef
Author: BredPerson <155865812+BredPerson@users.noreply.github.com>
Date:   Wed Jan 31 01:55:33 2024 +0000

    EEEEEEEEEEEEEEEEEEEEE

commit 213e20c
Author: BredPerson <155865812+BredPerson@users.noreply.github.com>
Date:   Wed Jan 31 01:41:16 2024 +0000

    Co-authored-by: frighthunt <frighthunt@users.noreply.github.com>

commit 6f73e4d
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Tue Jan 30 17:20:48 2024 -0800

    add button bindings

commit ef152b8
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 30 17:19:05 2024 -0800

    new named commands

commit 0f9bb09
Author: HHQB <145621751+HHQB@users.noreply.github.com>
Date:   Tue Jan 30 16:33:43 2024 -0800

    Update RobotContainer.java

commit 08c921f
Author: HHQB <145621751+HHQB@users.noreply.github.com>
Date:   Tue Jan 30 16:32:48 2024 -0800

    new named commands

commit 5f80931
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Tue Jan 30 09:52:08 2024 -0800

    move robots outside of robots folder

commit e1923c7
Merge: 0c4efb3 718141b
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 30 00:49:45 2024 -0800

    Merge branch '27-handoff-command' into mechanisms-2d

commit ed5b109
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Tue Jan 30 00:47:19 2024 -0800

    orientate sim robot correctly

commit 0c4efb3
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Tue Jan 30 00:47:01 2024 -0800

    orientate sim robot correctly

commit dac2d8f
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Tue Jan 30 00:34:26 2024 -0800

    Add AdvantageScope assets

    Co-authored-by: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>

commit b8643e2
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Tue Jan 30 00:33:28 2024 -0800

    Add AdvantageScope assets

commit 60f582b
Merge: 51ec0fa 6801069
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Mon Jan 29 17:48:26 2024 -0800

    Update issue templates (#82)

commit 6801069
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Mon Jan 29 17:09:21 2024 -0800

    Update feature_request.md

commit 2a2d1f4
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Mon Jan 29 17:08:39 2024 -0800

    Update bug_report.md

    Tune it to our use case

commit 5acb09f
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 29 17:00:37 2024 -0800

    remove ...

commit ace6aea
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 29 16:58:43 2024 -0800

    Edit issue templates #74

commit c11ba20
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 29 15:14:23 2024 -0800

    some changes for Add issue templates #74

commit 718141b
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sun Jan 28 15:56:35 2024 -0800

    changed elevator motorcount to one

commit 485ab97
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Sun Jan 28 13:42:59 2024 -0800

    Add story

commit 8dafd4e
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Sun Jan 28 13:40:46 2024 -0800

    Update feature_request.md

    remove and edit unused options

commit 8682be7
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Sun Jan 28 13:39:17 2024 -0800

    Update bug_report.md

    Remove some of the unnecessary options.

commit 8c2f270
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Sun Jan 28 12:42:29 2024 -0800

    Update issue templates

commit 51ec0fa
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sun Jan 28 01:56:50 2024 -0800

    The blue speaker is no longer speaking!

commit 1044728
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sat Jan 27 22:10:16 2024 -0800

    Indent bullet points

commit 17621ae
Merge: ed43196 63afb23
Author: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Date:   Sat Jan 27 17:49:24 2024 -0800

    Resolve #75 by going through all of Neo and adding things as necesary. (#78)

commit 63afb23
Merge: 36dbdae ed43196
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sat Jan 27 17:37:22 2024 -0800

    Merge branch 'main' into 75-neojava-health-and-wellness-isFlex

commit 36dbdae
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Sat Jan 27 17:35:07 2024 -0800

    Resolve #75 by going through all of Neo and adding things as necesary.

    Co-authored-by: Hadizah454 <122140803+Hadizah454@users.noreply.github.com>
    Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
    Co-authored-by: Tina H <tina.hague42@gmail.com>

commit ed43196
Merge: 552f6a9 71f0548
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sat Jan 27 15:54:15 2024 -0800

    71 neosettypeneotype type (#77)

commit 71f0548
Merge: 6d2d6af 552f6a9
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sat Jan 27 15:53:09 2024 -0800

    Merge branch 'main' into 71-neosettypeneotype-type

commit 6d2d6af
Author: Tina H <tina.hague42@gmail.com>
Date:   Sat Jan 27 15:44:22 2024 -0800

    change absolute /relative encoder to "only absoulute/relative encoder"

commit 552f6a9
Merge: 8d3588f 165e096
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Sat Jan 27 15:41:05 2024 -0800

    Neo clean up (#76)

    there is more to clean but this is a good start

commit 165e096
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sat Jan 27 15:31:47 2024 -0800

    tick tick tick -> tick

    tick tick tick tick

commit 2fa7831
Author: Tina H <tina.hague42@gmail.com>
Date:   Sat Jan 27 15:11:42 2024 -0800

    Add a telemtry preference switch case to have a naming convention through the StatusFrame enum &
    add uh min delay and max delay to constants surely
    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>

commit 6171db9
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sat Jan 27 15:05:54 2024 -0800

    fixed climb and intake ticks

commit af87775
Author: rin-star <hyunrin.ryu@gmail.com>
Date:   Sat Jan 27 14:58:33 2024 -0800

    added tick()

    might need someone to overlook again

commit 2a05d40
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sat Jan 27 14:44:22 2024 -0800

    added new ticks

commit 5c2c722
Author: rin-star <hyunrin.ryu@gmail.com>
Date:   Sat Jan 27 14:40:17 2024 -0800

    new periodic tick

commit 8d3588f
Author: Hadizah454 <122140803+Hadizah454@users.noreply.github.com>
Date:   Sat Jan 27 13:35:08 2024 -0800

    Update README.md

    Added to highlights

commit ab36e74
Author: RudyG252 <122180943+RudyG252@users.noreply.github.com>
Date:   Sat Jan 27 12:01:47 2024 -0800

    There was an accidental main push which I will now fix with a purposeful main push

commit 601d16e
Author: BredPerson <155865812+BredPerson@users.noreply.github.com>
Date:   Sat Jan 27 11:21:41 2024 -0800

    We need alex transalater

commit abd4000
Merge: 13175cd 03eb223
Author: rin-star <hyunrin.ryu@gmail.com>
Date:   Sat Jan 27 11:08:50 2024 -0800

    Merge branch 'main' of https://github.com/Patribots4738/Crescendo2024

commit 13175cd
Author: rin-star <hyunrin.ryu@gmail.com>
Date:   Sat Jan 27 11:08:43 2024 -0800

    Co-authored-by: Hadizah454 <Hadizah454@users.noreply.github.com>

commit 03eb223
Author: Hadizah454 <122140803+Hadizah454@users.noreply.github.com>
Date:   Sat Jan 27 10:57:58 2024 -0800

    Update README.md

    Added Highlights and added the commands folder to the Major Package Functions with a short description about it.

commit 389c42c
Merge: cd6f2b0 cf76b4c
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Fri Jan 26 22:08:00 2024 -0800

    Whoops. Wrong field width. How do these things even happen?

commit cd6f2b0
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Fri Jan 26 22:03:53 2024 -0800

    make field width and length more precise... because that's JUST what we need

commit cf76b4c
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Fri Jan 26 22:03:53 2024 -0800

    make field width and length more precise... because that's JUST what we need

commit d1100c4
Merge: 06b952d 7825768
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Fri Jan 26 18:48:28 2024 -0800

    setTargetVelocity to setTargetPercent (#72)

commit 7825768
Author: Tina H <tina.hague42@gmail.com>
Date:   Fri Jan 26 18:46:51 2024 -0800

    Fix documentation

commit 39c6845
Author: Tina H <tina.hague42@gmail.com>
Date:   Fri Jan 26 18:40:46 2024 -0800

    Add dcoumentation for setTargetPercent method in Neo.java

commit 61c9323
Author: Tina H <tina.hague42@gmail.com>
Date:   Fri Jan 26 18:02:51 2024 -0800

    change set target velocity to set target percent in Shooter.java and add set target percent to Neo.java

commit b4081e9
Author: Tina H <tina.hague42@gmail.com>
Date:   Fri Jan 26 18:01:50 2024 -0800

    Add set percentage method in Neo & change set Target velocity in Shooter.java to set target percent

commit 06b952d
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Fri Jan 26 17:43:13 2024 -0800

    remove warning surpress for operator controller

commit 3a54a5c
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Fri Jan 26 14:49:21 2024 -0800

    remove second motor and...
    refactor methods to call a setCommand method

commit a6b1ce7
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Fri Jan 26 14:12:38 2024 -0800

    Add idle mode and restoreFactoryDefaults to the constructor of Neo.java

commit 3e03a66
Merge: a22e6a7 52ccd35
Author: Tina H <148731136+derp00monsta@users.noreply.github.com>
Date:   Thu Jan 25 16:42:16 2024 -0800

    Refactor old comments on Neo.java to reflect its current file name (#67)

commit 3d12d32
Merge: e97f18d f042f6d
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Thu Jan 25 16:37:28 2024 -0800

    Let triplets accept a pari in their constructors (#69)

commit f042f6d
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Thu Jan 25 16:27:37 2024 -0800

    Let triplets accept a pari in their constructors

commit e97f18d
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Thu Jan 25 12:36:51 2024 -0800

    remove enum file and move into PieceControl.java

commit f3aded9
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Thu Jan 25 12:34:53 2024 -0800

    rename folders

commit 3ff970f
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Thu Jan 25 12:31:38 2024 -0800

    format all files!!

commit 2ef3aed
Merge: 5b63146 8551700
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Thu Jan 25 12:20:57 2024 -0800

    Turn speedAnglePair into a speedAngleTriplet to allow for offsets (#68)

    This is some good implementation, I love the no more need to the interpolator.

commit 8551700
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Thu Jan 25 12:17:32 2024 -0800

commit 52ccd35
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Thu Jan 25 19:30:31 2024 +0000

    Refactor old comments on Neo.java to reflect it's current file name

commit 9175471
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Thu Jan 25 19:29:17 2024 +0000

    Turn speedAnglePair into speedAngleTriplet using minimal extra logic

commit 5b63146
Merge: a9d2f75 69f06e7
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Thu Jan 25 02:41:41 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/patribots4738/Crescendo2024 into 27-handoff-command

commit a9d2f75
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Thu Jan 25 02:41:37 2024 -0800

    Apply prettier formatting and
    add a startAiming method (for later)

commit 69f06e7
Merge: b9030e8 5355cee
Author: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Date:   Thu Jan 25 02:31:36 2024 -0800

    Make ShooterCalc + SpeedAnglePairs use InterpolatingTreeMaps (#65)

commit 5355cee
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Thu Jan 25 02:30:18 2024 -0800

    Update ShooterCalc.java with #27

commit f2339e5
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Thu Jan 25 02:19:07 2024 -0800

    add unit to rest + max pivot angle constants

commit 838f8ea
Author: Alexander Hamilton <a.hamilton72006@gmail.com>
Date:   Thu Jan 25 02:18:52 2024 -0800

    Convert SpeedAnglePair interpolation to use InterpolatingTreeMap

commit b9030e8
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 17:04:45 2024 -0800

    added todo for gear ratio

commit 7cc053d
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Wed Jan 24 16:40:07 2024 -0800

    rename variables (spelling)

commit 0127bce
Merge: bf1f07a aa74a7d
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 16:37:35 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit bf1f07a
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 16:37:27 2024 -0800

    added hasGamePiece boolean logic (hopefully good)

commit aa74a7d
Merge: 2ceff7d 2a34c67
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Wed Jan 24 16:04:28 2024 -0800

    Make triggerWheel not use enum + refactors (#61)

commit 2a34c67
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Wed Jan 24 14:33:45 2024 -0800

    rename stopCommand to not cause error with pieceControl

    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>

commit c56d916
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Wed Jan 24 14:26:44 2024 -0800

    refactor the trigger wheel to have a desiredSpeed...
    rather than an enum

commit 2ceff7d
Merge: a1a9610 1163860
Author: ChadPad <97857553+PatribotsProgramming@users.noreply.github.com>
Date:   Wed Jan 24 14:10:43 2024 -0800

    Integrate Trigger branch to #27's branch (#60)

    Merging through self review 🤪

commit 1163860
Merge: 91cda6e a1a9610
Author: ChadPad <97857553+PatribotsProgramming@users.noreply.github.com>
Date:   Wed Jan 24 14:07:42 2024 -0800

    Merge branch '27-handoff-command' into Trigger

commit 91cda6e
Author: PatribotsProgramming <patribotsprogramming4738@gmail.com>
Date:   Wed Jan 24 14:04:01 2024 -0800

    rename Trigger to Indexer to prep for PR to #27

    Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>

commit a1a9610
Merge: 1d0509a 1990c43
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Wed Jan 24 13:22:15 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 1d0509a
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Wed Jan 24 13:22:12 2024 -0800

    remove elevator command and rename handoff to piece control

commit 1990c43
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 12:42:29 2024 -0800

    added javadoc to subsystems and ShooterCalc

commit 30f2c23
Merge: 2323426 c9b1e86
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 12:30:09 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 2323426
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 12:21:29 2024 -0800

    Added comments

commit c9b1e86
Merge: 5f1f310 f174006
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Wed Jan 24 12:18:46 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 5f1f310
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Wed Jan 24 12:14:13 2024 -0800

    fix claw method names and make elevator and shooter commands

    adds to #27 and #55

commit f174006
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Wed Jan 24 12:14:13 2024 -0800

    fix claw method names and make elevator and shooter commands

commit 19da0cf
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Wed Jan 24 10:54:47 2024 -0800

    added commands to subsystem classes and changed some booleans to BooleanSuppliers

commit b208d2e
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Wed Jan 24 10:38:07 2024 -0800

    Fix the hadGamePieceLast boolean sync issue.

    Discussed in #51

commit 644db44
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Wed Jan 24 07:56:41 2024 -0800

    write todo

commit 4f5afb7
Merge: a3a6e5a c16f594
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Wed Jan 24 07:55:22 2024 -0800

    Restructured ElevatorCommand to be a file of commands instead of a command file (#51)

    The final change was corrected and it should be good now

commit c16f594
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Wed Jan 24 07:54:15 2024 -0800

    resolve final change #51

commit d76e052
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 21:16:17 2024 -0800

    fix alex's changes

commit 11f2fc6
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 20:49:47 2024 -0800

    resolve Alex's conflicts

    Co-authored-by: Alexander Hamilton <GalexY727@users.noreply.github.com>

commit 0d8f123
Merge: 132bb47 a3a6e5a
Author: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Date:   Tue Jan 23 20:19:00 2024 -0800

    Merge branch '27-handoff-command' into ElevatorCommand

commit a3a6e5a
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 20:01:52 2024 -0800

    changed stop void to stop commands

commit 103d5e9
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 19:47:18 2024 -0800

    removed comment

commit db38abc
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 19:44:25 2024 -0800

    changed run to runOnce

commit 132bb47
Merge: 7bd4331 c631710
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:51:42 2024 -0800

    Merge branch '27-handoff-command' into ElevatorCommand

commit c631710
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:44:45 2024 -0800

    implement 36e6e60...30753bc

commit 1f3f61f
Merge: dd1949b 30753bc
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:43:26 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit dd1949b
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:43:23 2024 -0800

    implement two motors for intake

commit 30753bc
Merge: 31f168a 36e6e60
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 17:38:15 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 31f168a
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 17:37:58 2024 -0800

    added stopAiming and resetShooter

commit cb27ac7
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:30:33 2024 -0800

    edit spellings

commit 36e6e60
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 17:25:11 2024 -0800

    update the note position, then stop the motors

commit 3940508
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 17:02:27 2024 -0800

    fixed method names

commit d057ed1
Merge: b191c6e 1c0db05
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 16:56:59 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit b191c6e
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 16:51:39 2024 -0800

    added new voids and commands to shootercalc

    also fixed robot container instantiating swerve twice (?!)

commit 7bd4331
Author: RudyG252 <122180943+RudyG252@users.noreply.github.com>
Date:   Tue Jan 23 16:51:12 2024 -0800

    Restructured ElevatorCommand to be a file of commands instead of a command file

commit 1c0db05
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 15:52:36 2024 -0800

    fixing prepare firing, according to #48 (comment)

commit 41ee700
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 15:42:12 2024 -0800

    start up motors when shooting

commit 2b8b87a
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 15:41:52 2024 -0800

    some methods that were make might not be needed
    removed is ready
    added enum mor motor direction.
    Trigger Subsystem #30

commit e8e44b6
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Tue Jan 23 12:57:45 2024 -0800

    add the claw to trap method

commit 7eaafd9
Merge: 0d15161 db0c9c1
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Tue Jan 23 12:36:37 2024 -0800

    Merge branch '27-handoff-command' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 0d15161
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Tue Jan 23 12:36:29 2024 -0800

    Implement clawToShooter and rename triggerwheel

commit db0c9c1
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 12:03:46 2024 -0800

    fixed comment

commit 3554991
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 11:52:46 2024 -0800

    subsystems are now passed in through constructor

commit 1876aad
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Tue Jan 23 10:50:00 2024 -0800

    changed shootercalc constructor

commit 0d6dc90
Merge: 0672aa1 bd47c6d
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Tue Jan 23 01:55:43 2024 -0800

    restructured nested command (#46)

commit bd47c6d
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Mon Jan 22 23:52:44 2024 -0800

    restructured nested command

commit 0672aa1
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:49:25 2024 -0800

    remove unused imports

commit 181774f
Merge: ecd0e59 8b3de17
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:44:20 2024 -0800

    Shooter Calc merge into handoff (#44)

commit 8b3de17
Merge: 4688280 ecd0e59
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:43:59 2024 -0800

    Merge branch '27-handoff-command' into ShooterCalc

commit 4688280
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Mon Jan 22 22:31:24 2024 -0800

    added pivot max angle const

    this is so we can convert angle in degrees into a position for the pivot motor

commit fb5b106
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Mon Jan 22 22:23:05 2024 -0800

    added comments

commit ecd0e59
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:20:45 2024 -0800

    add java docs (auto generated)

commit f22e4db
Merge: a5753af 996d7a1
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:17:50 2024 -0800

    Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Crescendo2024 into 27-handoff-command

commit 996d7a1
Merge: e393c02 11da1a0
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Mon Jan 22 22:06:36 2024 -0800

    Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Crescendo2024 into ShooterCalc

commit e393c02
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Mon Jan 22 22:05:41 2024 -0800

    added various commands that use pivot and shooter

commit 11da1a0
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:05:07 2024 -0800

    formatting :DD

commit a5753af
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 22:02:56 2024 -0800

    remove unused handler file

commit 542fa93
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 21:43:52 2024 -0800

    complete refactoring of handoff to be up to date with branches
    The branches are as follows:
    Shooting Calc Comand #33
    Shooter Subystem #31
    Trigger Subsystem #30
    Claw Subsystem #29
    Elevator Command #28
    Elevator Subsystem #26
    Pivot Subsystem #25

commit 5fb4f3f
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 17:36:28 2024 -0800

    resolve Claw conflicts

commit 478c7b6
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 17:34:51 2024 -0800

    fix merge conflicts

commit 5a9cf63
Merge: f2b44bb b0dc755
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 17:33:10 2024 -0800

    Merge branch 'Trigger' into 27-handoff-command

commit b0dc755
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 17:32:18 2024 -0800

    add correct syntax for triggerwheel

commit f2b44bb
Author: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Date:   Mon Jan 22 17:26:10 2024 -0800

    add back trigger wheel

commit 93d9eb9
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:25:55 2024 -0800

    update Pivot with ShooterCalc

commit ff6b2f4
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:25:11 2024 -0800

    update shooter with ShooterCalc

commit 3dfb911
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:13:26 2024 -0800

    Edit Constants

    (this will finish adding all changes currently on origin for all subsystem branches

commit da30c84
Merge: 22fd539 4dbaa02
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:11:24 2024 -0800

    Merge remote-tracking branch 'origin/pivot-subsystem' into 27-handoff-command

commit 22fd539
Merge: 9861f67 00410b9
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:10:39 2024 -0800

    Merge remote-tracking branch 'origin/shooter-subystem' into 27-handoff-command

commit 9861f67
Merge: eaf520f c1cdffa
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:10:16 2024 -0800

    Merge remote-tracking branch 'origin/Trigger' into 27-handoff-command

commit eaf520f
Merge: 1acc7c9 373dc93
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:09:21 2024 -0800

    Merge remote-tracking branch 'origin/claw-subsystem' into 27-handoff-command

commit 1acc7c9
Merge: 8baab9b c01bb57
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:07:19 2024 -0800

    Merge remote-tracking branch 'origin/ShooterCalc' into 27-handoff-command

commit 8baab9b
Merge: f9b309d 443e8c1
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 14:06:51 2024 -0800

    Merge remote-tracking branch 'origin/ElevatorCommand' into 27-handoff-command

    adds the shooterCalc branch to the handoff branch

commit f9b309d
Author: Jacob Hotz <lordgaming1010@gmail.com>
Date:   Mon Jan 22 13:34:26 2024 -0800

    add handoff basics

commit 443e8c1
Author: RudyG252 <122180943+RudyG252@users.noreply.github.com>
Date:   Mon Jan 22 00:07:06 2024 -0800

    ElevatorCommand and Claw Subsystem and Elevator Subsystem

    Climb is bad and need fix with man for chain curve

commit 0f85e61
Author: RudyG252 <122180943+RudyG252@users.noreply.github.com>
Date:   Mon Jan 22 00:06:06 2024 -0800

    ElevatorCommand and Claw Subsystem and Elevator Subsystem

    Climb is bad and need fix with man for chain curve

commit c01bb57
Merge: beb7716 3977d14
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sun Jan 21 16:22:00 2024 -0800

    Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Crescendo2024 into ShooterCalc

commit beb7716
Author: Oliver M. Cushman <olivermcushman@gmail.com>
Date:   Sun Jan 21 16:21:57 2024 -0800

    added pivot and shooter

    yay

commit 373dc93
Author: BredPerson <155865812+BredPerson@users.noreply.github.com>
Date:   Sun Jan 21 16:20:41 2024 -0800

    Claw Soon

commit c1cdffa
Author: rin-star <hyunrin.ryu@gmail.com>
Date:   Sun Jan 21 16:10:47 2024 -0800

    this might be working

    Co-authored-by: frighthunt <frighthunt@users.noreply.github.com>

commit 00410b9
Author: BredPerson <155865812+BredPerson@users.noreply.github.com>
Date:   Sun Jan 21 15:49:12 2024 -0800

    Shooter Works NOW!!!

commit 4dbaa02
Author: Tina H <tina.hague42@gmail.com>
Date:   Sun Jan 21 15:45:51 2024 -0800

    fix errors

commit 1795436
Author: Tina H <tina.hague42@gmail.com>
Date:   Sun Jan 21 15:19:51 2024 -0800

    Make shooter folder & add pivot subsystem

    Co-authored-by: Hadizah454 <Hadizah454@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants