mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-23 01:21:40 +00:00
Aruco/Multitag 36h11 support (#981)
- Aruco pipeline now infers tag width from tag family like the AprilTag pipeline - Removes unused Aruco and 200mm AprilTag models - `VisionEstimation.estimateCamPosePNP()` now requires a target model instead of assuming 16h5 - Multitarget pipeline similarly infers target model of tag family now - `PhotonPoseEstimator` can have target model set for on-rio multitarget --------- Co-authored-by: amquake <noleetarrr@gmail.com>
This commit is contained in:
@@ -26,11 +26,8 @@ export enum TargetModel {
|
||||
InfiniteRechargeHighGoalOuter = 2,
|
||||
CircularPowerCell7in = 3,
|
||||
RapidReactCircularCargoBall = 4,
|
||||
Apriltag_200mm = 5,
|
||||
Aruco6in_16h5 = 6,
|
||||
Apriltag6in_16h5 = 7,
|
||||
Aruco6p5in_36h11 = 8,
|
||||
Apriltag6p5in_36h11 = 9
|
||||
AprilTag6in_16h5 = 5,
|
||||
AprilTag6p5in_36h11 = 6
|
||||
}
|
||||
|
||||
export interface PipelineSettings {
|
||||
@@ -225,7 +222,7 @@ export type ConfigurableAprilTagPipelineSettings = Partial<
|
||||
export const DefaultAprilTagPipelineSettings: AprilTagPipelineSettings = {
|
||||
...DefaultPipelineSettings,
|
||||
cameraGain: 75,
|
||||
targetModel: TargetModel.Apriltag6in_16h5,
|
||||
targetModel: TargetModel.AprilTag6in_16h5,
|
||||
ledMode: false,
|
||||
outputShowMultipleTargets: true,
|
||||
cameraExposure: 20,
|
||||
@@ -268,7 +265,7 @@ export type ConfigurableArucoPipelineSettings = Partial<Omit<ArucoPipelineSettin
|
||||
export const DefaultArucoPipelineSettings: ArucoPipelineSettings = {
|
||||
...DefaultPipelineSettings,
|
||||
outputShowMultipleTargets: true,
|
||||
targetModel: TargetModel.Aruco6in_16h5,
|
||||
targetModel: TargetModel.AprilTag6in_16h5,
|
||||
cameraExposure: -1,
|
||||
cameraAutoExposure: true,
|
||||
ledMode: false,
|
||||
|
||||
Reference in New Issue
Block a user