From 938e7255690e03049a0399b70073ddac243b6633 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Tue, 22 Jul 2025 23:42:57 -0400 Subject: [PATCH 1/2] Updated dependencies - build-system.requires: semiwrap~=0.1.4 --- rdev.toml | 2 +- subprojects/pyntcore/pyproject.toml | 2 +- subprojects/robotpy-apriltag/pyproject.toml | 2 +- subprojects/robotpy-cscore/pyproject.toml | 2 +- subprojects/robotpy-hal/pyproject.toml | 2 +- subprojects/robotpy-halsim-gui/pyproject.toml | 2 +- subprojects/robotpy-romi/pyproject.toml | 2 +- subprojects/robotpy-wpilib/pyproject.toml | 2 +- subprojects/robotpy-wpimath/pyproject.toml | 2 +- subprojects/robotpy-wpinet/pyproject.toml | 2 +- subprojects/robotpy-wpiutil/pyproject.toml | 2 +- subprojects/robotpy-xrp/pyproject.toml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rdev.toml b/rdev.toml index dc1ec07f..17d49e2f 100644 --- a/rdev.toml +++ b/rdev.toml @@ -34,7 +34,7 @@ exclude_artifacts = [ robot_wheel_platform = "linux-roborio" [params.requirements] -semiwrap = "~=0.1.2" +semiwrap = "~=0.1.4" hatch-meson = "~=0.1.0b2" hatch-nativelib = "~=0.2.0" hatch-robotpy = "~=0.2" diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index d08f7cbe..deb6aabe 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index 4ac196f7..861089a8 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 95c37a84..a1127b35 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 87a2085d..a1b72c70 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatchling", "robotpy-native-wpihal==2025.3.2.1", diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index c98b8415..f4155a8e 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index c81b976f..1e195a19 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 7b023262..4027da93 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index b0ce2a96..cb92eb39 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index abcd2eeb..c5333e34 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatchling", "robotpy-native-wpinet==2025.3.2.1", diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index fd5a7642..ec49a43d 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index 43807734..9a586c4b 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.2", + "semiwrap~=0.1.4", "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", From 61f8f8c47c9597ebd31ab984c78b2b71be667c99 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Wed, 23 Jul 2025 00:19:22 -0400 Subject: [PATCH 2/2] Use defaults.subpackage instead of individual subpackages --- .../semiwrap/SysIdRoutineLog.yml | 5 ++- .../semiwrap/controls/ArmFeedforward.yml | 4 ++- .../semiwrap/controls/BangBangController.yml | 3 +- .../CentripetalAccelerationConstraint.yml | 4 ++- ...ControlAffinePlantInversionFeedforward.yml | 6 ++-- .../semiwrap/controls/DCMotor.yml | 4 ++- .../DifferentialDriveAccelerationLimiter.yml | 3 +- .../DifferentialDriveKinematicsConstraint.yml | 4 ++- .../DifferentialDrivePoseEstimator.yml | 3 +- .../DifferentialDrivePoseEstimator3d.yml | 3 +- .../DifferentialDriveVoltageConstraint.yml | 4 ++- .../DifferentialDriveWheelVoltages.yml | 5 +-- .../semiwrap/controls/ElevatorFeedforward.yml | 3 +- .../controls/EllipticalRegionConstraint.yml | 4 ++- .../semiwrap/controls/ExponentialProfile.yml | 3 +- .../controls/ExtendedKalmanFilter.yml | 7 ++--- .../controls/HolonomicDriveController.yml | 3 +- .../controls/ImplicitModelFollower.yml | 5 ++- .../semiwrap/controls/KalmanFilter.yml | 8 ++--- .../LTVDifferentialDriveController.yml | 3 +- .../controls/LTVUnicycleController.yml | 3 +- .../LinearPlantInversionFeedforward.yml | 7 ++--- .../controls/LinearQuadraticRegulator.yml | 7 ++--- .../semiwrap/controls/LinearSystem.yml | 15 ++------- .../semiwrap/controls/LinearSystemId.yml | 3 +- .../semiwrap/controls/LinearSystemLoop.yml | 8 ++--- .../controls/MaxVelocityConstraint.yml | 3 +- .../MecanumDriveKinematicsConstraint.yml | 4 ++- .../controls/MecanumDrivePoseEstimator.yml | 3 +- .../controls/MecanumDrivePoseEstimator3d.yml | 3 +- .../semiwrap/controls/PIDController.yml | 3 +- .../semiwrap/controls/PoseEstimator.yml | 8 ++--- .../semiwrap/controls/PoseEstimator3d.yml | 8 ++--- .../controls/ProfiledPIDController.yml | 4 +-- .../semiwrap/controls/RamseteController.yml | 3 +- .../controls/RectangularRegionConstraint.yml | 4 ++- .../controls/SimpleMotorFeedforward.yml | 6 ++-- .../semiwrap/controls/SimulatedAnnealing.yml | 3 +- .../SwerveDriveKinematicsConstraint.yml | 7 ++--- .../controls/SwerveDrivePoseEstimator.yml | 6 ++-- .../controls/SwerveDrivePoseEstimator3d.yml | 6 ++-- .../semiwrap/controls/Trajectory.yml | 4 ++- .../semiwrap/controls/TrajectoryConfig.yml | 4 ++- .../controls/TrajectoryConstraint.yml | 4 ++- .../semiwrap/controls/TrajectoryGenerator.yml | 4 ++- .../controls/TrajectoryParameterizer.yml | 4 ++- .../semiwrap/controls/TrajectoryUtil.yml | 4 ++- .../semiwrap/controls/TrapezoidProfile.yml | 5 +-- .../semiwrap/controls/TravelingSalesman.yml | 3 +- .../robotpy-wpiutil/semiwrap/DataLog.yml | 31 ++----------------- .../semiwrap/DataLogReader.yml | 12 +++---- .../semiwrap/Synchronization.yml | 19 ++---------- .../robotpy-wpiutil/semiwrap/WPyStruct.yml | 13 ++------ .../robotpy-wpiutil/wpiutil/__init__.py | 2 -- .../robotpy-wpiutil/wpiutil/log/__init__.py | 2 ++ 55 files changed, 137 insertions(+), 172 deletions(-) diff --git a/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml b/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml index d4229cc0..bdd79da5 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml @@ -1,20 +1,19 @@ +defaults: + subpackage: sysid enums: State: - subpackage: sysid inline_code: | .def("__str__", &SysIdRoutineLog::StateEnumToString) classes: frc::sysid::SysIdRoutineLog: - subpackage: sysid methods: SysIdRoutineLog: RecordState: Motor: StateEnumToString: frc::sysid::SysIdRoutineLog::MotorLog: - subpackage: sysid methods: MotorLog: ignore: true diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml index ea9f1c8a..0ae5fca4 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: controller + classes: frc::ArmFeedforward: - subpackage: controller force_type_casters: - units::radians_per_second_squared typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml index 045f47ac..3fd20d7e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::BangBangController: - subpackage: controller ignored_bases: - wpi::SendableHelper methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml index fa6b402f..d93fada3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: constraint + classes: frc::CentripetalAccelerationConstraint: - subpackage: constraint typealias: - frc::TrajectoryConstraint::MinMax methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml index 33f20b57..32451cae 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + classes: frc::ControlAffinePlantInversionFeedforward: template_params: @@ -28,19 +31,16 @@ classes: templates: ControlAffinePlantInversionFeedforward_1_1: qualname: frc::ControlAffinePlantInversionFeedforward - subpackage: controller params: - 1 - 1 ControlAffinePlantInversionFeedforward_2_1: qualname: frc::ControlAffinePlantInversionFeedforward - subpackage: controller params: - 2 - 1 ControlAffinePlantInversionFeedforward_2_2: qualname: frc::ControlAffinePlantInversionFeedforward - subpackage: controller params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml index ad342c29..ee62a40d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml @@ -1,9 +1,11 @@ +defaults: + subpackage: plant + extra_includes: - wpystruct.h classes: frc::DCMotor: - subpackage: plant attributes: nominalVoltage: stallTorque: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml index 77863cb0..d591e657 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::DifferentialDriveAccelerationLimiter: - subpackage: controller methods: DifferentialDriveAccelerationLimiter: overloads: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml index 16e621bc..f3dffbf1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: constraint + classes: frc::DifferentialDriveKinematicsConstraint: - subpackage: constraint typealias: - frc::TrajectoryConstraint::MinMax methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml index 5a315318..c9e32ac9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: estimator classes: frc::DifferentialDrivePoseEstimator: - subpackage: estimator force_no_trampoline: true doc: | This class wraps an Unscented Kalman Filter to fuse latency-compensated diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml index 43bc25b7..f1d589f6 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: estimator classes: frc::DifferentialDrivePoseEstimator3d: - subpackage: estimator force_no_trampoline: true methods: DifferentialDrivePoseEstimator3d: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml index 08c13f30..2107520b 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: constraint + classes: frc::DifferentialDriveVoltageConstraint: - subpackage: constraint typealias: - frc::TrajectoryConstraint::MinMax methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml index dfa87a8c..e199e031 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml @@ -1,8 +1,9 @@ ---- +defaults: + subpackage: controller + classes: frc::DifferentialDriveWheelVoltages: - subpackage: controller force_no_default_constructor: true attributes: left: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml index 6c82c59c..70656c8e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml @@ -1,10 +1,11 @@ +defaults: + subpackage: controller classes: frc::ElevatorFeedforward: force_type_casters: - units::meters_per_second - meters_per_second_squared - subpackage: controller methods: ElevatorFeedforward: overloads: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml index 355d7061..545fca10 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: constraint + extra_includes: - PyTrajectoryConstraint.h @@ -27,7 +30,6 @@ classes: templates: EllipticalRegionConstraint: - subpackage: constraint qualname: frc::EllipticalRegionConstraint params: - frc::PyTrajectoryConstraint diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml index aa3c0c47..eff51e3d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: trajectory classes: frc::ExponentialProfile: @@ -55,7 +57,6 @@ classes: templates: ExponentialProfileMeterVolts: - subpackage: trajectory qualname: frc::ExponentialProfile params: - units::meter diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml index 9fd84c68..5969660e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: estimator + classes: frc::ExtendedKalmanFilter: template_params: @@ -48,28 +51,24 @@ classes: templates: ExtendedKalmanFilter_1_1_1: qualname: frc::ExtendedKalmanFilter - subpackage: estimator params: - 1 - 1 - 1 ExtendedKalmanFilter_2_1_1: qualname: frc::ExtendedKalmanFilter - subpackage: estimator params: - 2 - 1 - 1 ExtendedKalmanFilter_2_1_2: qualname: frc::ExtendedKalmanFilter - subpackage: estimator params: - 2 - 1 - 2 ExtendedKalmanFilter_2_2_2: qualname: frc::ExtendedKalmanFilter - subpackage: estimator params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/HolonomicDriveController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/HolonomicDriveController.yml index 9bdd570c..ff1dc52d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/HolonomicDriveController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/HolonomicDriveController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::HolonomicDriveController: - subpackage: controller methods: HolonomicDriveController: AtReference: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml index 7ef0a1e8..e3e8c0b3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: controller classes: frc::ImplicitModelFollower: @@ -32,19 +34,16 @@ classes: templates: ImplicitModelFollower_1_1: qualname: frc::ImplicitModelFollower - subpackage: controller params: - 1 - 1 ImplicitModelFollower_2_1: qualname: frc::ImplicitModelFollower - subpackage: controller params: - 2 - 1 ImplicitModelFollower_2_2: qualname: frc::ImplicitModelFollower - subpackage: controller params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml index 77465a77..9a9defa1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: estimator + classes: frc::KalmanFilter: template_params: @@ -33,35 +36,30 @@ classes: templates: KalmanFilter_1_1_1: qualname: frc::KalmanFilter - subpackage: estimator params: - 1 - 1 - 1 KalmanFilter_2_1_1: qualname: frc::KalmanFilter - subpackage: estimator params: - 2 - 1 - 1 KalmanFilter_2_1_2: qualname: frc::KalmanFilter - subpackage: estimator params: - 2 - 1 - 2 KalmanFilter_2_2_2: qualname: frc::KalmanFilter - subpackage: estimator params: - 2 - 2 - 2 KalmanFilter_3_2_3: qualname: frc::KalmanFilter - subpackage: estimator params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml index e06dd06b..5e0317e9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::LTVDifferentialDriveController: - subpackage: controller methods: LTVDifferentialDriveController: AtReference: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml index 5b8d084d..2bff72a9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::LTVUnicycleController: - subpackage: controller methods: LTVUnicycleController: overloads: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml index 6727c54b..93deccc6 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + classes: frc::LinearPlantInversionFeedforward: template_params: @@ -29,25 +32,21 @@ classes: templates: LinearPlantInversionFeedforward_1_1: qualname: frc::LinearPlantInversionFeedforward - subpackage: controller params: - 1 - 1 LinearPlantInversionFeedforward_2_1: qualname: frc::LinearPlantInversionFeedforward - subpackage: controller params: - 2 - 1 LinearPlantInversionFeedforward_2_2: qualname: frc::LinearPlantInversionFeedforward - subpackage: controller params: - 2 - 2 LinearPlantInversionFeedforward_3_2: qualname: frc::LinearPlantInversionFeedforward - subpackage: controller params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml index 32477cc8..27994634 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + classes: frc::LinearQuadraticRegulator: template_params: @@ -46,25 +49,21 @@ classes: templates: LinearQuadraticRegulator_1_1: qualname: frc::LinearQuadraticRegulator - subpackage: controller params: - 1 - 1 LinearQuadraticRegulator_2_1: qualname: frc::LinearQuadraticRegulator - subpackage: controller params: - 2 - 1 LinearQuadraticRegulator_2_2: qualname: frc::LinearQuadraticRegulator - subpackage: controller params: - 2 - 2 LinearQuadraticRegulator_3_2: qualname: frc::LinearQuadraticRegulator - subpackage: controller params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml index 174ec260..a96d320e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: system + classes: frc::LinearSystem: template_params: @@ -31,84 +34,72 @@ classes: templates: LinearSystem_1_1_1: qualname: frc::LinearSystem - subpackage: system params: - 1 - 1 - 1 LinearSystem_1_1_2: qualname: frc::LinearSystem - subpackage: system params: - 1 - 1 - 2 LinearSystem_1_1_3: qualname: frc::LinearSystem - subpackage: system params: - 1 - 1 - 3 LinearSystem_2_1_1: qualname: frc::LinearSystem - subpackage: system params: - 2 - 1 - 1 LinearSystem_2_1_2: qualname: frc::LinearSystem - subpackage: system params: - 2 - 1 - 2 LinearSystem_2_1_3: qualname: frc::LinearSystem - subpackage: system params: - 2 - 1 - 3 LinearSystem_2_2_1: qualname: frc::LinearSystem - subpackage: system params: - 2 - 2 - 1 LinearSystem_2_2_2: qualname: frc::LinearSystem - subpackage: system params: - 2 - 2 - 2 LinearSystem_2_2_3: qualname: frc::LinearSystem - subpackage: system params: - 2 - 2 - 3 LinearSystem_3_2_1: qualname: frc::LinearSystem - subpackage: system params: - 3 - 2 - 1 LinearSystem_3_2_2: qualname: frc::LinearSystem - subpackage: system params: - 3 - 2 - 2 LinearSystem_3_2_3: qualname: frc::LinearSystem - subpackage: system params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml index f8b0039c..52874e4d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: plant classes: frc::LinearSystemId: - subpackage: plant typealias: - kv_meters = units::unit_t>> - kv_radians = units::unit_t>> diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml index e3e3a547..e580985c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: system + classes: frc::LinearSystemLoop: template_params: @@ -55,35 +58,30 @@ classes: templates: LinearSystemLoop_1_1_1: qualname: frc::LinearSystemLoop - subpackage: system params: - 1 - 1 - 1 LinearSystemLoop_2_1_1: qualname: frc::LinearSystemLoop - subpackage: system params: - 2 - 1 - 1 LinearSystemLoop_2_1_2: qualname: frc::LinearSystemLoop - subpackage: system params: - 2 - 1 - 2 LinearSystemLoop_2_2_2: qualname: frc::LinearSystemLoop - subpackage: system params: - 2 - 2 - 2 LinearSystemLoop_3_2_3: qualname: frc::LinearSystemLoop - subpackage: system params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml index 24481edd..45053558 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: constraint classes: frc::MaxVelocityConstraint: - subpackage: constraint typealias: - frc::TrajectoryConstraint::MinMax methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml index 810dc900..051b7323 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: constraint + classes: frc::MecanumDriveKinematicsConstraint: - subpackage: constraint typealias: - frc::TrajectoryConstraint::MinMax methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml index c65ad84d..cb7ff6fb 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: estimator classes: frc::MecanumDrivePoseEstimator: - subpackage: estimator force_no_trampoline: true doc: | This class wraps an Unscented Kalman Filter to fuse latency-compensated diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml index a7ace2ed..a10cd4b1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: estimator classes: frc::MecanumDrivePoseEstimator3d: - subpackage: estimator force_no_trampoline: true methods: MecanumDrivePoseEstimator3d: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml index e8568265..4da68d4f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::PIDController: - subpackage: controller ignored_bases: - wpi::SendableHelper methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml index a1e9a356..cb83c653 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: estimator extra_includes: - frc/kinematics/DifferentialDriveWheelPositions.h @@ -31,37 +33,31 @@ classes: templates: DifferentialDrivePoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - frc::DifferentialDriveWheelSpeeds - frc::DifferentialDriveWheelPositions MecanumDrivePoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - frc::MecanumDriveWheelSpeeds - frc::MecanumDriveWheelPositions SwerveDrive2PoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive3PoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive4PoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive6PoseEstimatorBase: qualname: frc::PoseEstimator - subpackage: estimator params: - wpi::array - wpi::array diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml index 739891f6..c0354803 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: estimator extra_includes: - frc/kinematics/DifferentialDriveWheelPositions.h @@ -31,37 +33,31 @@ classes: templates: DifferentialDrivePoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - frc::DifferentialDriveWheelSpeeds - frc::DifferentialDriveWheelPositions MecanumDrivePoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - frc::MecanumDriveWheelSpeeds - frc::MecanumDriveWheelPositions SwerveDrive2PoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive3PoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive4PoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - wpi::array - wpi::array SwerveDrive6PoseEstimator3dBase: qualname: frc::PoseEstimator3d - subpackage: estimator params: - wpi::array - wpi::array diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml index e352cca7..8d1f3002 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: controller functions: IncrementAndGetProfiledPIDControllerInstances: @@ -69,14 +71,12 @@ classes: templates: ProfiledPIDController: - subpackage: controller qualname: frc::ProfiledPIDController params: - units::dimensionless::scalar # needed for HolonomicDriveController ProfiledPIDControllerRadians: - subpackage: controller qualname: frc::ProfiledPIDController params: - units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml index 69d1f3d9..1f6bd1fd 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: controller classes: frc::RamseteController: - subpackage: controller methods: RamseteController: overloads: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml index fe8167ad..777ce08f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: constraint + extra_includes: - PyTrajectoryConstraint.h @@ -18,7 +21,6 @@ classes: templates: RectangularRegionConstraint: - subpackage: constraint qualname: frc::RectangularRegionConstraint params: - frc::PyTrajectoryConstraint diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml index 0a79c8b6..81912f83 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + extra_includes: - units/dimensionless.h @@ -39,18 +42,15 @@ templates: # Unfortunately this is broken because calculate requires an SI unit # SimpleMotorFeedforward: # qualname: frc::SimpleMotorFeedforward - # subpackage: controller # params: # - units::dimensionless::scalar SimpleMotorFeedforwardMeters: qualname: frc::SimpleMotorFeedforward - subpackage: controller params: - units::meter SimpleMotorFeedforwardRadians: qualname: frc::SimpleMotorFeedforward - subpackage: controller params: - units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml index 398312cf..b13e812c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: optimization extra_includes: - gilsafe_object.h @@ -13,6 +15,5 @@ classes: templates: SimulatedAnnealing: qualname: frc::SimulatedAnnealing - subpackage: optimization params: - semiwrap::gilsafe_object diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml index 8f08b4bf..b9107a46 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: constraint + classes: frc::SwerveDriveKinematicsConstraint: template_params: @@ -18,22 +21,18 @@ classes: templates: SwerveDrive2KinematicsConstraint: - subpackage: constraint qualname: frc::SwerveDriveKinematicsConstraint params: - 2 SwerveDrive3KinematicsConstraint: - subpackage: constraint qualname: frc::SwerveDriveKinematicsConstraint params: - 3 SwerveDrive4KinematicsConstraint: - subpackage: constraint qualname: frc::SwerveDriveKinematicsConstraint params: - 4 SwerveDrive6KinematicsConstraint: - subpackage: constraint qualname: frc::SwerveDriveKinematicsConstraint params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml index c93e32d4..c5fd8af0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: estimator extra_includes: - frc/kinematics/SwerveModuleState.h @@ -50,21 +52,17 @@ classes: templates: SwerveDrive2PoseEstimator: qualname: frc::SwerveDrivePoseEstimator - subpackage: estimator params: - 2 SwerveDrive3PoseEstimator: qualname: frc::SwerveDrivePoseEstimator - subpackage: estimator params: - 3 SwerveDrive4PoseEstimator: qualname: frc::SwerveDrivePoseEstimator - subpackage: estimator params: - 4 SwerveDrive6PoseEstimator: qualname: frc::SwerveDrivePoseEstimator - subpackage: estimator params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml index 08633cff..d870705d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml @@ -1,3 +1,5 @@ +defaults: + subpackage: estimator extra_includes: - frc/kinematics/SwerveModuleState.h @@ -20,21 +22,17 @@ classes: templates: SwerveDrive2PoseEstimator3d: qualname: frc::SwerveDrivePoseEstimator3d - subpackage: estimator params: - 2 SwerveDrive3PoseEstimator3d: qualname: frc::SwerveDrivePoseEstimator3d - subpackage: estimator params: - 3 SwerveDrive4PoseEstimator3d: qualname: frc::SwerveDrivePoseEstimator3d - subpackage: estimator params: - 4 SwerveDrive6PoseEstimator3d: qualname: frc::SwerveDrivePoseEstimator3d - subpackage: estimator params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml b/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml index 0f390a54..93ee23c0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: trajectory + extra_includes: - rpy/geometryToString.h @@ -8,7 +11,6 @@ functions: ignore: true classes: frc::Trajectory: - subpackage: trajectory force_type_casters: - units::curvature_t methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml index d543b842..ca1d09d8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml @@ -1,9 +1,11 @@ +defaults: + subpackage: trajectory + extra_includes: - PyTrajectoryConstraint.h classes: frc::TrajectoryConfig: - subpackage: trajectory methods: TrajectoryConfig: SetStartVelocity: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml index 8c912dbe..73af5ece 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: constraint + classes: frc::TrajectoryConstraint: - subpackage: constraint force_type_casters: - units::meters_per_second_squared methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml index f454754c..eb441e29 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml @@ -1,10 +1,12 @@ +defaults: + subpackage: trajectory + extra_includes: - frc/spline/CubicHermiteSpline.h - frc/spline/QuinticHermiteSpline.h classes: frc::TrajectoryGenerator: - subpackage: trajectory force_type_casters: - units::unit_t - units::curvature_t diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml index 62c484a7..97f4b524 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: trajectory + classes: frc::TrajectoryParameterizer: - subpackage: trajectory force_type_casters: - units::unit_t - units::curvature_t diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml index 063b37a0..6ed71f45 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml @@ -1,6 +1,8 @@ +defaults: + subpackage: trajectory + classes: frc::TrajectoryUtil: - subpackage: trajectory methods: ToPathweaverJson: FromPathweaverJson: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml index 0796f4da..3bb9dce7 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: trajectory + classes: frc::TrapezoidProfile: force_type_casters: @@ -95,14 +98,12 @@ classes: templates: TrapezoidProfile: - subpackage: trajectory qualname: frc::TrapezoidProfile params: - units::dimensionless::scalar # needed for HolonomicDriveController TrapezoidProfileRadians: - subpackage: trajectory qualname: frc::TrapezoidProfile params: - units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml index 2dad791f..ad40d99f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml @@ -1,7 +1,8 @@ +defaults: + subpackage: path classes: frc::TravelingSalesman: - subpackage: path methods: TravelingSalesman: overloads: diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml b/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml index 1ccff49c..90efb2c0 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml @@ -1,12 +1,11 @@ ---- defaults: ignore: true report_ignored_missing: false + subpackage: log enums: ControlRecordType: classes: wpi::log::DataLog: - subpackage: log attributes: kBlockSize: s_defaultMessageLog: @@ -72,7 +71,6 @@ classes: BufferHalfFull: BufferFull: wpi::log::DataLogEntry: - subpackage: log force_no_trampoline: true methods: SetMetadata: @@ -100,7 +98,6 @@ classes: ignore: true DataLog&, std::string_view, std::string_view, std::string_view, int64_t: wpi::log::RawLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -115,7 +112,6 @@ classes: Append: Update: wpi::log::BooleanLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -129,7 +125,6 @@ classes: Append: Update: wpi::log::IntegerLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -143,7 +138,6 @@ classes: Append: Update: wpi::log::FloatLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -157,7 +151,6 @@ classes: Append: Update: wpi::log::DoubleLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -171,7 +164,6 @@ classes: Append: Update: wpi::log::StringLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -186,7 +178,6 @@ classes: Append: Update: wpi::log::BooleanArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -219,7 +210,6 @@ classes: std::span, int64_t: ignore: true wpi::log::IntegerArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -241,7 +231,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::FloatArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -263,7 +252,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::DoubleArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -285,7 +273,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::StringArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -373,7 +360,6 @@ classes: ignore: true std::span, int64_t: wpi::log::ProtobufLogEntry: - subpackage: log force_no_trampoline: true ignore: true methods: @@ -387,69 +373,56 @@ classes: templates: StructLogEntry: qualname: wpi::log::StructLogEntry - subpackage: log params: - WPyStruct - WPyStructInfo StructArrayLogEntry: qualname: wpi::log::StructArrayLogEntry - subpackage: log params: - WPyStruct - WPyStructInfo _RawLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _BooleanLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - bool _IntegerLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - int64_t _FloatLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - float _DoubleLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - double _StringLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::string _BooleanArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _IntegerArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _FloatArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _DoubleArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _StringArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - - std::vector \ No newline at end of file + - std::vector diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml b/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml index 15a429f7..39e04b09 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml @@ -1,8 +1,9 @@ ---- +defaults: + subpackage: log + classes: wpi::log::StartRecordData: - subpackage: log attributes: entry: access: readonly @@ -13,14 +14,12 @@ classes: metadata: access: readonly wpi::log::MetadataRecordData: - subpackage: log attributes: entry: access: readonly metadata: access: readonly wpi::log::DataLogRecord: - subpackage: log methods: DataLogRecord: overloads: @@ -267,9 +266,8 @@ classes: wpi::log::DataLogIterator: ignore: true wpi::log::DataLogReader: - subpackage: log typealias: - - wpi::MemoryBuffer + - wpi::MemoryBuffer methods: DataLogReader: ignore: true @@ -290,7 +288,7 @@ inline_code: | "type=\"" + std::string(data.type) + "\", " "metadata=\"" + std::string(data.metadata) + "\")"; }); - + cls_MetadataRecordData .def("__repr__", [](const wpi::log::MetadataRecordData &data) -> std::string { return "MetadataRecordData(entry=" + std::to_string(data.entry) + ", " diff --git a/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml b/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml index 63943c16..79bd1169 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml @@ -1,39 +1,29 @@ ---- defaults: ignore: true + subpackage: sync extra_includes: - pybind11/stl.h functions: CreateEvent: - subpackage: sync DestroyEvent: - subpackage: sync SetEvent: - subpackage: sync - ResetEvent: - subpackage: sync + ResetEvent: CreateSemaphore: - subpackage: sync DestroySemaphore: - subpackage: sync ReleaseSemaphore: - subpackage: sync param_override: prevCount: default: "0" WaitForObject: overloads: WPI_Handle: - subpackage: sync WPI_Handle, double, bool*: - subpackage: sync WaitForObjects: overloads: std::span, std::span: - subpackage: sync param_override: signaled: ignore: true @@ -48,7 +38,6 @@ functions: std::initializer_list, std::span: ignore: true std::span, std::span, double, bool*: - subpackage: sync param_override: signaled: ignore: true @@ -66,10 +55,6 @@ functions: std::initializer_list, std::span, double, bool*: ignore: true CreateSignalObject: - subpackage: sync SetSignalObject: - subpackage: sync ResetSignalObject: - subpackage: sync DestroySignalObject: - subpackage: sync diff --git a/subprojects/robotpy-wpiutil/semiwrap/WPyStruct.yml b/subprojects/robotpy-wpiutil/semiwrap/WPyStruct.yml index 40244f52..3dad1e62 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/WPyStruct.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/WPyStruct.yml @@ -1,31 +1,24 @@ +defaults: + subpackage: wpistruct + functions: forEachNested: - subpackage: wpistruct no_release_gil: true getTypeName: - subpackage: wpistruct no_release_gil: true getSchema: - subpackage: wpistruct no_release_gil: true getSize: - subpackage: wpistruct no_release_gil: true pack: - subpackage: wpistruct no_release_gil: true packArray: - subpackage: wpistruct no_release_gil: true packInto: - subpackage: wpistruct no_release_gil: true unpack: - subpackage: wpistruct no_release_gil: true unpackArray: - subpackage: wpistruct no_release_gil: true unpackInto: - subpackage: wpistruct no_release_gil: true diff --git a/subprojects/robotpy-wpiutil/wpiutil/__init__.py b/subprojects/robotpy-wpiutil/wpiutil/__init__.py index 6dccafed..d174a31c 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/__init__.py +++ b/subprojects/robotpy-wpiutil/wpiutil/__init__.py @@ -2,7 +2,6 @@ # autogenerated by 'semiwrap create-imports wpiutil wpiutil._wpiutil' from ._wpiutil import ( - ControlRecordType, DataLogBackgroundWriter, DataLogWriter, Sendable, @@ -14,7 +13,6 @@ ) __all__ = [ - "ControlRecordType", "DataLogBackgroundWriter", "DataLogWriter", "Sendable", diff --git a/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py b/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py index d724c267..ebec2a6d 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py +++ b/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py @@ -2,6 +2,7 @@ from .._wpiutil.log import ( BooleanArrayLogEntry, BooleanLogEntry, + ControlRecordType, DataLog, DataLogEntry, DataLogReader, @@ -24,6 +25,7 @@ __all__ = [ "BooleanArrayLogEntry", "BooleanLogEntry", + "ControlRecordType", "DataLog", "DataLogEntry", "DataLogReader",