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

Merge dev onto master #10

Draft
wants to merge 305 commits into
base: master
Choose a base branch
from
Draft

Merge dev onto master #10

wants to merge 305 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jan 29, 2019

  1. Merge branch 'master' into dev

    Bring dev alongside master
    jrmo14 committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    bdf4d5f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev' of github.com:athenian-robotics/Deep-Space-Robot i…

    …nto dev
    
    More git shenanigans
    jrmo14 committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    ea7c916 View commit details
    Browse the repository at this point in the history
  3. Clean and get building

    jrmo14 committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    d1e299b View commit details
    Browse the repository at this point in the history
  4. implement detectCargo

    jacobtkeio committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    c7ba94f View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Reimplement hatch subsystem

    Jacobvs committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    dcea63a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    23af9ae View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d3f8fb6 View commit details
    Browse the repository at this point in the history
  4. Update robot and robotmap

    jrmo14 committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    7da10a4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    41fb86a View commit details
    Browse the repository at this point in the history
  6. Get DrivePathBasic working (at least partially)

    Turtle1331 committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    f0f5ca8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9094391 View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	src/main/java/frc/team852/Robot.java
    #	src/main/java/frc/team852/RobotMap.java
    Jacobvs committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    cb3091d View commit details
    Browse the repository at this point in the history
  9. Make improvements to DrivePathBasic and FieldPaths

    Turtle1331 committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    725a9b6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c0f4685 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6233ebc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    3839fe3 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f864e3c View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. Configuration menu
    Copy the full SHA
    23dfc50 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. Configuration menu
    Copy the full SHA
    82b0cf3 View commit details
    Browse the repository at this point in the history
  2. updated CVObject.py

    20dzhong committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    0f77d69 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8638e5e View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	src/main/python/visionClient.py
    ashah03 committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    98043d1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    115aa6f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    be33fda View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    952237a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    28fcf11 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    50ae1b3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2bb8225 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    1378241 View commit details
    Browse the repository at this point in the history
  12. Merge branch 'driver-assist' of github.com:athenian-robotics/Deep-Spa…

    …ce-Robot into driver-assist
    jrmo14 committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    a1df5c5 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5ad163a View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    cb559bb View commit details
    Browse the repository at this point in the history
  15. Merge branch 'driver-assist' of github.com:athenian-robotics/Deep-Spa…

    …ce-Robot into driver-assist
    jrmo14 committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    e59373b View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6064640 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    0d6d4e5 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c18e430 View commit details
    Browse the repository at this point in the history
  19. Make changes to position tracking stuff

    Turtle1331 committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    ab6564c View commit details
    Browse the repository at this point in the history
  20. Merge branch 'driver-assist' of github.com:athenian-robotics/Deep-Spa…

    …ce-Robot into driver-assist
    jrmo14 committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    4d857e4 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    7b4c3b3 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    4bba66c View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2019

  1. Configuration menu
    Copy the full SHA
    84cc91d View commit details
    Browse the repository at this point in the history
  2. Clean OpenCV processes

    jacobtkeio committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    0795a58 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ec4cf6d View commit details
    Browse the repository at this point in the history
  4. implement viewGaffeTape

    jacobtkeio committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    499eee0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1134759 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    15ec935 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b54fa43 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3b66290 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f5a7c85 View commit details
    Browse the repository at this point in the history
  10. making sure

    20dzhong committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    7fadb6f View commit details
    Browse the repository at this point in the history
  11. changed some name

    20dzhong committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    e159d56 View commit details
    Browse the repository at this point in the history
  12. Default Changelist

    jacobtkeio committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    c49d70b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    2316100 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    47a5ff0 View commit details
    Browse the repository at this point in the history
  15. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	src/main/proto/CVData.proto
    ashah03 committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    344345c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Fix imports

    ashah03 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    bc9e752 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f271e3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    32acdca View commit details
    Browse the repository at this point in the history
  4. Add gRPC callbacks

    jrmo14 committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    dc63b0e View commit details
    Browse the repository at this point in the history
  5. changed hsv garbage

    20dzhong committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    d7a4609 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e5e0496 View commit details
    Browse the repository at this point in the history
  7. implement detectcargo range

    20dzhong committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    ba6e8ca View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    edd6617 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. Configuration menu
    Copy the full SHA
    749b991 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc933c8 View commit details
    Browse the repository at this point in the history
  3. Add drivetrain stuff (a lot)

    Jacobvs committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    75a61c0 View commit details
    Browse the repository at this point in the history
  4. Add drive to angle command

    Jacobvs committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    af1d13b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d0ce13a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a949466 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    29e394d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. Configuration menu
    Copy the full SHA
    57e9084 View commit details
    Browse the repository at this point in the history
  2. Fix some stuff in DriveVelocity

    Turtle1331 committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    61c072c View commit details
    Browse the repository at this point in the history
  3. made changes to test.py

    20dzhong committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    8030617 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. Configuration menu
    Copy the full SHA
    944a79c View commit details
    Browse the repository at this point in the history
  2. streamline viewGaffeTape

    jacobtkeio committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    a1aa80d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e0bc3c View commit details
    Browse the repository at this point in the history
  4. streamline viewGaffeTape

    jacobtkeio committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    65d89c2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    828e12a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    74a1d19 View commit details
    Browse the repository at this point in the history
  7. add TODO

    ExtraE113 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    5fa5b0e View commit details
    Browse the repository at this point in the history
  8. fix typo

    ExtraE113 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    b2a4be0 View commit details
    Browse the repository at this point in the history
  9. general minor fixes

    ExtraE113 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    5dffe25 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5f979b1 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6724db4 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    366679e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    1c4a0e1 View commit details
    Browse the repository at this point in the history
  14. Update subsys and cmd

    jrmo14 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    2154736 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    74d09d2 View commit details
    Browse the repository at this point in the history
  16. Begin implementing DriveDistanceVelocity, add useful methods to Drive…

    …Velocity and Drivetrain
    Turtle1331 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    3d06437 View commit details
    Browse the repository at this point in the history
  17. Implement DriveDistanceVelocity and assign it in OI, put trackDistanc…

    …e constant in Drivetrain
    Turtle1331 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    572d67d View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2019

  1. Add out and *.csv to gitignore

    Turtle1331 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    87aac6f View commit details
    Browse the repository at this point in the history
  2. Update commands

    jrmo14 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    845ad5c View commit details
    Browse the repository at this point in the history
  3. Merge branch 'driver-assist' of github.com:athenian-robotics/Deep-Spa…

    …ce-Robot into driver-assist
    jrmo14 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    01391b9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7535dda View commit details
    Browse the repository at this point in the history
  5. Fix merge

    jrmo14 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    c65677a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    94bc868 View commit details
    Browse the repository at this point in the history
  7. init commit:

    ExtraE113 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    761b0d7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6f02536 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    56bfab4 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2b419cb View commit details
    Browse the repository at this point in the history
  11. Implement AlignTape

    Turtle1331 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    3b9010d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    e00798e View commit details
    Browse the repository at this point in the history
  13. Add arc852 make rule

    ashah03 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    6d8c792 View commit details
    Browse the repository at this point in the history
  14. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    d377f73 View commit details
    Browse the repository at this point in the history
  15. fix viewhatchpanel

    jacobtkeio committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    90314ee View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. sdsd

    20dzhong committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    611b461 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4906c2f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f191b5 View commit details
    Browse the repository at this point in the history
  4. Minor changes

    jrmo14 committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    0be4654 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c2229e2 View commit details
    Browse the repository at this point in the history
  6. Fix gradle build

    jrmo14 committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    130af38 View commit details
    Browse the repository at this point in the history
  7. cleared unnecessary parts of the code, added documentations, categori…

    …zed folders and grpc thread codes
    20dzhong committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    f64dde8 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9bc76a0 View commit details
    Browse the repository at this point in the history
  9. hello

    20dzhong committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    d2dce26 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2019

  1. Fix memory issue caused by a busyloop overwhelming the garbage collec…

    …tor (dev)
    Turtle1331 committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    162f84f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. added file

    20dzhong committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    dbe50ec View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    998e93d View commit details
    Browse the repository at this point in the history
  3. Change makefile python-client

    ashah03 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    7b3b76b View commit details
    Browse the repository at this point in the history
  4. Change camera indices

    ashah03 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    2e67dd3 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Configuration menu
    Copy the full SHA
    3e33fbc View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    8ad2742 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Configuration menu
    Copy the full SHA
    b9d2b39 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2019

  1. Configuration menu
    Copy the full SHA
    35b29b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b8e19b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Configuration menu
    Copy the full SHA
    0745e5f View commit details
    Browse the repository at this point in the history
  2. Update Proto File

    ashah03 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    02cdc45 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bf7a678 View commit details
    Browse the repository at this point in the history
  4. Import changes semi-manually from test-bot branch

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    997af48 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    b5283e4 View commit details
    Browse the repository at this point in the history
  6. Fix typo

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    06a0e4b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e85288e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    04d4f79 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    de8e152 View commit details
    Browse the repository at this point in the history
  10. Add backup drive modes

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    37291f4 View commit details
    Browse the repository at this point in the history
  11. Add buttons for ChangeDriveMode

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    4ab166d View commit details
    Browse the repository at this point in the history
  12. fix drivetrain directionality

    Jacobvs committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    d588762 View commit details
    Browse the repository at this point in the history
  13. Move drive info logging to DriveLogging

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    ba82810 View commit details
    Browse the repository at this point in the history
  14. Change solenoids

    Jacobvs committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    a6cc378 View commit details
    Browse the repository at this point in the history
  15. Add rotation smoothing multiplier

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    b8f3317 View commit details
    Browse the repository at this point in the history
  16. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    8a6a620 View commit details
    Browse the repository at this point in the history
  17. Add separate smoothing for fast/slow gears

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    5a9abf2 View commit details
    Browse the repository at this point in the history
  18. updated refl tape

    20dzhong committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    7b07094 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    5efcb42 View commit details
    Browse the repository at this point in the history
  20. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    af7a3ad View commit details
    Browse the repository at this point in the history
  21. Comment out unused gRPC stuff

    Turtle1331 committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    a21a1ec View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. 2 days reee

    jrmo14 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    9057e76 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	src/main/java/frc/team852/OI.java
    #	src/main/java/frc/team852/Robot.java
    #	src/main/java/frc/team852/RobotMap.java
    #	src/main/java/frc/team852/command/ClimberMove.java
    #	src/main/java/frc/team852/command/PlaceHatch.java
    #	src/main/java/frc/team852/subsystem/ClimberSubsystem.java
    #	src/main/java/frc/team852/subsystem/ElevatorSubsystem.java
    jrmo14 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    708df5e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    afd9ae2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    288dffe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a2d82ab View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5a5361c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5b9f964 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    91dd3fc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c2523de View commit details
    Browse the repository at this point in the history
  10. Reduce camera resolution

    ashah03 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    d30fc86 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    53cbb89 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7bbb7ea View commit details
    Browse the repository at this point in the history
  13. Add gear state to Shuffleboard

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    e9ddbd6 View commit details
    Browse the repository at this point in the history
  14. Fix reversed hatch output solenoid

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    8be4919 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    295913e View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b31301e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    9f0a3b1 View commit details
    Browse the repository at this point in the history
  18. Change resolution

    ashah03 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    86c6fa7 View commit details
    Browse the repository at this point in the history
  19. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    073543c View commit details
    Browse the repository at this point in the history
  20. I don't know why this works but it does

    I feel like someone owes me money
    ExtraE113 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    5212fc3 View commit details
    Browse the repository at this point in the history
  21. Try to get the elevator to work

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    08fbdce View commit details
    Browse the repository at this point in the history
  22. Add cam line drawing test

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    04ae3df View commit details
    Browse the repository at this point in the history
  23. Fix typo

    Turtle1331 committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    15c2e59 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. update drivechangable -- used hack - fix later

    implemented auto climb command
    Jacobvs committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    db2297d View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    8221672 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1200239 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b0b825 View commit details
    Browse the repository at this point in the history
  5. Fix typo

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    b4b2aab View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    62e06f5 View commit details
    Browse the repository at this point in the history
  7. Clean socket_server

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    6582eef View commit details
    Browse the repository at this point in the history
  8. Work on socket_server

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    60443d0 View commit details
    Browse the repository at this point in the history
  9. Test with visionClient

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    c246534 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    97c04fc View commit details
    Browse the repository at this point in the history
  11. Increase resolution

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    2d1a40d View commit details
    Browse the repository at this point in the history
  12. updated view Refl Tape

    20dzhong committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    f896941 View commit details
    Browse the repository at this point in the history
  13. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    e476748 View commit details
    Browse the repository at this point in the history
  14. turn in place

    Turtle1331 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    2d28dcc View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    2c93006 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    16b71e8 View commit details
    Browse the repository at this point in the history
  17. Increase resolution

    ashah03 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    15afd3c View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    9952550 View commit details
    Browse the repository at this point in the history
  19. Add led utils

    Jacobvs committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    218d264 View commit details
    Browse the repository at this point in the history
  20. Clean wrist subsystem

    jrmo14 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    358383d View commit details
    Browse the repository at this point in the history
  21. Re clean wrist subsystem

    jrmo14 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    dc5f87c View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    7dbd4a4 View commit details
    Browse the repository at this point in the history
  23. wrist bangbang functional

    Jacobvs committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    07f6f36 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    1acda77 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    fb3ffa4 View commit details
    Browse the repository at this point in the history
  26. updated some commmentaion

    20dzhong committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    b2e54f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. double checking :)

    20dzhong committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    be5ca3b View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	src/main/java/frc/team852/OI.java
    #	src/main/java/frc/team852/RobotMap.java
    #	src/main/java/frc/team852/command/WristMove.java
    #	src/main/java/frc/team852/subsystem/WristSubsystem.java
    ExtraE113 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    e1d6da9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8dee9ae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f17afc9 View commit details
    Browse the repository at this point in the history
  5. add servo

    Jacobvs committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    2f0b2a8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bbf3a36 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a94b5ed View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9a3aaa4 View commit details
    Browse the repository at this point in the history
  9. remove old file

    ExtraE113 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    35f2f13 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2e5234e View commit details
    Browse the repository at this point in the history
  11. Remove data store

    Add elevator height enum
    jrmo14 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    146b3d4 View commit details
    Browse the repository at this point in the history
  12. fix servo and light control

    Jacobvs committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    59e5524 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    06d1614 View commit details
    Browse the repository at this point in the history
  14. Fix Jacob's code

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    bcb6a51 View commit details
    Browse the repository at this point in the history
  15. update Elevator Move

    jrmo14 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    29f3a1d View commit details
    Browse the repository at this point in the history
  16. Make elevator setpoint non-static

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    95ab9ff View commit details
    Browse the repository at this point in the history
  17. add team color default

    Jacobvs committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    49dbb20 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    3080584 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    f68497f View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    1d84801 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    3cdbb31 View commit details
    Browse the repository at this point in the history
  22. Make elevator fixes

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    339225e View commit details
    Browse the repository at this point in the history
  23. ball shit

    ExtraE113 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    b7b9e8f View commit details
    Browse the repository at this point in the history
  24. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    5fa8aa4 View commit details
    Browse the repository at this point in the history
  25. Prevent elevator from moving up when wrist is up

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    9a39ec8 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    c461653 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    26a329f View commit details
    Browse the repository at this point in the history
  28. Add LED indicator to elevator error

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    162751f View commit details
    Browse the repository at this point in the history
  29. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    f911017 View commit details
    Browse the repository at this point in the history
  30. Fix default wrist state

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    0609784 View commit details
    Browse the repository at this point in the history
  31. Add elevator safety in bang-bang control

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    ff99853 View commit details
    Browse the repository at this point in the history
  32. Try to cancel status light

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    c036fa8 View commit details
    Browse the repository at this point in the history
  33. ball shit v2

    ExtraE113 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    2137cca View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    474504a View commit details
    Browse the repository at this point in the history
  35. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    8c3d067 View commit details
    Browse the repository at this point in the history
  36. ball shit v3-timing

    ExtraE113 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    37b3ecf View commit details
    Browse the repository at this point in the history
  37. Merge remote-tracking branch 'origin/dev' into dev

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    9941618 View commit details
    Browse the repository at this point in the history
  38. Fix status light for elevator safety

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    4bc6ac3 View commit details
    Browse the repository at this point in the history
  39. Change drive tuning

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    6ac2076 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    66eb9f0 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    b5827f1 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    5bcb90f View commit details
    Browse the repository at this point in the history
  43. Adjust elevator mid-hatch height

    Turtle1331 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    f4ef545 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Add manual control of pogo

    Jacobvs committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    feae2ec View commit details
    Browse the repository at this point in the history
  2. Add manual control of pogo

    Jacobvs committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    17f3f46 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Configuration menu
    Copy the full SHA
    21c8012 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95a1e5e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    718ff08 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. Comp pracitice day bs

    jrmo14 committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    18eb2f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

  1. Configuration menu
    Copy the full SHA
    7c07b4e View commit details
    Browse the repository at this point in the history
  2. Event commit

    jrmo14 committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    15dbe3e View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2019

  1. competition changes

    Jacobvs committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    825f12b View commit details
    Browse the repository at this point in the history
  2. fix pogo auto retract

    Jacobvs committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    d37279f View commit details
    Browse the repository at this point in the history
  3. fix pogo auto retract

    Jacobvs committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    c7a5e57 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2019

  1. push post comp changes

    jrmo14 committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    0acf512 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. Update README.md

    jrmo14 authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    62b75b2 View commit details
    Browse the repository at this point in the history