Skip to content

Commit

Permalink
Upgrading to 2025.1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
thenetworkgrinch committed Jan 6, 2025
1 parent 834674f commit b6d5c8f
Show file tree
Hide file tree
Showing 55 changed files with 84 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/ADIS16448Swerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ADIS16448Swerve extends SwerveIMU {

/** {@link ADIS16448_IMU} device to read the current headings from. */
private final ADIS16448_IMU imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** Offset for the ADIS16448. */
private Rotation3d offset = new Rotation3d();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/ADIS16470Swerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ADIS16470Swerve extends SwerveIMU {

/** {@link ADIS16470_IMU} device to read the current headings from. */
private final ADIS16470_IMU imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** Offset for the ADIS16470. */
private Rotation3d offset = new Rotation3d();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/ADXRS450Swerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ADXRS450Swerve extends SwerveIMU {

/** {@link ADXRS450_Gyro} device to read the current headings from. */
private final ADXRS450_Gyro imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** Offset for the ADXRS450. */
private Rotation3d offset = new Rotation3d();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/AnalogGyroSwerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class AnalogGyroSwerve extends SwerveIMU {

/** Gyroscope object. */
private final AnalogGyro imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** Offset for the analog gyro. */
private Rotation3d offset = new Rotation3d();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/CanandgyroSwerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class CanandgyroSwerve extends SwerveIMU {
public static double STATUS_TIMEOUT_SECONDS = 0.04;
/** Boron {@link Canandgyro} by Redux Robotics. */
private final Canandgyro imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, RotationsPerSecond);
/** Offset for the Boron {@link Canandgyro}. */
private Rotation3d offset = new Rotation3d();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/NavXSwerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/** Communicates with the NavX({@link AHRS}) as the IMU. */
public class NavXSwerve extends SwerveIMU {

/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** NavX IMU. */
private AHRS imu;
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/swervelib/imu/Pigeon2Swerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class Pigeon2Swerve extends SwerveIMU {
public static double STATUS_TIMEOUT_SECONDS = 0.04;
/** {@link Pigeon2} IMU device. */
private final Pigeon2 imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);

/** Offset for the {@link Pigeon2}. */
Expand All @@ -32,11 +32,11 @@ public class Pigeon2Swerve extends SwerveIMU {
private Pigeon2Configurator cfg;

/** X Acceleration supplier */
private Supplier<StatusSignal<LinearAcceleration>> xAcc;
private final Supplier<StatusSignal<LinearAcceleration>> xAcc;
/** Y Accelleration supplier. */
private Supplier<StatusSignal<LinearAcceleration>> yAcc;
private final Supplier<StatusSignal<LinearAcceleration>> yAcc;
/** Z Acceleration supplier. */
private Supplier<StatusSignal<LinearAcceleration>> zAcc;
private final Supplier<StatusSignal<LinearAcceleration>> zAcc;

/**
* Generate the SwerveIMU for {@link Pigeon2}.
Expand Down Expand Up @@ -124,9 +124,11 @@ public Rotation3d getRotation3d() {
*/
@Override
public Optional<Translation3d> getAccel() {
// TODO: Implement later.

return Optional.empty();
return Optional.of(
new Translation3d(
xAcc.get().getValueAsDouble(),
yAcc.get().getValueAsDouble(),
zAcc.get().getValueAsDouble()));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/swervelib/imu/PigeonSwerve.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class PigeonSwerve extends SwerveIMU {

/** {@link WPI_PigeonIMU} IMU device. */
private final WPI_PigeonIMU imu;
/** Mutable {@link AngularVelocity} for readings. */
/** Mutable {@link MutAngularVelocity} for readings. */
private final MutAngularVelocity yawVel = new MutAngularVelocity(0, 0, DegreesPerSecond);
/** Offset for the {@link WPI_PigeonIMU}. */
private Rotation3d offset = new Rotation3d();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/swervelib/parser/json/DeviceJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ public SwerveAbsoluteEncoder createEncoder(SwerveMotor motor) {
return new AnalogAbsoluteEncoderSwerve(id);
case "cancoder":
return new CANCoderSwerve(id, canbus != null ? canbus : "");
case "srxmag_standalone":
return new TalonSRXEncoderSwerve(
new TalonSRXSwerve(id, false, DCMotor.getCIM(1)),
FeedbackDevice.PulseWidthEncodedPosition);
case "talonsrx_pwm":
return new TalonSRXEncoderSwerve(motor, FeedbackDevice.PulseWidthEncodedPosition);
case "talonsrx_analog":
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
acd54be32f0a94ebe839d514aedef6fa
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e12cf44f12c9fb23c23694c8fdc188a497aa53a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d235a5e7bd1317d05a6f22d80238d675b948f8ae563700bb58a3ecb7ed4367de
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c157c2150b6e53819be4097e380947bd42be407b07b0ef442ed0fb0d1ff892b2fafd31480912b33b94dc2fa83296004dafafd34a89d86483f396863f64017f2
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
acd54be32f0a94ebe839d514aedef6fa
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e12cf44f12c9fb23c23694c8fdc188a497aa53a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d235a5e7bd1317d05a6f22d80238d675b948f8ae563700bb58a3ecb7ed4367de
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c157c2150b6e53819be4097e380947bd42be407b07b0ef442ed0fb0d1ff892b2fafd31480912b33b94dc2fa83296004dafafd34a89d86483f396863f64017f2
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>swervelib</groupId>
<artifactId>YAGSL-cpp</artifactId>
<version>2025.1.2.1</version>
<packaging>pom</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b71367ba24908b388697c59e2fe90587
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ca89281fd7f259006750d594de633197ced31c09
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
52510c3a83d4467d5c999a1cc042d582f1ecfdbb952a43e8c54af387b97c0f74
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
38ad305a3de7690a62c79d531161f1aa5a175e1f4f6db3c348fad27bd6e4ce79764af0f94beb4d510b5eac63517986a6d00d5561d4e7bea3ba695b32514fa502
7 changes: 4 additions & 3 deletions yagsl/repos/swervelib/YAGSL-cpp/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<groupId>swervelib</groupId>
<artifactId>YAGSL-cpp</artifactId>
<versioning>
<latest>2025.1.2</latest>
<release>2025.1.2</release>
<latest>2025.1.2.1</latest>
<release>2025.1.2.1</release>
<versions>
<version>2024.6.1.0</version>
<version>2024.7.0</version>
Expand All @@ -26,7 +26,8 @@
<version>2025.1.0.4</version>
<version>2025.1.1</version>
<version>2025.1.2</version>
<version>2025.1.2.1</version>
</versions>
<lastUpdated>20250106162218</lastUpdated>
<lastUpdated>20250106183533</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-cpp/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c92e7aade86fced6a5b4d537beae32f0
0d840131fec2aea574e0b8adcd82d2c0
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-cpp/maven-metadata.xml.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1ef8d92f66f956d59c1c19569d392b170c9c0524
97b47c1dfbdaa43eace3abcfd811bffff9776f95
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-cpp/maven-metadata.xml.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6697d7face21606ce6b0d637a5071d2a98af704d752ceb1480256964476ac667
f298312b31c60e8c9ce3033d2733078300d73b2def9cd0d91a4887945caa1084
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-cpp/maven-metadata.xml.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9b82eae6146e208f50b032ec5f39daa5bdd2afb12281a0b07889bb11a5864e41f6122f709cd274ffba84bdd8841c9970e7e04238342bcdd99888819b4f51c9ff
027f126264199f49734bf5051326e0bd49e97b70a1c408f89538eb550c068592fe56787320c19f6211f331ec05bb2589f7788901b40df745e3e6670bc80afde5
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a00e99b213e96de8c2d1eb6cf322bb5e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3a6bb0365580ee9dcbc7830a8f472c455e4e44f0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8ce2da3bfc5a2a58842591ac1c3bd1e3da564edbea3c0f3363e42357e1e786a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
658e79cf6e8e74f908f88e71731cf4c4909f8947811ece4e8ac4e48dacf8d4ad847788501be00a713e2977eae7e10b075cf28664af931fcf5695322c02ca5596
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e62aadd197251e28c42fbe10f3f5425
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
70b2fa82069b8fbbd44f50f26d1f5cebc1c761ad
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
133475a29e390ce4f842a0a7bd40b9c995d3a4d06afd9abe8cd95f4e31bf03c1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eec43edd188effdedda5b48ec40f8d9370a14df099e3b3d9894c2edd7f3d154bae5af0327c276496d152e11435d5c5a2a4f1eef97b40bd4a2412166c4088a21d
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ad023b26f9e2aaf29bfc37b2918a710d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1f2df4fa2031ae6a40ff8ea351b8dd92de2ea82
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ccb1c24f05a62a00e65faee62353be52f8162df9232c72388d488451aa4883b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cebb74b5202821a018252f6aef9dbdc175cfc29cdd4c166debb48484558c8f130d14a786eaf17521511bea9ceb0f6c904f729d4df0ad7b750389645e4f60c37b
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>swervelib</groupId>
<artifactId>YAGSL-java</artifactId>
<version>2025.1.2.1</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cbda9a58e5a65be39447cbad1e6c745d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cb517a3c30861c68d7b0d5b61596cde04abec561
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7620a9c0a8f87bdf71ef56fdcd0d4b270634275f9e769cdd0ff7a3966a44bb77
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
049662bdd6c30381790d08aa84fa3558a995d9faebc16f77ffe5839c3717edfd8944a2c8b259d3612a0bc14619717bd8e6048949bf9c07bc19a4d8eb1f33c23c
7 changes: 4 additions & 3 deletions yagsl/repos/swervelib/YAGSL-java/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<groupId>swervelib</groupId>
<artifactId>YAGSL-java</artifactId>
<versioning>
<latest>2025.1.2</latest>
<release>2025.1.2</release>
<latest>2025.1.2.1</latest>
<release>2025.1.2.1</release>
<versions>
<version>2024.7.0</version>
<version>2025.0.0</version>
Expand All @@ -16,7 +16,8 @@
<version>2025.1.0.4</version>
<version>2025.1.1</version>
<version>2025.1.2</version>
<version>2025.1.2.1</version>
</versions>
<lastUpdated>20250106162223</lastUpdated>
<lastUpdated>20250106183538</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-java/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3f3cdc3b4f34d300559cae3e5a7f333f
4185777427ceb584dcd5ead642136d31
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-java/maven-metadata.xml.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8f7df3259991afc084596e2fe3c29334ffd734c7
9e0cb8f6424bc49edbe15cfd71d8b2000e7dab1c
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-java/maven-metadata.xml.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
998e83e37920ad017ae8785848a8bf374fcfa8f2c0a3af015bc9281e33551a21
f4ef32d0c45a82de0094ca4ffcb6fb97181e6fa96f70c9099c405c37780d5969
2 changes: 1 addition & 1 deletion yagsl/repos/swervelib/YAGSL-java/maven-metadata.xml.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dfac4eba3b8834c339553e51d40abf57a2ae2725e64f99bef40302948233297e9cfa2dc6615b3c302bee8968d43df228fb08f70fe35420713a8134dc610785f9
f39f061357b9bfcfac31e68f91494da0433efea9d4b10270b1e75a0af2933226293ffdb9bed6f203b3eb4212ffed02fff5ea520a1aed3c9ffd8a0397cbf70066
6 changes: 3 additions & 3 deletions yagsl/yagsl.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "yagsl-2025.1.2.json",
"fileName": "yagsl-2025.1.2.1.json",
"name": "YAGSL",
"version": "2025.1.2",
"version": "2025.1.2.1",
"frcYear": "2025",
"uuid": "1ccce5a4-acd2-4d18-bca3-4b8047188400",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "swervelib",
"artifactId": "YAGSL-java",
"version": "2025.1.2"
"version": "2025.1.2.1"
}
],
"requires": [
Expand Down

0 comments on commit b6d5c8f

Please sign in to comment.