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

Dev #8

Open
wants to merge 84 commits into
base: Climber-Maaz
Choose a base branch
from
Open

Dev #8

wants to merge 84 commits into from

Commits on Feb 8, 2020

  1. accounted for the other cansparks for drivetrain

    @jyin2
    jyin2 committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    989df43 View commit details
    Browse the repository at this point in the history

  2. changed a drivetrian command and checked if ids for cansparkmaxs are … 

    …correct
    @jyin2
    jyin2 committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    0dd433a View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. made a lot of changes

    @jyin2
    jyin2 committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    ad6ecfa View commit details
    Browse the repository at this point in the history

  2. added alternate encoder methods

    @jyin2
    jyin2 committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    5ef29a3 View commit details
    Browse the repository at this point in the history

  3. added in alternate encoder

    @jyin2
    jyin2 committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    51eb20e View commit details
    Browse the repository at this point in the history

  4. Changing and testing things in Drivetrain 

    Still not done unfortunately but will continue tomorrow
    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    4b87978 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. changed cpr for the encoders

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    4c68e64 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2020

  1. changed test values

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 16, 2020
    Configuration menu
    Copy the full SHA
    e1a9ced View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. deleted unnecessary commands

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    a3602d9 View commit details
    Browse the repository at this point in the history

  2. Uh oH 

    yes
    @franciscotimoh
    franciscotimoh committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    16386eb View commit details
    Browse the repository at this point in the history

  3. made new changes for compressor

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    a50ba83 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into Drivetrain-test

    @fidgetspinnerkid
    fidgetspinnerkid authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    12f892a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5 from Team2791/Drivetrain-test 

    Drivetrain test
    @fidgetspinnerkid
    fidgetspinnerkid authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    21500e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. changed shooter command groups

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    b5c2897 View commit details
    Browse the repository at this point in the history

  2. changed hopper to two outputs

    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    78d9dcf View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. Saturday Changes 

    Need to change command group linings
    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    e2b0bce View commit details
    Browse the repository at this point in the history

  2. Panel Mech 

    Mech Neck initialize
    @fidgetspinnerkid
    fidgetspinnerkid committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    fd109b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. cleaned up code

    @jyin2
    jyin2 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    52a3cc5 View commit details
    Browse the repository at this point in the history

  2. finished cleaning code

    @jyin2
    jyin2 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    142f447 View commit details
    Browse the repository at this point in the history

  3. added in contral panel constants and ids

    @jyin2
    jyin2 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    0a3a015 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Climber-Maaz' into dev

    @Maaz-H
    Maaz-H authored Feb 25, 2020
    Configuration menu
    Copy the full SHA
    ea96ff8 View commit details
    Browse the repository at this point in the history

  5. Adds Shooter PID Subsystem

    @frcteam2791
    frcteam2791 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    d52d55b View commit details
    Browse the repository at this point in the history

  6. Added Camera Switching

    @frcteam2791
    frcteam2791 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    fabf11a View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. reorganized a couple things

    @jyin2
    jyin2 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    75062f8 View commit details
    Browse the repository at this point in the history

  2. reorganized stuff

    @jyin2
    jyin2 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    e95f6cd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    b31c896 View commit details
    Browse the repository at this point in the history

  4. merged climb

    @frcteam2791
    frcteam2791 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    f249020 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    d51972a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. Climber code 

    Added iterative based crap in the subsystems because if/else in commands was buggy
NEED TO ADD command based if/else and replace subsytem methods
    @frcteam2791
    frcteam2791 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    71bebe2 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2020

  1. Shooter PID & hopper tuning from the tech park with Justin (Friday ni… 

    …ght)
    @frcteam2791
    frcteam2791 committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    5faf552 View commit details
    Browse the repository at this point in the history

  2. Close trench shot and wall shot tuned

    @frcteam2791
    frcteam2791 committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    6d10d57 View commit details
    Browse the repository at this point in the history

  3. End of saturday at tech park

    @frcteam2791
    frcteam2791 committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    654fe91 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2020

  1. Added Two Cameras

    @frcteam2791
    frcteam2791 committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    e9f92c8 View commit details
    Browse the repository at this point in the history

  2. Tuned intake/hopper speeds and PID for wall shot 

    Hopper is better at holding 5 but there is still a jam case when spacing isn't controlled properly. Wall shot was oscillating/taking a bit of time to spin up--new pid constants found to add possibility for a second pid controller
    @frcteam2791
    frcteam2791 committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    7883ec6 View commit details
    Browse the repository at this point in the history

  3. Reduced buttons (added commands) 

    Yet to be tested
    @frcteam2791
    frcteam2791 committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    ae61597 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    311c915 View commit details
    Browse the repository at this point in the history

  5. added some extend methods and timer 

    added extend methods to some subsystems

added a timer to the hopper piston extension

