From 66ca07deef8bb8ca1dba88269a492d7ec80e7012 Mon Sep 17 00:00:00 2001 From: Default email Date: Mon, 18 Aug 2025 23:02:45 -0400 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 7192b5e3e0dd3ed1b69e454275e10ad7ce6b48c0 --- subprojects/robotpy-hal/hal/version.py | 1 + subprojects/robotpy-wpilib/semiwrap/Color.yml | 2 +- subprojects/robotpy-wpimath/pyproject.toml | 3 ++- .../controls/DifferentialDriveFeedforward.yml | 3 +++ .../robotpy-wpimath/tests/cpp/pyproject.toml | 6 +++++ .../tests/cpp/semiwrap/module.yml | 11 +++++--- .../tests/cpp/wpimath_test/__init__.py | 2 +- .../robotpy-wpimath/wpimath/__init__.py | 2 ++ .../wpimath/controller/__init__.py | 4 +-- .../wpimath/interpolation/__init__.py | 2 +- .../wpimath/kinematics/__init__.py | 26 ++++++++++++++++++- 11 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 subprojects/robotpy-hal/hal/version.py diff --git a/subprojects/robotpy-hal/hal/version.py b/subprojects/robotpy-hal/hal/version.py new file mode 100644 index 000000000..825b065c2 --- /dev/null +++ b/subprojects/robotpy-hal/hal/version.py @@ -0,0 +1 @@ +version = __version__ = "2025.3.2.2" \ No newline at end of file diff --git a/subprojects/robotpy-wpilib/semiwrap/Color.yml b/subprojects/robotpy-wpilib/semiwrap/Color.yml index 57317be74..450a6016f 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Color.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Color.yml @@ -181,7 +181,7 @@ inline_code: | ^ (std::hash{}(self->green) << 1) ^ (std::hash{}(self->blue) << 2) ); - return h != -1 ? h : -2; + return h != static_cast(-1) ? h : -2; }) .def("__repr__", [](Color *self) { return "Color(" diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 0ac94934b..e59af2a19 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -45,6 +45,8 @@ update_init = [ "wpimath.estimator wpimath._controls._controls.estimator", "wpimath.filter", "wpimath.geometry", + "wpimath.kinematics", + "wpimath.interpolation", "wpimath.optimization wpimath._controls._controls.optimization", "wpimath.path wpimath._controls._controls.path", "wpimath.spline", @@ -1574,7 +1576,6 @@ DifferentialDriveAccelerationLimiter = "frc/controller/DifferentialDriveAccelera DifferentialDriveFeedforward = "frc/controller/DifferentialDriveFeedforward.h" DifferentialDriveWheelVoltages = "frc/controller/DifferentialDriveWheelVoltages.h" ElevatorFeedforward = "frc/controller/ElevatorFeedforward.h" -HolonomicDriveController = "frc/controller/HolonomicDriveController.h" ImplicitModelFollower = "frc/controller/ImplicitModelFollower.h" LTVDifferentialDriveController = "frc/controller/LTVDifferentialDriveController.h" LTVUnicycleController = "frc/controller/LTVUnicycleController.h" diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml index 3f26a50ec..ac8a9d1c8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + classes: frc::DifferentialDriveFeedforward: force_type_casters: diff --git a/subprojects/robotpy-wpimath/tests/cpp/pyproject.toml b/subprojects/robotpy-wpimath/tests/cpp/pyproject.toml index 679f4bdf0..d22ed669f 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/pyproject.toml +++ b/subprojects/robotpy-wpimath/tests/cpp/pyproject.toml @@ -12,11 +12,17 @@ authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" +dependencies = [ + "robotpy-wpimath==2027.0.0a2", +] [tool.hatch.build.hooks.semiwrap] [tool.hatch.build.hooks.meson] [tool.semiwrap] +update_init = [ + "wpimath_test wpimath_test._wpimath_test", +] [tool.semiwrap.extension_modules."wpimath_test._wpimath_test"] name = "wpimath_test" diff --git a/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml b/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml index b9157d373..0d7247657 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml +++ b/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml @@ -1,12 +1,14 @@ ---- - classes: SomeClass: attributes: - kDefaultPeriod: + s_constant: + ms_constant1: + ms_constant2: + ms_constant3: five_ft: methods: - checkDefaultByName: + checkDefaultByName1: + checkDefaultByName2: checkDefaultByNum1: param_override: period: @@ -16,4 +18,5 @@ classes: period: default: 0.050_s ms2s: + s2ms: ft2m: diff --git a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py index 5dff80ff0..e904b8633 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py +++ b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py @@ -1,6 +1,6 @@ from . import _init__wpimath_test -# autogenerated by 'robotpy-build create-imports wpimath_test' +# autogenerated by 'semiwrap create-imports wpimath_test wpimath_test._wpimath_test' from ._wpimath_test import SomeClass __all__ = ["SomeClass"] diff --git a/subprojects/robotpy-wpimath/wpimath/__init__.py b/subprojects/robotpy-wpimath/wpimath/__init__.py index f85ba7db0..f8e868905 100644 --- a/subprojects/robotpy-wpimath/wpimath/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/__init__.py @@ -7,6 +7,7 @@ from ._wpimath import ( angleModulus, applyDeadband, + copySignPow, floorDiv, floorMod, inputModulus, @@ -17,6 +18,7 @@ __all__ = [ "angleModulus", "applyDeadband", + "copySignPow", "floorDiv", "floorMod", "inputModulus", diff --git a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py b/subprojects/robotpy-wpimath/wpimath/controller/__init__.py index 53070f020..842eab450 100644 --- a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/controller/__init__.py @@ -6,9 +6,9 @@ ControlAffinePlantInversionFeedforward_2_1, ControlAffinePlantInversionFeedforward_2_2, DifferentialDriveAccelerationLimiter, + DifferentialDriveFeedforward, DifferentialDriveWheelVoltages, ElevatorFeedforward, - HolonomicDriveController, ImplicitModelFollower_1_1, ImplicitModelFollower_2_1, ImplicitModelFollower_2_2, @@ -36,9 +36,9 @@ "ControlAffinePlantInversionFeedforward_2_1", "ControlAffinePlantInversionFeedforward_2_2", "DifferentialDriveAccelerationLimiter", + "DifferentialDriveFeedforward", "DifferentialDriveWheelVoltages", "ElevatorFeedforward", - "HolonomicDriveController", "ImplicitModelFollower_1_1", "ImplicitModelFollower_2_1", "ImplicitModelFollower_2_2", diff --git a/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py b/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py index c71091b33..8cdd3d6c4 100644 --- a/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py @@ -1,6 +1,6 @@ from . import _init__interpolation # noqa: F401 -# autogenerated by 'robotpy-build create-imports wpimath.interpolation wpimath.interpolation._interpolation' +# autogenerated by 'semiwrap create-imports wpimath.interpolation wpimath.interpolation._interpolation' from ._interpolation import ( TimeInterpolatableFloatBuffer, TimeInterpolatablePose2dBuffer, diff --git a/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py b/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py index 4327debb3..f2c7f29aa 100644 --- a/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py @@ -1,35 +1,47 @@ from . import _init__kinematics -# autogenerated by 'robotpy-build create-imports wpimath.kinematics' +# autogenerated by 'semiwrap create-imports wpimath.kinematics wpimath.kinematics._kinematics' from ._kinematics import ( ChassisSpeeds, DifferentialDriveKinematics, DifferentialDriveKinematicsBase, DifferentialDriveOdometry, + DifferentialDriveOdometry3d, + DifferentialDriveOdometry3dBase, DifferentialDriveOdometryBase, DifferentialDriveWheelPositions, DifferentialDriveWheelSpeeds, MecanumDriveKinematics, MecanumDriveKinematicsBase, MecanumDriveOdometry, + MecanumDriveOdometry3d, + MecanumDriveOdometry3dBase, MecanumDriveOdometryBase, MecanumDriveWheelPositions, MecanumDriveWheelSpeeds, SwerveDrive2Kinematics, SwerveDrive2KinematicsBase, SwerveDrive2Odometry, + SwerveDrive2Odometry3d, + SwerveDrive2Odometry3dBase, SwerveDrive2OdometryBase, SwerveDrive3Kinematics, SwerveDrive3KinematicsBase, SwerveDrive3Odometry, + SwerveDrive3Odometry3d, + SwerveDrive3Odometry3dBase, SwerveDrive3OdometryBase, SwerveDrive4Kinematics, SwerveDrive4KinematicsBase, SwerveDrive4Odometry, + SwerveDrive4Odometry3d, + SwerveDrive4Odometry3dBase, SwerveDrive4OdometryBase, SwerveDrive6Kinematics, SwerveDrive6KinematicsBase, SwerveDrive6Odometry, + SwerveDrive6Odometry3d, + SwerveDrive6Odometry3dBase, SwerveDrive6OdometryBase, SwerveModulePosition, SwerveModuleState, @@ -40,30 +52,42 @@ "DifferentialDriveKinematics", "DifferentialDriveKinematicsBase", "DifferentialDriveOdometry", + "DifferentialDriveOdometry3d", + "DifferentialDriveOdometry3dBase", "DifferentialDriveOdometryBase", "DifferentialDriveWheelPositions", "DifferentialDriveWheelSpeeds", "MecanumDriveKinematics", "MecanumDriveKinematicsBase", "MecanumDriveOdometry", + "MecanumDriveOdometry3d", + "MecanumDriveOdometry3dBase", "MecanumDriveOdometryBase", "MecanumDriveWheelPositions", "MecanumDriveWheelSpeeds", "SwerveDrive2Kinematics", "SwerveDrive2KinematicsBase", "SwerveDrive2Odometry", + "SwerveDrive2Odometry3d", + "SwerveDrive2Odometry3dBase", "SwerveDrive2OdometryBase", "SwerveDrive3Kinematics", "SwerveDrive3KinematicsBase", "SwerveDrive3Odometry", + "SwerveDrive3Odometry3d", + "SwerveDrive3Odometry3dBase", "SwerveDrive3OdometryBase", "SwerveDrive4Kinematics", "SwerveDrive4KinematicsBase", "SwerveDrive4Odometry", + "SwerveDrive4Odometry3d", + "SwerveDrive4Odometry3dBase", "SwerveDrive4OdometryBase", "SwerveDrive6Kinematics", "SwerveDrive6KinematicsBase", "SwerveDrive6Odometry", + "SwerveDrive6Odometry3d", + "SwerveDrive6Odometry3dBase", "SwerveDrive6OdometryBase", "SwerveModulePosition", "SwerveModuleState",