Skip to content

Latest commit

 

History

History
70 lines (56 loc) · 3.29 KB

README.md

File metadata and controls

70 lines (56 loc) · 3.29 KB
Raw

2017-inseason

Steamworks code of FRC Team 973: Greybots

Presenting our 2017 Houston World Championship Robot: Bloodhound

Build Status FRC Year Language Type

Getting Started

Setup your programming environments by following the guide in our README of the greybots-skeleton repository. Download the repository and run the commands described in the "Usage" section of the greybots-skeleton README.

Reading Logs

Use the 2017-logging repository's README guide to read logs generated by the 2017-inseason code.

Deployment

Follow the guide in the greybots-skeleton README.

2017 Awards and Recognitions

Central Valley Regional

  • Gracious Professionalism Award (sponsored by Johnson & Johnson)

Sacramento Regional

  • Industrial Design Award (sponsored by General Motors)
  • 2017 Sacramento Regional Winners

Houston Championship

  • Innovation in Control Award (sponsored by Rockwell Automation)
  • 2017 Roebling Championship Subdivision Winner
  • 2017 FRC Houston Championship Winners

Find out more: The Blue Alliance

Contributing

Here's how to get your code into the main robot repository:

If you've just joined the team:

  1. Make an account on GitHub.
  2. Ask the robot programming lead to add your account

If it's the first time you've contributed to this repo: 3. Clone this repo 4. Log onto github and navigate to the repo 2017-inseason.

Any time you want to make a change:

Create and checkout a new branch. git checkout -b <your_branch_name>, where <your_branch_name> is a descriptive name for your branch. Use dashes in the branch name, not underscores. Do not create a new branch unless a same branch has already been made. Make whatever code changes you want/need to make. Be sure to write tests for your changes! Commit your work locally. Try to make your commits as small as possible. Follow the conventions for commit messages.

To push to a specific branch of the repo. git push origin <your_branch_name> Submit a pull request. Log into github. Go to the page for your forked repo. Select the branch that you just pushed from the "Branch" dropdown menu. Click "New Pull Request". Review the changes that you made. If you are happy with your changes, click "Create Pull Request". Mentors or the programming lead must approve your changes before they are merged. If there are any concerns about your pull request, fix them. To update your PR, just push to the branch on your forked repo. Merge your changes into master

If there are conflicts, fix them locally on your branch, push them, wait for Travis to pass, and then squash and merge.

Questions? Email jacks8211@gmail.com or Slack Kyle