-
Notifications
You must be signed in to change notification settings - Fork 0
Simple mechs merge into 2025 #118
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
Open
Niosocket11
wants to merge
12
commits into
2025
Choose a base branch
from
SimpleMechs-2025
base: 2025
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a93ffb3
Began simplemechs
Niosocket11 8b9450e
Worked on armConfig moved everything to lib199
Niosocket11 6e7ea46
Arm Complete
Niosocket11 4bd0584
Arm reading change
Niosocket11 a1b114b
Fixed docs
Niosocket11 421b3a3
Fixy drivetrain and made elevator slightly
Niosocket11 3255855
Simple Mechs complete
Niosocket11 cf1d478
Fixed java docs?
Niosocket11 cb9a591
Now java docs should be fixed
Niosocket11 a38a5de
Added curly bracket so tests will pass
Niosocket11 52a82f4
Merge branch '2025' into SimpleMechs-2025
Niosocket11 abc563e
Use tims swerve module
Niosocket11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -23,7 +23,20 @@ | |||||||||||||||||||||||||||||
| import com.revrobotics.spark.config.SparkBaseConfig.IdleMode; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.config.SparkFlexConfig; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.config.SparkMaxConfig; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.ClosedLoopSlot; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.SparkBase; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.SparkFlex; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.SparkLowLevel; | ||||||||||||||||||||||||||||||
| import com.revrobotics.spark.SparkClosedLoopController; | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| // import org.carlmontrobotics.lib199.sim.MockSparkFlex; | ||||||||||||||||||||||||||||||
| // import org.carlmontrobotics.lib199.sim.MockSparkMax; | ||||||||||||||||||||||||||||||
| import org.carlmontrobotics.lib199.sim.MockTalonSRX; | ||||||||||||||||||||||||||||||
| import org.carlmontrobotics.lib199.sim.MockedCANCoder; | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| import edu.wpi.first.cameraserver.CameraServer; | ||||||||||||||||||||||||||||||
| import edu.wpi.first.cscore.UsbCamera; | ||||||||||||||||||||||||||||||
| import edu.wpi.first.cscore.VideoSource.ConnectionStrategy; | ||||||||||||||||||||||||||||||
|
Comment on lines
+26
to
+39
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||
| import edu.wpi.first.wpilibj.RobotBase; | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| /** | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
350 changes: 350 additions & 0 deletions
350
src/main/java/org/carlmontrobotics/lib199/SimpleMechs/Arm/ArmConfig.java
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.