FairportRobotics
/
RoboLib
mirror of https://github.com/FairportRobotics/RoboLib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from FairportRobotics/apriltag_fixes 

April Tag changes
This commit is contained in:
Tyler Wilcox 2023-03-23 18:09:39 -04:00 committed by GitHub
parent 399f1cc192 694bc9a2c5
commit 7b2d51cf04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/publish.gradle
View File

@ -4,11 +4,7 @@ apply plugin: 'maven-publish'
ext.licenseFile = files("$rootDir/LICENSE.txt") ext.licenseFile = files("$rootDir/LICENSE.txt")
<<<<<<< Updated upstream def pubVersion = '2023.3.1'
def pubVersion = '2023.2.1'
=======
def pubVersion = '2023.3.0'
>>>>>>> Stashed changes
def outputsFolder = file("$buildDir/allOutputs") def outputsFolder = file("$buildDir/allOutputs")

4
lib/src/main/java/com/fairportrobotics/frc/poe/CameraTracking/RobotFieldPosition.java
View File

@ -10,11 +10,9 @@ import org.photonvision.EstimatedRobotPose;
import edu.wpi.first.apriltag.AprilTagFieldLayout; import edu.wpi.first.apriltag.AprilTagFieldLayout;
import edu.wpi.first.apriltag.AprilTagFields; import edu.wpi.first.apriltag.AprilTagFields;
<<<<<<< Updated upstream
import edu.wpi.first.math.geometry.Pose2d; import edu.wpi.first.math.geometry.Pose2d;
=======
import edu.wpi.first.apriltag.AprilTagFieldLayout.OriginPosition; import edu.wpi.first.apriltag.AprilTagFieldLayout.OriginPosition;
>>>>>>> Stashed changes import edu.wpi.first.apriltag.AprilTagFieldLayout.OriginPosition;
import edu.wpi.first.math.geometry.Transform3d; import edu.wpi.first.math.geometry.Transform3d;
public class RobotFieldPosition { public class RobotFieldPosition {