Skip to content

Commit 111ad77

Browse files
committed
Update wpimath for 2027
1 parent 8fb5bef commit 111ad77

File tree

10 files changed

+21
-67
lines changed

10 files changed

+21
-67
lines changed

subprojects/robotpy-wpimath/pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ scan_headers_ignore = [
6565
"frc/estimator/AngleStatistics.h",
6666
"frc/estimator/KalmanFilterLatencyCompensator.h",
6767
"frc/estimator/MerweScaledSigmaPoints.h",
68+
"frc/estimator/MerweUKF.h",
69+
"frc/estimator/S3SigmaPoints.h",
70+
"frc/estimator/S3UKF.h",
71+
"frc/estimator/SigmaPoints.h",
6872
"frc/estimator/SteadyStateKalmanFilter.h",
6973
"frc/estimator/UnscentedKalmanFilter.h",
7074
"frc/estimator/UnscentedTransform.h",
@@ -1578,7 +1582,6 @@ LinearPlantInversionFeedforward = "frc/controller/LinearPlantInversionFeedforwar
15781582
LinearQuadraticRegulator = "frc/controller/LinearQuadraticRegulator.h"
15791583
PIDController = "frc/controller/PIDController.h"
15801584
ProfiledPIDController = "frc/controller/ProfiledPIDController.h"
1581-
RamseteController = "frc/controller/RamseteController.h"
15821585
SimpleMotorFeedforward = "frc/controller/SimpleMotorFeedforward.h"
15831586

15841587
# frc/estimator
@@ -1621,7 +1624,6 @@ Trajectory = "frc/trajectory/Trajectory.h"
16211624
TrajectoryConfig = "frc/trajectory/TrajectoryConfig.h"
16221625
TrajectoryGenerator = "frc/trajectory/TrajectoryGenerator.h"
16231626
TrajectoryParameterizer = "frc/trajectory/TrajectoryParameterizer.h"
1624-
TrajectoryUtil = "frc/trajectory/TrajectoryUtil.h"
16251627
TrapezoidProfile = "frc/trajectory/TrapezoidProfile.h"
16261628

16271629
# frc/trajectory/constraint

subprojects/robotpy-wpimath/semiwrap/MathUtil.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ functions:
2727
default: '1.0'
2828
template_impls:
2929
- [double]
30+
CopySignPow:
31+
param_override:
32+
maxMagnitude:
33+
default: '1.0'
34+
template_impls:
35+
- [double]
3036
IsNear:
3137
overloads:
3238
T, T, T:

subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@ classes:
3737
operator*:
3838
operator/:
3939
RotateBy:
40+
RotateAround:
4041
TransformBy:
4142
RelativeTo:
4243
Exp:
4344
Log:
4445
ToMatrix:
4546
ToPose2d:
47+
Nearest:
48+
overloads:
49+
std::span<const Pose3d> [const]:
50+
std::initializer_list<Pose3d> [const]:
51+
ignore: true
4652

4753
inline_code: |
4854
cls_Pose3d

subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ classes:
3535
operator/:
3636
operator==:
3737
operator!=:
38+
Nearest:
39+
overloads:
40+
std::span<const Translation3d> [const]:
41+
std::initializer_list<Translation3d> [const]:
42+
ignore: true
3843

3944
inline_code: |
4045
cls_Translation3d

subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ classes:
1414
overloads:
1515
units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, units::second_t:
1616
const ChassisSpeeds&, units::second_t:
17-
FromFieldRelativeSpeeds:
18-
overloads:
19-
units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, const Rotation2d&:
20-
const ChassisSpeeds&, const Rotation2d&:
21-
FromRobotRelativeSpeeds:
22-
overloads:
23-
units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, const Rotation2d&:
24-
const ChassisSpeeds&, const Rotation2d&:
2517
operator+:
2618
operator-:
2719
overloads:

subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,6 @@
44
from wpimath.kinematics import ChassisSpeeds
55

66

7-
def test_fromFieldRelativeSpeeds() -> None:
8-
chassisSpeeds = ChassisSpeeds.fromFieldRelativeSpeeds(
9-
vx=1.0, vy=0.0, omega=0.5, robotAngle=Rotation2d.fromDegrees(-90)
10-
)
11-
12-
assert math.isclose(0.0, chassisSpeeds.vx, abs_tol=1e-9)
13-
assert math.isclose(1.0, chassisSpeeds.vy)
14-
assert math.isclose(0.5, chassisSpeeds.omega)
15-
16-
17-
def test_fromRobotRelativeSpeeds() -> None:
18-
chassisSpeeds = ChassisSpeeds.fromRobotRelativeSpeeds(
19-
vx=1.0, vy=0.0, omega=0.5, robotAngle=Rotation2d.fromDegrees(45)
20-
)
21-
22-
assert math.isclose(1.0 / math.sqrt(2), chassisSpeeds.vx)
23-
assert math.isclose(1.0 / math.sqrt(2), chassisSpeeds.vy)
24-
assert math.isclose(0.5, chassisSpeeds.omega)
25-
26-
277
def test_plus() -> None:
288
left = ChassisSpeeds(vx=1.0, vy=0.5, omega=0.75)
299
right = ChassisSpeeds(vx=2.0, vy=1.5, omega=0.25)

subprojects/robotpy-wpimath/wpimath/controller/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
PIDController,
2626
ProfiledPIDController,
2727
ProfiledPIDControllerRadians,
28-
RamseteController,
2928
SimpleMotorFeedforwardMeters,
3029
SimpleMotorFeedforwardRadians,
3130
)
@@ -56,7 +55,6 @@
5655
"PIDController",
5756
"ProfiledPIDController",
5857
"ProfiledPIDControllerRadians",
59-
"RamseteController",
6058
"SimpleMotorFeedforwardMeters",
6159
"SimpleMotorFeedforwardRadians",
6260
]

subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
TrajectoryConfig,
66
TrajectoryGenerator,
77
TrajectoryParameterizer,
8-
TrajectoryUtil,
98
TrapezoidProfile,
109
TrapezoidProfileRadians,
1110
)
@@ -16,7 +15,6 @@
1615
"TrajectoryConfig",
1716
"TrajectoryGenerator",
1817
"TrajectoryParameterizer",
19-
"TrajectoryUtil",
2018
"TrapezoidProfile",
2119
"TrapezoidProfileRadians",
2220
]

0 commit comments

Comments
 (0)