-
Notifications
You must be signed in to change notification settings - Fork 0
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
feat(hardware/gyro): implement gyroscopes #9
Open
Baconing
wants to merge
40
commits into
master
Choose a base branch
from
v2025-1-0-0/gyros
base: master
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 26 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
626bfd6
refactor(hardware/gyro): separate IMUs and single axis gyros
Baconing a699ec7
feat(hardware/gyro/imu): implement ADIS16448IMU and ADIS16470IMU
Baconing f2445de
refactor(hardware/gyro/imu): remove NotNull annotations from abstract…
Baconing 1b9402f
refactor(hardware/gyro/imu): use Translation3d instead of Rotation3d …
Baconing 045bb2c
refactor(hardware/gyro/imu): use radians instead of degrees
Baconing d180bee
feat/refactor(hardware/gyro/imu/adis16*): finish implementations
Baconing 4f91bc7
style(hardware/gyro/imu/adis16470): remove unused import
Baconing a49c171
chore(build.gradle): add wpiunits dependency
Baconing 2e5b57d
refactor(hardware/gyro/imu/adis16470): use unqualified name instead o…
Baconing 3881104
refactor(hardware/gyro/imu): put unit in method name for IMU.getRotat…
Baconing e26558e
feat(hardware/gyro/imu): add getAngleRadians(SingleAxisGyroscope.Axis…
Baconing 2b1123a
Merge branch 'master' into v2025-1-0-0/gyros
Baconing a95c639
refactor(hardware/imu/adis16448): use unqualified name instead of FQD…
Baconing a39601e
Merge remote-tracking branch 'origin/v2025-1-0-0/gyros' into v2025-1-…
Baconing 77d2f72
Merge branch 'master' into v2025-1-0-0/gyros
Baconing fe3c8b6
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 6556a2a
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 8dd30a7
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 935a74f
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 426ea9c
Merge branch 'master' into v2025-1-0-0/gyros
Baconing d4743f9
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 0837d8d
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 73d6fd0
Merge branch 'master' into v2025-1-0-0/gyros
Baconing f48f6c7
Merge branch 'master' into v2025-1-0-0/gyros
Baconing 648adab
feat/fix(hardware/gyro/imu/adis16*): implement getAngleRadians(Single…
Baconing 28dfa6c
feat(hardware/gyro/imu): finish implementation of IMU and it's subcla…
Baconing 5722c6b
refactor(hardware/gyro/imu): move yaw pitch roll axis assignment to a…
Baconing 213fecf
refactor(hardware/gyro): remove SingleAxisGyroscope, just use IMU.
Baconing 898776e
feat(hardware/gyro): implement KauaiLabs NavX
Baconing 64eb036
docs(hardware/gyro/adis16*): update documentation to reflect changes
Baconing 9ba4834
style(hardware/gyro/imu): remove unnecessary qualifiers in IMU.Cartes…
Baconing 7108bbc
refactor(hardware/gyro): clean up some of the long methods
Baconing 336dd89
Merge branch 'master' into v2025-1-0-0/gyros
Baconing fa12c52
refactor(hardware/gyro/imu): only use Rotation3d where absolutely nec…
Baconing 9669e48
test(hardware/gyro): implement tests for ADIS16448, ADIS16470, and de…
Baconing ed1a44c
fix(hardware/gyro): implement getRate() function
Baconing 4e72ffa
fix(hardware/gyro): (re)implement angle rate logic
Baconing 7ae15eb
test(hardware/gyro): finish implementing unit tests for all implement…
Baconing e6b51db
fix(hardware/gyro/navx): use Gs not m/ss
Baconing 2de1188
docs(hardware/gyro): annotate deprecated members
Baconing 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 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
45 changes: 0 additions & 45 deletions
45
src/main/java/net/frc5183/librobot/hardware/gyro/SingleAxisGyroscope.java
This file was deleted.
Oops, something went wrong.
258 changes: 258 additions & 0 deletions
258
src/main/java/net/frc5183/librobot/hardware/gyro/imu/ADIS16448IMU.java
This file contains 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 |
---|---|---|
@@ -0,0 +1,258 @@ | ||
package net.frc5183.librobot.hardware.gyro.imu; | ||
|
||
import edu.wpi.first.math.geometry.Rotation3d; | ||
import edu.wpi.first.math.geometry.Translation3d; | ||
import edu.wpi.first.wpilibj.ADIS16448_IMU; | ||
import edu.wpi.first.wpilibj.SPI; | ||
import net.frc5183.librobot.hardware.gyro.single.SingleAxisGyroscope; | ||
import org.jetbrains.annotations.NotNull; | ||
|
||
/** | ||
* Represents an ADIS16448 {@link IMU}. | ||
*/ | ||
public class ADIS16448IMU extends IMU { | ||
/** | ||
* The ADIS16448 IMU. | ||
*/ | ||
@NotNull | ||
private final ADIS16448_IMU imu; | ||
|
||
/** | ||
* The yaw axis. | ||
*/ | ||
@NotNull | ||
private final IMUAxis yaw; | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/** | ||
* The pitch axis. | ||
*/ | ||
@NotNull | ||
private final IMUAxis pitch; | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/** | ||
* The roll axis. | ||
*/ | ||
private final IMUAxis roll; | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/** | ||
* Creates a new {@link ADIS16448IMU} using the RIO's Onboard MXP port, 500ms calibration time, and Z axis as yaw. | ||
* @see ADIS16448_IMU#ADIS16448_IMU() | ||
*/ | ||
public ADIS16448IMU() { | ||
this(new ADIS16448_IMU()); | ||
} | ||
|
||
/** | ||
* Creates a new {@link ADIS16448IMU} from an existing ADIS16448 IMU instance. | ||
* @param imu the ADIS16448 IMU to use. | ||
*/ | ||
public ADIS16448IMU(@NotNull ADIS16448_IMU imu) { | ||
yaw = toIMUAxis(imu.getYawAxis()); | ||
|
||
//todo: confirm this is correct i had copilot do it | ||
if (yaw == IMUAxis.X) { | ||
pitch = IMUAxis.Y; | ||
roll = IMUAxis.Z; | ||
} else if (yaw == IMUAxis.Y) { | ||
pitch = IMUAxis.X; | ||
roll = IMUAxis.Z; | ||
} else { | ||
pitch = IMUAxis.X; | ||
roll = IMUAxis.Y; | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
this.imu = imu; | ||
} | ||
|
||
/** | ||
* Creates a new {@link ADIS16448IMU} with a specified yaw axis. | ||
* Uses default RIO's Onboard MXP port and 512ms calibration time. | ||
* @param yaw the YAW axis. | ||
*/ | ||
public ADIS16448IMU(@NotNull IMUAxis yaw) { | ||
this(yaw, SPI.Port.kMXP); | ||
} | ||
|
||
/** | ||
* Creates a new {@link ADIS16448IMU} with a specified yaw axis and SPI port. | ||
* Uses default 512ms calibration time. | ||
* @param yaw the YAW axis. | ||
* @param port the SPI port. | ||
*/ | ||
public ADIS16448IMU(@NotNull IMUAxis yaw, @NotNull SPI.Port port) { | ||
this(yaw, port, ADIS16448_IMU.CalibrationTime._512ms); | ||
} | ||
|
||
/** | ||
* Creates a new {@link ADIS16448IMU} with a specified yaw axis, SPI port, and calibration time. | ||
* @param yaw the YAW axis. | ||
* @param port the SPI port. | ||
* @param calibrationTime the calibration time. | ||
*/ | ||
public ADIS16448IMU(@NotNull IMUAxis yaw, @NotNull SPI.Port port, @NotNull ADIS16448_IMU.CalibrationTime calibrationTime) { | ||
this.yaw = yaw; | ||
|
||
//todo: confirm this is correct i had copilot do it | ||
if (yaw == IMUAxis.X) { | ||
pitch = IMUAxis.Y; | ||
roll = IMUAxis.Z; | ||
} else if (yaw == IMUAxis.Y) { | ||
pitch = IMUAxis.X; | ||
roll = IMUAxis.Z; | ||
} else { | ||
pitch = IMUAxis.X; | ||
roll = IMUAxis.Y; | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
imu = new ADIS16448_IMU(fromIMUAxis(yaw), port, calibrationTime); | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public double getRawAngleRadians(@NotNull SingleAxisGyroscope.Axis axis) { | ||
// todo: this has a lot of branching but im not sure if there's really a better way to do it | ||
return switch (axis) { | ||
case YAW -> | ||
switch (this.yaw) { | ||
case X -> imu.getGyroAngleX(); | ||
case Y -> imu.getGyroAngleY(); | ||
case Z -> imu.getGyroAngleZ(); | ||
}; | ||
case PITCH -> | ||
switch (this.pitch) { | ||
case X -> imu.getGyroAngleX(); | ||
case Y -> imu.getGyroAngleY(); | ||
case Z -> imu.getGyroAngleZ(); | ||
}; | ||
case ROLL -> | ||
switch (this.roll) { | ||
case X -> imu.getGyroAngleX(); | ||
case Y -> imu.getGyroAngleY(); | ||
case Z -> imu.getGyroAngleZ(); | ||
}; | ||
}; | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public double getRawAngleRadians(IMUAxis axis) { | ||
return switch (axis) { | ||
case X -> imu.getGyroAngleX(); | ||
case Y -> imu.getGyroAngleY(); | ||
case Z -> imu.getGyroAngleZ(); | ||
}; | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public @NotNull Rotation3d getRawRotation3dRadians() { | ||
double rollRadians; | ||
double pitchRadians; | ||
double yawRadians; | ||
|
||
// todo: again, not too sure if there's a better way | ||
if (this.roll == IMUAxis.X) | ||
rollRadians = imu.getGyroAngleX(); | ||
else if (this.roll == IMUAxis.Y) | ||
rollRadians = imu.getGyroAngleY(); | ||
else | ||
rollRadians = imu.getGyroAngleZ(); | ||
|
||
if (this.pitch == IMUAxis.X) | ||
pitchRadians = imu.getGyroAngleX(); | ||
else if (this.pitch == IMUAxis.Y) | ||
pitchRadians = imu.getGyroAngleY(); | ||
else | ||
pitchRadians = imu.getGyroAngleZ(); | ||
|
||
if (this.yaw == IMUAxis.X) | ||
yawRadians = imu.getGyroAngleX(); | ||
else if (this.yaw == IMUAxis.Y) | ||
yawRadians = imu.getGyroAngleY(); | ||
else | ||
yawRadians = imu.getGyroAngleZ(); | ||
|
||
return new Rotation3d(rollRadians, pitchRadians, yawRadians); | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public @NotNull Translation3d getAccelerationMetersPerSecondSquared() { | ||
return new Translation3d(imu.getAccelX(), imu.getAccelY(), imu.getAccelZ()); | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public double getAccelerationMetersPerSecondSquared(IMUAxis axis) { | ||
return switch (axis) { | ||
case X -> imu.getAccelX(); | ||
case Y -> imu.getAccelY(); | ||
case Z -> imu.getAccelZ(); | ||
}; | ||
} | ||
|
||
@Override | ||
public void calibrate() { | ||
imu.calibrate(); | ||
} | ||
|
||
@Override | ||
public void reset() { | ||
imu.reset(); | ||
} | ||
|
||
@Override | ||
public void factoryDefault() { | ||
imu.calibrate(); | ||
super.setOffset(new Rotation3d()); | ||
} | ||
|
||
@Override | ||
public void clearStickyFaults() { | ||
// The ADIS16448 IMU does not have a method for clearing sticky faults. | ||
} | ||
Baconing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@Override | ||
public @NotNull IMUAxis getYawAxis() { | ||
return yaw; | ||
} | ||
|
||
@Override | ||
public @NotNull IMUAxis getPitchAxis() { | ||
return pitch; | ||
} | ||
|
||
@Override | ||
public IMUAxis getRollAxis() { | ||
return roll; | ||
} | ||
|
||
@Override | ||
public @NotNull ADIS16448_IMU getIMU() { | ||
return imu; | ||
} | ||
|
||
/** | ||
* Returns a new {@link ADIS16448_IMU.IMUAxis} from an {@link IMUAxis}. | ||
* @param axis the {@link IMUAxis} to convert. | ||
* @return the converted {@link ADIS16448_IMU.IMUAxis}. | ||
*/ | ||
@NotNull | ||
public static ADIS16448_IMU.IMUAxis fromIMUAxis(@NotNull IMUAxis axis) { | ||
return switch (axis) { | ||
case X -> ADIS16448_IMU.IMUAxis.kX; | ||
case Y -> ADIS16448_IMU.IMUAxis.kY; | ||
case Z -> ADIS16448_IMU.IMUAxis.kZ; | ||
}; | ||
} | ||
|
||
|
||
/** | ||
* Returns a new {@link IMUAxis} from an {@link ADIS16448_IMU.IMUAxis}. | ||
* @param axis the {@link ADIS16448_IMU.IMUAxis} to convert. | ||
* @return the converted {@link IMUAxis}. | ||
*/ | ||
@NotNull | ||
public static IMUAxis toIMUAxis(@NotNull ADIS16448_IMU.IMUAxis axis) { | ||
return switch (axis) { | ||
case kX -> IMUAxis.X; | ||
case kY -> IMUAxis.Y; | ||
case kZ -> IMUAxis.Z; | ||
}; | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would not just remove single axis gyroscopes. They can be useful for tracking rotating parts like arms or grabbers. In addition, you could "get" a single axis gyroscope from IMUs to allow more adaptability.