Skip to content

Commit

Permalink
merge main into here
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryLi-0 committed Jan 11, 2025
2 parents a2cfe09 + 313e871 commit 5d9350c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1"
id "edu.wpi.first.GradleRIO" version "2025.2.1"
id 'com.diffplug.spotless' version '6.24.0'
}

Expand Down
19 changes: 12 additions & 7 deletions src/main/java/org/sciborgs1155/robot/vision/VisionConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

public class VisionConstants {
public static final AprilTagFieldLayout TAG_LAYOUT =
AprilTagFieldLayout.loadField(AprilTagFields.kDefaultField);
AprilTagFieldLayout.loadField(AprilTagFields.k2025Reefscape);

/** TODO: Create cameras with updated constants; be sure to add in {@link Vision#create} */
// WARNING: EMPTY TRANSFORMS WILL CRASH SIMULATION UPON TAG DETECTION
Expand All @@ -38,10 +38,15 @@ public class VisionConstants {
public static final double MAX_HEIGHT = 0.305;
public static final double MAX_ANGLE = 0.3;

/** TODO: Modify AprilTag information as needed. */
// Total of n AprilTags
// Reference:
// Tag Locations (1-n) | Description...

public static final double[] TAG_WEIGHTS = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
// Total of 22 AprilTags
// Reference: https://firstfrc.blob.core.windows.net/frc2025/Manual/2025GameManual.pdf (page 35)
// Tag Locations (1-22)
// Reef | Red: 6-11, Blue: 17-22
// Cage | Red Side: 4-5, Blue Side: 14-15
// Coral Station | Red Side: 1-2, Blue Side: 12-13
// Processor | Red Side: 3 | Blue Side: 16

public static final double[] TAG_WEIGHTS = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
};
}

0 comments on commit 5d9350c

Please sign in to comment.