Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sirchangealot #10

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

Sirchangealot #10

wants to merge 34 commits into from

Commits on Feb 18, 2015

  1. barebones program

    @JenniferPylko
    JenniferPylko committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    91cf4e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sirchangealot' of https://github.com/Pittsford-Robotics… 

    …-3181/2015Robotics into sirchangealot
    @JenniferPylko
    JenniferPylko committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    4b9badf View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Switched upper and lower lift sensors so lift works correctly 

    Added throttle
Added anti-wobble for the lead screw
Changed flap buttons to 6 and 4
    @JenniferPylko
    JenniferPylko committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    a7c53c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2015

  1. Build status now for correct branch

    @JenniferPylko
    JenniferPylko committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    8c61406 View commit details
    Browse the repository at this point in the history

  2. Remove the git diff part so the build will pass

    @JenniferPylko
    JenniferPylko committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    a699e82 View commit details
    Browse the repository at this point in the history

  3. Don't style check Travis, I know what I'm doing

    @JenniferPylko
    JenniferPylko committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    bd29d4e View commit details
    Browse the repository at this point in the history

  4. Add explanation for code in TeleopPeriodic()

    @JenniferPylko
    JenniferPylko committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    81d83e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. Update branch for Travis CI badge

    @JenniferPylko
    JenniferPylko committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    46ac102 View commit details
    Browse the repository at this point in the history

  2. Update branch for Travis CI badge

    @JenniferPylko
    JenniferPylko committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    14ad19f View commit details
    Browse the repository at this point in the history

  3. Update branch for Travis CI badge

    @JenniferPylko
    JenniferPylko committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    fc811a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2015

  1. Reversed throttle for drive joystick 

    Added throttle to lift joystick
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    ff4bf62 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from Pittsford-Robotics-3181/feature/throttles 

    Feature/throttles working
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    b462935 View commit details
    Browse the repository at this point in the history

  3. Update branch for Travis CI badge

    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    ac6ba23 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/sirchangealot' into feature/hatc… 

    …ontrols
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    5a9b431 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/hatcontrols' into sirchangealot

    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    4ce1eb9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #17 from Pittsford-Robotics-3181/sirchangealot 

    Merge sirchangealot updates into current working branch
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    4a2b9b1 View commit details
    Browse the repository at this point in the history

  7. Implemented hat controls

    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    f2fca8f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #18 from Pittsford-Robotics-3181/feature/hatcontrols 

    Feature/hatcontrols
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    263c529 View commit details
    Browse the repository at this point in the history

  9. Update branch for Travis CI badge

    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    4f6cb7a View commit details
    Browse the repository at this point in the history

  10. Anti-wobble works amazingly

    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    80311eb View commit details
    Browse the repository at this point in the history

  11. Merge pull request #19 from Pittsford-Robotics-3181/sirchangealot 

    Update feature/heightpresets to current state of sirchangealot
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    239dadc View commit details
    Browse the repository at this point in the history

  12. The disabling of the drive system was caused by MotorSafetyHelper being 

    enabled. Now that it's disabled it's driving smoothly
    @Ethan-O
    Ethan-O committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    0af83b0 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #21 from Pittsford-Robotics-3181/fix/motorsafety 

    Disabled MotorSafetyHelper
    @JenniferPylko
    JenniferPylko committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    733baea View commit details
    Browse the repository at this point in the history

  14. Merge pull request #22 from Pittsford-Robotics-3181/sirchangealot 

    Update feature/heightpresets to current state of sirchangealot
    @Ethan-O
    Ethan-O committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    dcccbbc View commit details
    Browse the repository at this point in the history

  15. Ethan Attempted to add a function where the liftsystem would move down 

    to its origonal position when the butten 7 is continuously pressed. It
does not work.
    @Ethan-O
    Ethan-O committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    9c76bc4 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feature/heightpresets' of https://github.com/Pittsford-… 

    …Robotics-3181/2015Robotics.git into feature/heightpresets
    @Ethan-O
    Ethan-O committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    2ef53de View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2015

  1. Print out encoder values for test

    Feetsalot committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    8e20429 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Added printDiagnostics(); and Ethan use encoder->Get() instead of 

    GetDistance();
    Feetsalot committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    4a163cc View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Presets almost here

    brpylko committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    2452afc View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2015

  1. The presets kind of work

    brpylko committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    5b94719 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2015

  1. The presets are complete and are working perfectly

    @Ethan-O
    Ethan-O committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    835adf1 View commit details
    Browse the repository at this point in the history

  2. The presets chagned

    @Ethan-O
    Ethan-O committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    ded89a6 View commit details
    Browse the repository at this point in the history

  3. Encoder Preset Constants and Button Bug Fixes

    Feetsalot committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    0783669 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #24 from Pittsford-Robotics-3181/feature/heightpre… 

    …sets

Feature/heightpresets
    Feetsalot committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    265afc3 View commit details
    Browse the repository at this point in the history