generated from Team488/FRCRobotTemplate
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into PointAtSpeakerYES
- Loading branch information
Showing
7 changed files
with
69 additions
and
119 deletions.
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
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
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
47 changes: 0 additions & 47 deletions
47
src/main/java/competition/subsystems/vision/AprilTagCamera.java
This file was deleted.
Oops, something went wrong.
16 changes: 3 additions & 13 deletions
16
src/main/java/competition/subsystems/vision/NoteCamera.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 |
---|---|---|
@@ -1,22 +1,12 @@ | ||
package competition.subsystems.vision; | ||
|
||
import org.photonvision.PhotonCameraExtended; | ||
import xbot.common.injection.electrical_contract.CameraInfo; | ||
import xbot.common.subsystems.vision.SimpleCamera; | ||
|
||
public class NoteCamera implements SimpleCamera{ | ||
private final PhotonCameraExtended camera; | ||
private final String friendlyName; | ||
public class NoteCamera extends SimpleCamera { | ||
|
||
public NoteCamera(CameraInfo cameraInfo) { | ||
this.camera = new PhotonCameraExtended(cameraInfo.networkTablesName()); | ||
this.friendlyName = cameraInfo.friendlyName(); | ||
super(cameraInfo); | ||
} | ||
|
||
public String getName() { | ||
return this.friendlyName; | ||
} | ||
|
||
public PhotonCameraExtended getCamera() { | ||
return this.camera; | ||
} | ||
} |
13 changes: 0 additions & 13 deletions
13
src/main/java/competition/subsystems/vision/SimpleCamera.java
This file was deleted.
Oops, something went wrong.
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