mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-19 00:41:41 +00:00
[build] Update wpiformat to 2024.45 (#1545)
Signed-off-by: Jade Turner <spacey-sooty@proton.me>
This commit is contained in:
2
.github/workflows/lint-format.yml
vendored
2
.github/workflows/lint-format.yml
vendored
@@ -37,7 +37,7 @@ jobs:
|
||||
with:
|
||||
python-version: 3.11
|
||||
- name: Install wpiformat
|
||||
run: pip3 install wpiformat==2024.41
|
||||
run: pip3 install wpiformat==2024.45
|
||||
- name: Run
|
||||
run: wpiformat
|
||||
- name: Check output
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import argparse
|
||||
import base64
|
||||
from dataclasses import dataclass
|
||||
import json
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
|
||||
import cv2
|
||||
import numpy as np
|
||||
import mrcal
|
||||
import numpy as np
|
||||
from wpimath.geometry import Quaternion as _Quat
|
||||
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
## along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
###############################################################################
|
||||
|
||||
from .packet import Packet # noqa
|
||||
from .estimatedRobotPose import EstimatedRobotPose # noqa
|
||||
from .photonPoseEstimator import PhotonPoseEstimator, PoseStrategy # noqa
|
||||
from .packet import Packet # noqa
|
||||
from .photonCamera import PhotonCamera # noqa
|
||||
from .photonPoseEstimator import PhotonPoseEstimator, PoseStrategy # noqa
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class MultiTargetPNPResultSerde:
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class PhotonPipelineMetadataSerde:
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class PhotonPipelineResultSerde:
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class PhotonTrackedTargetSerde:
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class PnpResultSerde:
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
## --> DO NOT MODIFY <--
|
||||
###############################################################################
|
||||
|
||||
from ..targeting import *
|
||||
from ..packet import Packet
|
||||
from ..targeting import *
|
||||
|
||||
|
||||
class TargetCornerSerde:
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
from .MultiTargetPNPResultSerde import MultiTargetPNPResultSerde # noqa
|
||||
from .PhotonPipelineMetadataSerde import PhotonPipelineMetadataSerde # noqa
|
||||
from .PhotonPipelineMetadataSerde import PhotonPipelineMetadataSerde # noqa
|
||||
from .PhotonPipelineResultSerde import PhotonPipelineResultSerde # noqa
|
||||
from .PhotonTrackedTargetSerde import PhotonTrackedTargetSerde # noqa
|
||||
from .PnpResultSerde import PnpResultSerde # noqa
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
|
||||
import struct
|
||||
from typing import Any, Optional, Type
|
||||
from wpimath.geometry import Transform3d, Translation3d, Rotation3d, Quaternion
|
||||
|
||||
import wpilib
|
||||
from wpimath.geometry import Quaternion, Rotation3d, Transform3d, Translation3d
|
||||
|
||||
|
||||
class Packet:
|
||||
|
||||
@@ -17,15 +17,20 @@
|
||||
|
||||
from enum import Enum
|
||||
from typing import List
|
||||
|
||||
import ntcore
|
||||
from wpilib import RobotController, Timer
|
||||
import wpilib
|
||||
from .packet import Packet
|
||||
from .targeting.photonPipelineResult import PhotonPipelineResult
|
||||
from .version import PHOTONVISION_VERSION, PHOTONLIB_VERSION # type: ignore[import-untyped]
|
||||
|
||||
# magical import to make serde stuff work
|
||||
import photonlibpy.generated # noqa
|
||||
import wpilib
|
||||
from wpilib import RobotController, Timer
|
||||
|
||||
from .packet import Packet
|
||||
from .targeting.photonPipelineResult import PhotonPipelineResult
|
||||
from .version import ( # type: ignore[import-untyped]
|
||||
PHOTONLIB_VERSION,
|
||||
PHOTONVISION_VERSION,
|
||||
)
|
||||
|
||||
|
||||
class VisionLEDMode(Enum):
|
||||
|
||||
@@ -20,11 +20,11 @@ from typing import Optional
|
||||
|
||||
import wpilib
|
||||
from robotpy_apriltag import AprilTagFieldLayout
|
||||
from wpimath.geometry import Transform3d, Pose3d, Pose2d
|
||||
from wpimath.geometry import Pose2d, Pose3d, Transform3d
|
||||
|
||||
from .targeting.photonPipelineResult import PhotonPipelineResult
|
||||
from .photonCamera import PhotonCamera
|
||||
from .estimatedRobotPose import EstimatedRobotPose
|
||||
from .photonCamera import PhotonCamera
|
||||
from .targeting.photonPipelineResult import PhotonPipelineResult
|
||||
|
||||
|
||||
class PoseStrategy(enum.Enum):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# no one but us chickens
|
||||
|
||||
from .TargetCorner import TargetCorner # noqa
|
||||
from .multiTargetPNPResult import MultiTargetPNPResult, PnpResult # noqa
|
||||
from .photonPipelineResult import PhotonPipelineMetadata, PhotonPipelineResult # noqa
|
||||
from .photonTrackedTarget import PhotonTrackedTarget # noqa
|
||||
from .TargetCorner import TargetCorner # noqa
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
from wpimath.geometry import Transform3d
|
||||
|
||||
from ..packet import Packet
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
from wpimath.geometry import Transform3d
|
||||
|
||||
from ..packet import Packet
|
||||
from .TargetCorner import TargetCorner
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from setuptools import setup, find_packages
|
||||
import subprocess, re
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
from setuptools import find_packages, setup
|
||||
|
||||
gitDescribeResult = (
|
||||
subprocess.check_output(["git", "describe", "--tags", "--match=v*", "--always"])
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
## along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
###############################################################################
|
||||
|
||||
from photonlibpy.targeting.multiTargetPNPResult import MultiTargetPNPResult, PnpResult
|
||||
from photonlibpy.targeting.photonPipelineResult import PhotonPipelineResult
|
||||
from photonlibpy import PhotonPoseEstimator, PoseStrategy
|
||||
from photonlibpy.targeting import (
|
||||
PhotonPipelineMetadata,
|
||||
PhotonTrackedTarget,
|
||||
TargetCorner,
|
||||
PhotonPipelineMetadata,
|
||||
)
|
||||
from photonlibpy.targeting.multiTargetPNPResult import MultiTargetPNPResult, PnpResult
|
||||
from photonlibpy.targeting.photonPipelineResult import PhotonPipelineResult
|
||||
from robotpy_apriltag import AprilTag, AprilTagFieldLayout
|
||||
from wpimath.geometry import Pose3d, Rotation3d, Transform3d, Translation3d
|
||||
|
||||
|
||||
@@ -16,8 +16,9 @@
|
||||
###############################################################################
|
||||
|
||||
from time import sleep
|
||||
from photonlibpy import PhotonCamera
|
||||
|
||||
import ntcore
|
||||
from photonlibpy import PhotonCamera
|
||||
from photonlibpy.photonCamera import setVersionCheckEnabled
|
||||
|
||||
|
||||
|
||||
@@ -24,11 +24,12 @@
|
||||
|
||||
|
||||
import math
|
||||
|
||||
import swervemodule
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.geometry
|
||||
import wpimath.kinematics
|
||||
import swervemodule
|
||||
|
||||
kMaxSpeed = 3.0 # 3 meters per second
|
||||
kMaxAngularSpeed = math.pi # 1/2 rotation per second
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
###################################################################################
|
||||
|
||||
import math
|
||||
import wpilib
|
||||
import drivetrain
|
||||
|
||||
import drivetrain
|
||||
import wpilib
|
||||
from photonlibpy import PhotonCamera
|
||||
|
||||
VISION_TURN_kP = 0.01
|
||||
|
||||
@@ -23,12 +23,13 @@
|
||||
###################################################################################
|
||||
|
||||
import math
|
||||
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.kinematics
|
||||
import wpimath.controller
|
||||
import wpimath.filter
|
||||
import wpimath.geometry
|
||||
import wpimath.controller
|
||||
import wpimath.kinematics
|
||||
import wpimath.trajectory
|
||||
import wpimath.units
|
||||
|
||||
|
||||
@@ -24,11 +24,12 @@
|
||||
|
||||
|
||||
import math
|
||||
|
||||
import swervemodule
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.geometry
|
||||
import wpimath.kinematics
|
||||
import swervemodule
|
||||
|
||||
kMaxSpeed = 3.0 # 3 meters per second
|
||||
kMaxAngularSpeed = math.pi # 1/2 rotation per second
|
||||
|
||||
@@ -24,9 +24,8 @@
|
||||
###################################################################################
|
||||
|
||||
|
||||
import wpilib
|
||||
import drivetrain
|
||||
|
||||
import wpilib
|
||||
from photonlibpy import PhotonCamera
|
||||
|
||||
VISION_TURN_kP = 0.01
|
||||
|
||||
@@ -23,12 +23,13 @@
|
||||
###################################################################################
|
||||
|
||||
import math
|
||||
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.kinematics
|
||||
import wpimath.controller
|
||||
import wpimath.filter
|
||||
import wpimath.geometry
|
||||
import wpimath.controller
|
||||
import wpimath.kinematics
|
||||
import wpimath.trajectory
|
||||
import wpimath.units
|
||||
|
||||
|
||||
@@ -24,12 +24,13 @@
|
||||
|
||||
|
||||
import math
|
||||
|
||||
import swervemodule
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.estimator
|
||||
import wpimath.geometry
|
||||
import wpimath.kinematics
|
||||
import wpimath.estimator
|
||||
import swervemodule
|
||||
|
||||
kMaxSpeed = 3.0 # 3 meters per second
|
||||
kMaxAngularSpeed = math.pi # 1/2 rotation per second
|
||||
|
||||
@@ -24,12 +24,11 @@
|
||||
###################################################################################
|
||||
|
||||
|
||||
import drivetrain
|
||||
import wpilib
|
||||
import wpimath.geometry
|
||||
from robotpy_apriltag import AprilTagField, loadAprilTagLayoutField
|
||||
import drivetrain
|
||||
|
||||
from photonlibpy import PhotonCamera, PhotonPoseEstimator, PoseStrategy
|
||||
from robotpy_apriltag import AprilTagField, loadAprilTagLayoutField
|
||||
|
||||
kRobotToCam = wpimath.geometry.Transform3d(
|
||||
wpimath.geometry.Translation3d(0.5, 0.0, 0.5),
|
||||
|
||||
@@ -23,12 +23,13 @@
|
||||
###################################################################################
|
||||
|
||||
import math
|
||||
|
||||
import wpilib
|
||||
import wpilib.simulation
|
||||
import wpimath.kinematics
|
||||
import wpimath.controller
|
||||
import wpimath.filter
|
||||
import wpimath.geometry
|
||||
import wpimath.controller
|
||||
import wpimath.kinematics
|
||||
import wpimath.trajectory
|
||||
import wpimath.units
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from time import sleep
|
||||
import ntcore
|
||||
import argparse
|
||||
from time import sleep
|
||||
|
||||
import ntcore
|
||||
from tabulate import tabulate
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user