This repository maintains our robot's 2023 season code, designed to meet the requirements of the 'Charged Up' challange.
There is some software that you will need to work on the project. It is recommended that you install software as instructed in on WPILIB's website. This will setup the necessary tools for you to develop in vscode.
If you want however, you can develop in any environment that suites you, as long as you download the necessary components (JDK, etc.).
Documentation for of the important libraries used in this project.
- WPILIB Documentation - This is the FRC provided control system for our robot. It is very important to understand how it works both software and hardware. Be sure to check out the Command-Based section as that is the system that is used in this project.
Certain branches are protected by rules that must be obeyed
dev- All changes to code that effect robot functionality are expected to be merged todev, notmain.main-devcan be merged intomainonce code has been succesfully tested on robot. All other changes can be merged via pull request from created branch.
Unit tests can be run from the command line by using the gradle test task.
If you are on Windows: .\gradlew.bat clean test
If you are on Linux: .\gradlew clean test
See something like this?
DO NOT click that "Resolve Conflicts" button. Unfortunately GitHub makes resolving merge conflicts harder than it needs to be, but don't worry! You can follow these steps and get your branch up to date quickly.
For a full explanation you can watch this video. She shows an example and explains the whole process really well.
To do this you will need to run some commands in a terminal. VS Code has one you can access or you can use your system's terminal emulator (Windows Terminal on Windows 10+ or Terminal on OS X).
- Ensure your local main is up to date.
git checkout main
git pull
- Switch to your branch. Make sure to use your actual branch name in the command.
git checkout your-branch-name
- Replay your commits on top of the current main. This is different from what GitHub instructs you to do, but this is the "correct" way to bring a branch up to date cleanly.
git rebase main
When you run this command it may ask you to manually resolve merge conflicts. It will show you what the change on main was alongside your change that conflicts with it. You'll need to manually edited those then git add each file once it looks good.
- Update your remote branch with the changes.
git push --force-with-lease origin your-branch-name
That should do it! If you run into any issues with this please ask in our Discord server and someone will help you out.