-
Notifications
You must be signed in to change notification settings - Fork 3
added setSensorValue to customEncoder #233
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
NikhilSuresh24
wants to merge
1
commit into
main
Choose a base branch
from
custom-encoder-resetViaOffset
base: main
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,15 +11,21 @@ public class CANTalonEncoder implements CustomEncoder { | |
| protected PIDSourceType pidSource; | ||
| protected double distancePerPulse; | ||
| protected boolean reverseDirection; | ||
| protected double offset ; | ||
|
Contributor
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. white space |
||
|
|
||
| public CANTalonEncoder(String name, TalonSRX talon, boolean reverseDirection, double distancePerPulse) { | ||
| public CANTalonEncoder(String name, TalonSRX talon, boolean reverseDirection, double distancePerPulse, double offset) { | ||
| this.talon = talon; | ||
| talon.configSelectedFeedbackSensor(FeedbackDevice.QuadEncoder, 0, 0); | ||
| this.offset = offset; | ||
| this.reverseDirection = reverseDirection; | ||
| this.distancePerPulse = distancePerPulse; | ||
| setPIDSourceType(PIDSourceType.kDisplacement); | ||
| } | ||
|
|
||
| public CANTalonEncoder(String name, TalonSRX talon, boolean reverseDirection, double distancePerPulse) { | ||
| this(name, talon, reverseDirection, distancePerPulse, 0.0); | ||
| } | ||
|
|
||
| public CANTalonEncoder(String name, TalonSRX talon, boolean reverseDirection) { | ||
| this(name, talon, reverseDirection, 1.0); | ||
| } | ||
|
|
@@ -70,9 +76,9 @@ public int get() { | |
| @Override | ||
| public double getDistance() { | ||
| if (reverseDirection) { | ||
| return distancePerPulse * talon.getSelectedSensorPosition(0) * -1.0; | ||
| return distancePerPulse * talon.getSelectedSensorPosition(0) * -1.0 + offset; | ||
| } else { | ||
| return distancePerPulse * talon.getSelectedSensorPosition(0); | ||
| return distancePerPulse * talon.getSelectedSensorPosition(0) + offset; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -89,10 +95,10 @@ public boolean getStopped() { | |
| @Override | ||
| public double getRate() { | ||
| if (reverseDirection) { | ||
| return talon.getSelectedSensorVelocity(0) * -10.0 * distancePerPulse; | ||
| return talon.getSelectedSensorVelocity(0) * -10.0 * distancePerPulse + offset; | ||
| // getSpeed must be converted from ticks to 100ms to ticks per second, so *10. | ||
| } else { | ||
| return talon.getSelectedSensorVelocity(0) * 10.0 * distancePerPulse; | ||
| return talon.getSelectedSensorVelocity(0) * 10.0 * distancePerPulse + offset; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -121,6 +127,11 @@ public void reset() { | |
| talon.setSelectedSensorPosition(0, 0, 0); | ||
| } | ||
|
|
||
| @Override | ||
| public void setSensorValue(double setpoint) { | ||
| this.offset += setpoint - pidGet(); | ||
| } | ||
|
|
||
| @Override | ||
| public double pidGetSafely() { | ||
| return pidGet(); | ||
|
|
||
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
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.