started the toggle for setPanelMech
    @allison-kunin
    allison-kunin committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    e678663 View commit details
    Browse the repository at this point in the history

  6. changed setPanelMech so it works hopefully

    @allison-kunin
    allison-kunin committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    b7bef51 View commit details
    Browse the repository at this point in the history

  7. changed set panel mech and put it in oi

    @allison-kunin
    allison-kunin committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    8f1a354 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. cleaned up commands and folders a little

    @allison-kunin
    allison-kunin committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    f209104 View commit details
    Browse the repository at this point in the history

  2. used timer for hopper pistons

    @allison-kunin
    allison-kunin committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    c639233 View commit details
    Browse the repository at this point in the history

  3. changed command groups

    @allison-kunin
    allison-kunin committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    2520d18 View commit details
    Browse the repository at this point in the history

  4. Added Shooter Sequences 

    Put hood, hopper stopper, and firing hopper all on one button. Added Control panel camera and changed setCamera commands to work
    @frcteam2791
    frcteam2791 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    9da3d1d View commit details
    Browse the repository at this point in the history

  5. Added Merged Commands Tested at Tech Park Monday 

    Tested last night's commit commands and have working hood/stoppers/hopper firing and intake/hopper running
    @frcteam2791
    frcteam2791 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    fcbdb53 View commit details
    Browse the repository at this point in the history

  6. Test commands for driving 

    Manually moving climber and manipulator on a 3rd controller personally for Atharv
    @franciscotimoh
    franciscotimoh committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    4bfb637 View commit details
    Browse the repository at this point in the history

  7. Hopper Stoppers added to Intake/Hopper Button

    @franciscotimoh
    franciscotimoh committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    ceb0c9f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @franciscotimoh
    franciscotimoh committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    2b2b98f View commit details
    Browse the repository at this point in the history

  9. changed setpanelmech() to a toggle kind of

    @frcteam2791
    frcteam2791 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    0e738cb View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. Tech Park Tuning 

    Fixed stop shooter group to stop hopper too. Tried faster hopper output and commented old speed
    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    d15f5ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    253bd59 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    0e180eb View commit details
    Browse the repository at this point in the history

  4. changed panel mech button in oi

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    60751b5 View commit details
    Browse the repository at this point in the history

  5. Added Hopper Counter and Jam commands 

    Jam indicator added and Unjam command added along with counter for the number of balls intaken (all need to be tested)
    @xprt656
    xprt656 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    62912b8 View commit details
    Browse the repository at this point in the history

  6. changed set panel mech command and changed it in oi

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    42a7a95 View commit details
    Browse the repository at this point in the history

  7. Added Camera Switch to Pit Controller

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    07cba74 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    994781c View commit details
    Browse the repository at this point in the history

  9. Changed Pit Camera Buttons to not Conflict 

    Changed pit camera buttons to dpad so they don't conflict with the climb
    @frcteam2791
    frcteam2791 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    9c9330a View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. added limit switch 

    added a limit switch using a counter object for hopper
    @frcteam2791
    frcteam2791 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    2910c4a View commit details
    Browse the repository at this point in the history

  2. Fixed hooper/intake

    @frcteam2791
    frcteam2791 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    078f197 View commit details
    Browse the repository at this point in the history

  3. laptop swap push

    @frcteam2791
    frcteam2791 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    b179a69 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Updated Constants 

    Limit Switch constants tuned but reverted back to IR. Panel Mech updated but never tested. Tech park 3/4
    @frcteam2791
    frcteam2791 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    7ee5482 View commit details
    Browse the repository at this point in the history

  2. cleaned up some small stuff

    @chrisLane279
    chrisLane279 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    1eb82a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Updated shooter and hopper speeds.

    @frcteam2791
    frcteam2791 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    62fbea2 View commit details
    Browse the repository at this point in the history

  2. Drivetrain Pid Controller 

    Added pid controller for drivetrain to drive straight back into trench
TODO: Tune pid, tune distance to drive, add command group to intake ball, align, and shoot
    @xprt656
    xprt656 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    65e9b3e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @xprt656
    xprt656 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    5c81abd View commit details
    Browse the repository at this point in the history

  4. Update CameraSwitch.java 

    made camrelay2 static
    @chrisLane279
    chrisLane279 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    b47d6f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2020

  1. Tech Park Update + Control Panel 

    Control Panel working. Beam break sensors replaced IR and hopper/intake (new) retuned. Changed shooter/voltage compensation
    @frcteam2791
    frcteam2791 committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    49f8822 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    671b435 View commit details
    Browse the repository at this point in the history

  3. Added Reverse Intake and Hopper 

    Reverse intake command added. Reverse Hopper until it reaches the mouth of the hopper added.
    @frcteam2791
    frcteam2791 committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    479439a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    dbe19e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2020

  1. Allisons changes

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    8bd9bbf View commit details
    Browse the repository at this point in the history

  2. Limelight and SmartDashboard Layouts 

    Moved all pipelines off local
    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    c11244d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    d05be2b View commit details
    Browse the repository at this point in the history

  4. Second Beam Break Hopper

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    f9005d2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    556485f View commit details
    Browse the repository at this point in the history

  6. Messed With 2 beam and tempoprarily reverted to 1 beam

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    bdbb223 View commit details
    Browse the repository at this point in the history

  7. Fixed PID

    @frcteam2791
    frcteam2791 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    f471dc8 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. made an auto method in drivetrain

    @frcteam2791
    frcteam2791 committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    0ce8b2c View commit details
    Browse the repository at this point in the history

  2. Added Double Ir Hopper Code and Maybe the fifth ball 

    Added double ir hopper code that should fit 4 with good spacing and stop when full as well as code for a fifth ball                                                 --times and functionaility need to be tested
    @xprt656
    xprt656 committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    f33384e View commit details
    Browse the repository at this point in the history

  3. Fixed Double Beam Break Hopper to use Two Sensors

    @xprt656
    xprt656 committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    011313c View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Added another autonomus (I used math)

    @chrisLane279
    chrisLane279 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    cf4f93b View commit details
    Browse the repository at this point in the history

  2. Stopped auto timer in teleop init

    @chrisLane279
    chrisLane279 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    b8fb482 View commit details
    Browse the repository at this point in the history

  3. Added comments for auto placement in pits

    @chrisLane279
    chrisLane279 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    75c577c View commit details
    Browse the repository at this point in the history

  4. removed a ton of unused imports

    @chrisLane279
    chrisLane279 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    526e028 View commit details
    Browse the repository at this point in the history