diff --git a/docs/conf.py b/docs/conf.py index 3287484e3..17a385195 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,11 +60,6 @@ # WPILib gen_package(root, "wpilib", exclude=["wpi_*"]) -gen_package(root, "wpilib.counter") -gen_package(root, "wpilib.event") -gen_package(root, "wpilib.drive") -gen_package(root, "wpilib.interfaces") -gen_package(root, "wpilib.shuffleboard") gen_package(root, "wpilib.simulation") gen_package(root, "wpilib.sysid") @@ -79,19 +74,6 @@ # WPIMath gen_package(root, "wpimath") -gen_package(root, "wpimath.controller") -gen_package(root, "wpimath.estimator") -gen_package(root, "wpimath.filter") -gen_package(root, "wpimath.geometry") -gen_package(root, "wpimath.interpolation") -gen_package(root, "wpimath.kinematics") -gen_package(root, "wpimath.optimization") -gen_package(root, "wpimath.path") -gen_package(root, "wpimath.spline") -gen_package(root, "wpimath.system") -gen_package(root, "wpimath.system.plant") -gen_package(root, "wpimath.trajectory") -gen_package(root, "wpimath.trajectory.constraint") # WPINet gen_package(root, "wpinet") diff --git a/subprojects/robotpy-apriltag/tests/test_detection.py b/subprojects/robotpy-apriltag/tests/test_detection.py index c323120a9..a0c97ac1c 100644 --- a/subprojects/robotpy-apriltag/tests/test_detection.py +++ b/subprojects/robotpy-apriltag/tests/test_detection.py @@ -1,6 +1,6 @@ import cv2 import robotpy_apriltag -from wpimath.geometry import Transform3d +from wpimath import Transform3d import math import pathlib diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index 189547334..e22fcfffa 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -45,7 +45,7 @@ update_init = ["romi"] name = "romi" wraps = ["robotpy-native-romi"] depends = [ - "wpilib", "wpimath_geometry" + "wpilib", "wpimath" ] [tool.semiwrap.extension_modules."romi._romi".headers] diff --git a/subprojects/robotpy-wpilib/meson.build b/subprojects/robotpy-wpilib/meson.build index db3c261fa..022100a45 100644 --- a/subprojects/robotpy-wpilib/meson.build +++ b/subprojects/robotpy-wpilib/meson.build @@ -12,18 +12,6 @@ wpilib_sources += files( 'wpilib/src/rpy/MotorControllerGroup.cpp', ) -wpilib_counter_sources += files( - 'wpilib/counter/counter.cpp', -) - -wpilib_drive_sources += files( - 'wpilib/drive/drive.cpp', -) - -wpilib_event_sources += files( - 'wpilib/event/event.cpp', -) - wpilib_simulation_sources += files( 'wpilib/simulation/simulation.cpp', ) diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 0d210c319..2e586be8b 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -50,10 +50,6 @@ packages = ["wpilib"] [tool.semiwrap] update_init = [ "wpilib", - "wpilib.counter", - "wpilib.drive", - "wpilib.event", - "wpilib.interfaces wpilib._wpilib.interfaces", "wpilib.simulation", "wpilib.sysid wpilib._wpilib.sysid", ] @@ -78,9 +74,7 @@ scan_headers_ignore = [ name = "wpilib" wraps = ["robotpy-native-wpilib"] depends = [ - "wpihal", "wpiutil", "ntcore", - "wpimath", "wpimath_geometry", "wpimath_controls", - "wpilib_event" + "wpihal", "wpiutil", "ntcore", "wpimath" ] includes = ["wpilib/src"] @@ -93,6 +87,16 @@ Filesystem = "rpy/Filesystem.h" MotorControllerGroup = "rpy/MotorControllerGroup.h" Notifier = "rpy/Notifier.h" +# wpi/counter +EdgeConfiguration = "wpi/counter/EdgeConfiguration.hpp" +Tachometer = "wpi/counter/Tachometer.hpp" +UpDownCounter = "wpi/counter/UpDownCounter.hpp" + +# wpi/drive +DifferentialDrive = "wpi/drive/DifferentialDrive.hpp" +MecanumDrive = "wpi/drive/MecanumDrive.hpp" +RobotDriveBase = "wpi/drive/RobotDriveBase.hpp" + # wpi/driverstation DSControlWord = "wpi/driverstation/DSControlWord.hpp" DriverStation = "wpi/driverstation/DriverStation.hpp" @@ -104,6 +108,11 @@ PS5Controller = "wpi/driverstation/PS5Controller.hpp" StadiaController = "wpi/driverstation/StadiaController.hpp" XboxController = "wpi/driverstation/XboxController.hpp" +# wpi/event +BooleanEvent = "wpi/event/BooleanEvent.hpp" +EventLoop = "wpi/event/EventLoop.hpp" +NetworkBooleanEvent = "wpi/event/NetworkBooleanEvent.hpp" + # wpi/framework IterativeRobotBase = "wpi/framework/IterativeRobotBase.hpp" RobotBase = "wpi/framework/RobotBase.hpp" @@ -214,50 +223,10 @@ Preferences = "wpi/util/Preferences.hpp" SensorUtil = "wpi/util/SensorUtil.hpp" -[tool.semiwrap.extension_modules."wpilib.counter._counter"] -name = "wpilib_counter" -wraps = ["robotpy-native-wpilib"] -depends = ["wpilib"] -yaml_path = "semiwrap/counter" - -[tool.semiwrap.extension_modules."wpilib.counter._counter".headers] -# wpi/counter -EdgeConfiguration = "wpi/counter/EdgeConfiguration.hpp" -Tachometer = "wpi/counter/Tachometer.hpp" -UpDownCounter = "wpi/counter/UpDownCounter.hpp" - - -[tool.semiwrap.extension_modules."wpilib.drive._drive"] -name = "wpilib_drive" -wraps = ["robotpy-native-wpilib"] -depends = ["wpilib"] -yaml_path = "semiwrap/drive" - -[tool.semiwrap.extension_modules."wpilib.drive._drive".headers] -# wpi/drive -DifferentialDrive = "wpi/drive/DifferentialDrive.hpp" -MecanumDrive = "wpi/drive/MecanumDrive.hpp" -RobotDriveBase = "wpi/drive/RobotDriveBase.hpp" - - -[tool.semiwrap.extension_modules."wpilib.event._event"] -name = "wpilib_event" -wraps = ["robotpy-native-wpilib"] -# depends = ["wpilib", "wpimath_filter"] -depends = ["wpimath_filter"] -yaml_path = "semiwrap/event" - -[tool.semiwrap.extension_modules."wpilib.event._event".headers] -# wpi/event -BooleanEvent = "wpi/event/BooleanEvent.hpp" -EventLoop = "wpi/event/EventLoop.hpp" -NetworkBooleanEvent = "wpi/event/NetworkBooleanEvent.hpp" - - [tool.semiwrap.extension_modules."wpilib.simulation._simulation"] name = "wpilib_simulation" wraps = ["robotpy-native-wpilib"] -depends = ["wpilib", "wpimath_controls", "wpimath_geometry", "wpimath_kinematics"] +depends = ["wpilib", "wpimath"] yaml_path = "semiwrap/simulation" [tool.semiwrap.extension_modules."wpilib.simulation._simulation".headers] diff --git a/subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml b/subprojects/robotpy-wpilib/semiwrap/BooleanEvent.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml rename to subprojects/robotpy-wpilib/semiwrap/BooleanEvent.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml b/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml index bb857f6b2..c6b8641d2 100644 --- a/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: interfaces - classes: wpi::CounterBase: enums: diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml b/subprojects/robotpy-wpilib/semiwrap/DifferentialDrive.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml rename to subprojects/robotpy-wpilib/semiwrap/DifferentialDrive.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/EdgeConfiguration.yml b/subprojects/robotpy-wpilib/semiwrap/EdgeConfiguration.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/counter/EdgeConfiguration.yml rename to subprojects/robotpy-wpilib/semiwrap/EdgeConfiguration.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml b/subprojects/robotpy-wpilib/semiwrap/EventLoop.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml rename to subprojects/robotpy-wpilib/semiwrap/EventLoop.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml b/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml index 26fbfe277..cc384ca93 100644 --- a/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml +++ b/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: interfaces - extra_includes: - wpi/driverstation/DriverStation.hpp - wpi/event/BooleanEvent.hpp diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml b/subprojects/robotpy-wpilib/semiwrap/MecanumDrive.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml rename to subprojects/robotpy-wpilib/semiwrap/MecanumDrive.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/MotorController.yml b/subprojects/robotpy-wpilib/semiwrap/MotorController.yml index 94764b64e..b31282697 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MotorController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MotorController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: interfaces - classes: wpi::MotorController: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml b/subprojects/robotpy-wpilib/semiwrap/NetworkBooleanEvent.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml rename to subprojects/robotpy-wpilib/semiwrap/NetworkBooleanEvent.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml b/subprojects/robotpy-wpilib/semiwrap/RobotDriveBase.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml rename to subprojects/robotpy-wpilib/semiwrap/RobotDriveBase.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml b/subprojects/robotpy-wpilib/semiwrap/Tachometer.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml rename to subprojects/robotpy-wpilib/semiwrap/Tachometer.yml diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml b/subprojects/robotpy-wpilib/semiwrap/UpDownCounter.yml similarity index 100% rename from subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml rename to subprojects/robotpy-wpilib/semiwrap/UpDownCounter.yml diff --git a/subprojects/robotpy-wpilib/tests/test_wpilib_drive.py b/subprojects/robotpy-wpilib/tests/test_wpilib_drive.py deleted file mode 100644 index af1d2a672..000000000 --- a/subprojects/robotpy-wpilib/tests/test_wpilib_drive.py +++ /dev/null @@ -1,5 +0,0 @@ -import wpilib.drive - - -def test_wpilib_drive(): - pass diff --git a/subprojects/robotpy-wpilib/tests/test_wpilib_interfaces.py b/subprojects/robotpy-wpilib/tests/test_wpilib_interfaces.py deleted file mode 100644 index aff2714c4..000000000 --- a/subprojects/robotpy-wpilib/tests/test_wpilib_interfaces.py +++ /dev/null @@ -1,5 +0,0 @@ -import wpilib.interfaces - - -def test_wpilib_interfaces(): - pass diff --git a/subprojects/robotpy-wpilib/wpilib/__init__.py b/subprojects/robotpy-wpilib/wpilib/__init__.py index 35fd9041c..69bedeb51 100644 --- a/subprojects/robotpy-wpilib/wpilib/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/__init__.py @@ -1,8 +1,5 @@ from . import _init__wpilib -# TODO: robotpy-build subpackage bug -from wpimath._controls._controls import trajectory as _ - # autogenerated by 'semiwrap create-imports wpilib wpilib._wpilib' from ._wpilib import ( ADXL345_I2C, @@ -12,19 +9,24 @@ AnalogEncoder, AnalogInput, AnalogPotentiometer, + BooleanEvent, CAN, CANStatus, Compressor, CompressorConfigType, + CounterBase, DSControlWord, DataLogManager, + DifferentialDrive, DigitalInput, DigitalOutput, DoubleSolenoid, DriverStation, DutyCycle, DutyCycleEncoder, + EdgeConfiguration, Encoder, + EventLoop, ExpansionHub, ExpansionHubMotor, ExpansionHubPidConstants, @@ -32,17 +34,21 @@ Field2d, FieldObject2d, Gamepad, + GenericHID, I2C, IterativeRobotBase, Joystick, Koors40, LEDPattern, + MecanumDrive, Mechanism2d, MechanismLigament2d, MechanismObject2d, MechanismRoot2d, + MotorController, MotorControllerGroup, MotorSafety, + NetworkBooleanEvent, Notifier, OnboardIMU, PS4Controller, @@ -63,6 +69,7 @@ Preferences, RobotBase, RobotController, + RobotDriveBase, RobotState, RuntimeType, SendableBuilderImpl, @@ -77,11 +84,13 @@ SparkMini, StadiaController, SystemServer, + Tachometer, Talon, TimedRobot, Timer, TimesliceRobot, Tracer, + UpDownCounter, VictorSP, Watchdog, XboxController, @@ -102,19 +111,24 @@ "AnalogEncoder", "AnalogInput", "AnalogPotentiometer", + "BooleanEvent", "CAN", "CANStatus", "Compressor", "CompressorConfigType", + "CounterBase", "DSControlWord", "DataLogManager", + "DifferentialDrive", "DigitalInput", "DigitalOutput", "DoubleSolenoid", "DriverStation", "DutyCycle", "DutyCycleEncoder", + "EdgeConfiguration", "Encoder", + "EventLoop", "ExpansionHub", "ExpansionHubMotor", "ExpansionHubPidConstants", @@ -122,17 +136,21 @@ "Field2d", "FieldObject2d", "Gamepad", + "GenericHID", "I2C", "IterativeRobotBase", "Joystick", "Koors40", "LEDPattern", + "MecanumDrive", "Mechanism2d", "MechanismLigament2d", "MechanismObject2d", "MechanismRoot2d", + "MotorController", "MotorControllerGroup", "MotorSafety", + "NetworkBooleanEvent", "Notifier", "OnboardIMU", "PS4Controller", @@ -153,6 +171,7 @@ "Preferences", "RobotBase", "RobotController", + "RobotDriveBase", "RobotState", "RuntimeType", "SendableBuilderImpl", @@ -167,11 +186,13 @@ "SparkMini", "StadiaController", "SystemServer", + "Tachometer", "Talon", "TimedRobot", "Timer", "TimesliceRobot", "Tracer", + "UpDownCounter", "VictorSP", "Watchdog", "XboxController", diff --git a/subprojects/robotpy-wpilib/wpilib/counter/__init__.py b/subprojects/robotpy-wpilib/wpilib/counter/__init__.py deleted file mode 100644 index 756950c35..000000000 --- a/subprojects/robotpy-wpilib/wpilib/counter/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from . import _init__counter - -# autogenerated by 'semiwrap create-imports wpilib.counter wpilib.counter._counter' -from ._counter import EdgeConfiguration, Tachometer, UpDownCounter - -__all__ = ["EdgeConfiguration", "Tachometer", "UpDownCounter"] diff --git a/subprojects/robotpy-wpilib/wpilib/counter/counter.cpp b/subprojects/robotpy-wpilib/wpilib/counter/counter.cpp deleted file mode 100644 index 7dbe6e455..000000000 --- a/subprojects/robotpy-wpilib/wpilib/counter/counter.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpilib.counter._counter.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpilib/wpilib/drive/__init__.py b/subprojects/robotpy-wpilib/wpilib/drive/__init__.py deleted file mode 100644 index 5c9b913e8..000000000 --- a/subprojects/robotpy-wpilib/wpilib/drive/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from . import _init__drive - -# autogenerated by 'semiwrap create-imports wpilib.drive wpilib.drive._drive' -from ._drive import DifferentialDrive, MecanumDrive, RobotDriveBase - -__all__ = ["DifferentialDrive", "MecanumDrive", "RobotDriveBase"] - -del _init__drive diff --git a/subprojects/robotpy-wpilib/wpilib/drive/drive.cpp b/subprojects/robotpy-wpilib/wpilib/drive/drive.cpp deleted file mode 100644 index 2ef4e0efd..000000000 --- a/subprojects/robotpy-wpilib/wpilib/drive/drive.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpilib.drive._drive.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpilib/wpilib/event/__init__.py b/subprojects/robotpy-wpilib/wpilib/event/__init__.py deleted file mode 100644 index 3bef5e230..000000000 --- a/subprojects/robotpy-wpilib/wpilib/event/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from . import _init__event - -# autogenerated by 'semiwrap create-imports wpilib.event wpilib.event._event' -from ._event import BooleanEvent, EventLoop, NetworkBooleanEvent - -__all__ = ["BooleanEvent", "EventLoop", "NetworkBooleanEvent"] diff --git a/subprojects/robotpy-wpilib/wpilib/event/event.cpp b/subprojects/robotpy-wpilib/wpilib/event/event.cpp deleted file mode 100644 index 2a317e39c..000000000 --- a/subprojects/robotpy-wpilib/wpilib/event/event.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpilib.event._event.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpilib/wpilib/interfaces/__init__.py b/subprojects/robotpy-wpilib/wpilib/interfaces/__init__.py deleted file mode 100644 index db37b3bf1..000000000 --- a/subprojects/robotpy-wpilib/wpilib/interfaces/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpilib.interfaces wpilib._wpilib.interfaces' -from .._wpilib.interfaces import CounterBase, GenericHID, MotorController - -__all__ = ["CounterBase", "GenericHID", "MotorController"] diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py index 041923862..dc0fcde7a 100644 --- a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py @@ -1,8 +1,5 @@ from . import _init__simulation -# needed for dcmotor return value, TODO fix in robotpy-build -from wpimath._controls._controls import plant as _ - # autogenerated by 'semiwrap create-imports wpilib.simulation wpilib.simulation._simulation' from ._simulation import ( ADXL345Sim, diff --git a/subprojects/robotpy-wpimath/.gitignore b/subprojects/robotpy-wpimath/.gitignore index 0b37645b2..b76e30d9c 100644 --- a/subprojects/robotpy-wpimath/.gitignore +++ b/subprojects/robotpy-wpimath/.gitignore @@ -22,27 +22,7 @@ MANIFEST /wpimath/wpimath.pc /wpimath/wpimath-casters.pc /wpimath/wpimath-casters.pybind11.json -/wpimath/_controls/_init__controls.py -/wpimath/_controls/wpimath_controls.pc -/wpimath/_controls/trampolines/ -/wpimath/filter/_init__filter.py -/wpimath/filter/wpimath_filter.pc -/wpimath/filter/trampolines/ -/wpimath/geometry/_init__geometry.py -/wpimath/geometry/wpimath_geometry.pc -/wpimath/geometry/trampolines/ -/wpimath/interfaces/_init__interfaces.py -/wpimath/interpolation/_init__interpolation.py -/wpimath/interpolation/wpimath_interpolation.pc -/wpimath/interpolation/trampolines/ -/wpimath/kinematics/_init__kinematics.py -/wpimath/kinematics/wpimath_kinematics.pc -/wpimath/kinematics/trampolines/ -/wpimath/spline/_init__spline.py -/wpimath/spline/wpimath_spline.pc -/wpimath/spline/trampolines/ -/wpimath/trajectory/_init__trajectory.py - +/wpimath/trampolines rpy-include /wpimath/_impl/_init_wpimath_cpp.py /wpimath/_impl/pkgcfg.py diff --git a/subprojects/robotpy-wpimath/meson.build b/subprojects/robotpy-wpimath/meson.build index 025134f82..e61356f40 100644 --- a/subprojects/robotpy-wpimath/meson.build +++ b/subprojects/robotpy-wpimath/meson.build @@ -8,28 +8,4 @@ wpimath_sources += files( 'wpimath/src/wpimath.cpp', ) -wpimath_controls_sources += files( - 'wpimath/_controls/controls.cpp', -) - -wpimath_filter_sources += files( - 'wpimath/filter/filter.cpp', -) - -wpimath_geometry_sources += files( - 'wpimath/geometry/geometry.cpp', -) - -wpimath_interpolation_sources += files( - 'wpimath/interpolation/interpolation.cpp', -) - -wpimath_kinematics_sources += files( - 'wpimath/kinematics/kinematics.cpp', -) - -wpimath_spline_sources += files( - 'wpimath/spline/spline.cpp', -) - subdir('semiwrap/modules') diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 46201073c..42b826611 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -41,18 +41,6 @@ packages = ["wpimath"] [tool.semiwrap] update_init = [ "wpimath", - "wpimath.controller wpimath._controls._controls.controller", - "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", - "wpimath.system wpimath._controls._controls.system", - "wpimath.trajectory wpimath._controls._controls.trajectory", - "wpimath.trajectory.constraint wpimath._controls._controls.constraint", ] scan_headers_ignore = [ @@ -104,7 +92,7 @@ scan_headers_ignore = [ "wpi/math/util/MathShared.hpp", - "rpy/geometryToString.h", + "geometryToString.h", "PyTrajectoryConstraint.h", "_units_base_type_caster.h", ] @@ -1465,35 +1453,53 @@ includes = ["wpimath/_impl/src"] depends = ["wpiutil", "wpimath-casters"] [tool.semiwrap.extension_modules."wpimath._wpimath".headers] -# frc +# wpi/math/util ComputerVisionUtil = "wpi/math/util/ComputerVisionUtil.hpp" # DARE = "wpi/math/linalg/DARE.hpp" # EigenCore = "wpi/math/linalg/EigenCore.hpp" MathUtil = "wpi/math/util/MathUtil.hpp" # StateSpaceUtil = "wpi/math/util/StateSpaceUtil.hpp" +# wpi/math/controller +ArmFeedforward = "wpi/math/controller/ArmFeedforward.hpp" +BangBangController = "wpi/math/controller/BangBangController.hpp" +ControlAffinePlantInversionFeedforward = "wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp" +DifferentialDriveAccelerationLimiter = "wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp" +DifferentialDriveFeedforward = "wpi/math/controller/DifferentialDriveFeedforward.hpp" +DifferentialDriveWheelVoltages = "wpi/math/controller/DifferentialDriveWheelVoltages.hpp" +ElevatorFeedforward = "wpi/math/controller/ElevatorFeedforward.hpp" +ImplicitModelFollower = "wpi/math/controller/ImplicitModelFollower.hpp" +LTVDifferentialDriveController = "wpi/math/controller/LTVDifferentialDriveController.hpp" +LTVUnicycleController = "wpi/math/controller/LTVUnicycleController.hpp" +LinearPlantInversionFeedforward = "wpi/math/controller/LinearPlantInversionFeedforward.hpp" +LinearQuadraticRegulator = "wpi/math/controller/LinearQuadraticRegulator.hpp" +PIDController = "wpi/math/controller/PIDController.hpp" +ProfiledPIDController = "wpi/math/controller/ProfiledPIDController.hpp" +SimpleMotorFeedforward = "wpi/math/controller/SimpleMotorFeedforward.hpp" -[tool.semiwrap.extension_modules."wpimath.filter._filter"] -name = "wpimath_filter" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath"] -yaml_path = "semiwrap/filter" +# wpi/math/estimator +# AngleStatistics = "wpi/math/estimator/AngleStatistics.hpp" +DifferentialDrivePoseEstimator = "wpi/math/estimator/DifferentialDrivePoseEstimator.hpp" +DifferentialDrivePoseEstimator3d = "wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp" +ExtendedKalmanFilter = "wpi/math/estimator/ExtendedKalmanFilter.hpp" +KalmanFilter = "wpi/math/estimator/KalmanFilter.hpp" +# KalmanFilterLatencyCompensator = "wpi/math/estimator/KalmanFilterLatencyCompensator.hpp" +MecanumDrivePoseEstimator = "wpi/math/estimator/MecanumDrivePoseEstimator.hpp" +MecanumDrivePoseEstimator3d = "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp" +# MerweScaledSigmaPoints = "wpi/math/estimator/MerweScaledSigmaPoints.hpp" +PoseEstimator = "wpi/math/estimator/PoseEstimator.hpp" +PoseEstimator3d = "wpi/math/estimator/PoseEstimator3d.hpp" +SwerveDrivePoseEstimator = "wpi/math/estimator/SwerveDrivePoseEstimator.hpp" +SwerveDrivePoseEstimator3d = "wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp" +# UnscentedKalmanFilter = "wpi/math/estimator/UnscentedKalmanFilter.hpp" +# UnscentedTransform = "wpi/math/estimator/UnscentedTransform.hpp" -[tool.semiwrap.extension_modules."wpimath.filter._filter".headers] +# wpi/math/filter Debouncer = "wpi/math/filter/Debouncer.hpp" LinearFilter = "wpi/math/filter/LinearFilter.hpp" MedianFilter = "wpi/math/filter/MedianFilter.hpp" SlewRateLimiter = "wpi/math/filter/SlewRateLimiter.hpp" - -[tool.semiwrap.extension_modules."wpimath.geometry._geometry"] -name = "wpimath_geometry" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath"] -includes = ["wpimath/geometry/include"] -yaml_path = "semiwrap/geometry" - -[tool.semiwrap.extension_modules."wpimath.geometry._geometry".headers] # wpi/math/geometry CoordinateAxis = "wpi/math/geometry/CoordinateAxis.hpp" CoordinateSystem = "wpi/math/geometry/CoordinateSystem.hpp" @@ -1511,24 +1517,9 @@ Translation3d = "wpi/math/geometry/Translation3d.hpp" Twist2d = "wpi/math/geometry/Twist2d.hpp" Twist3d = "wpi/math/geometry/Twist3d.hpp" -[tool.semiwrap.extension_modules."wpimath.interpolation._interpolation"] -name = "wpimath_interpolation" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath_geometry"] -yaml_path = "semiwrap/interpolation" - -[tool.semiwrap.extension_modules."wpimath.interpolation._interpolation".headers] # wpi/math/interpolation TimeInterpolatableBuffer = "wpi/math/interpolation/TimeInterpolatableBuffer.hpp" - -[tool.semiwrap.extension_modules."wpimath.kinematics._kinematics"] -name = "wpimath_kinematics" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath_geometry"] -yaml_path = "semiwrap/kinematics" - -[tool.semiwrap.extension_modules."wpimath.kinematics._kinematics".headers] # wpi/math/kinematics ChassisSpeeds = "wpi/math/kinematics/ChassisSpeeds.hpp" DifferentialDriveKinematics = "wpi/math/kinematics/DifferentialDriveKinematics.hpp" @@ -1550,14 +1541,12 @@ SwerveDriveOdometry3d = "wpi/math/kinematics/SwerveDriveOdometry3d.hpp" SwerveModulePosition = "wpi/math/kinematics/SwerveModulePosition.hpp" SwerveModuleState = "wpi/math/kinematics/SwerveModuleState.hpp" +# wpi/math/optimization +SimulatedAnnealing = "wpi/math/optimization/SimulatedAnnealing.hpp" -[tool.semiwrap.extension_modules."wpimath.spline._spline"] -name = "wpimath_spline" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath_geometry"] -yaml_path = "semiwrap/spline" +# wpi/math/path +TravelingSalesman = "wpi/math/path/TravelingSalesman.hpp" -[tool.semiwrap.extension_modules."wpimath.spline._spline".headers] # wpi/math/spline CubicHermiteSpline = "wpi/math/spline/CubicHermiteSpline.hpp" QuinticHermiteSpline = "wpi/math/spline/QuinticHermiteSpline.hpp" @@ -1565,57 +1554,6 @@ Spline = "wpi/math/spline/Spline.hpp" SplineHelper = "wpi/math/spline/SplineHelper.hpp" SplineParameterizer = "wpi/math/spline/SplineParameterizer.hpp" - -[tool.semiwrap.extension_modules."wpimath._controls._controls"] -name = "wpimath_controls" -wraps = ["robotpy-native-wpimath"] -depends = ["wpimath", "wpimath_geometry", "wpimath_kinematics", "wpimath_spline"] -yaml_path = "semiwrap/controls" - -[tool.semiwrap.extension_modules."wpimath._controls._controls".headers] -# wpi/math/controller -ArmFeedforward = "wpi/math/controller/ArmFeedforward.hpp" -BangBangController = "wpi/math/controller/BangBangController.hpp" -ControlAffinePlantInversionFeedforward = "wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp" -DifferentialDriveAccelerationLimiter = "wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp" -DifferentialDriveFeedforward = "wpi/math/controller/DifferentialDriveFeedforward.hpp" -DifferentialDriveWheelVoltages = "wpi/math/controller/DifferentialDriveWheelVoltages.hpp" -ElevatorFeedforward = "wpi/math/controller/ElevatorFeedforward.hpp" -ImplicitModelFollower = "wpi/math/controller/ImplicitModelFollower.hpp" -LTVDifferentialDriveController = "wpi/math/controller/LTVDifferentialDriveController.hpp" -LTVUnicycleController = "wpi/math/controller/LTVUnicycleController.hpp" -LinearPlantInversionFeedforward = "wpi/math/controller/LinearPlantInversionFeedforward.hpp" -LinearQuadraticRegulator = "wpi/math/controller/LinearQuadraticRegulator.hpp" -PIDController = "wpi/math/controller/PIDController.hpp" -ProfiledPIDController = "wpi/math/controller/ProfiledPIDController.hpp" -SimpleMotorFeedforward = "wpi/math/controller/SimpleMotorFeedforward.hpp" - -# wpi/math/estimator -# AngleStatistics = "wpi/math/estimator/AngleStatistics.hpp" -DifferentialDrivePoseEstimator = "wpi/math/estimator/DifferentialDrivePoseEstimator.hpp" -DifferentialDrivePoseEstimator3d = "wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp" -ExtendedKalmanFilter = "wpi/math/estimator/ExtendedKalmanFilter.hpp" -KalmanFilter = "wpi/math/estimator/KalmanFilter.hpp" -# KalmanFilterLatencyCompensator = "wpi/math/estimator/KalmanFilterLatencyCompensator.hpp" -MecanumDrivePoseEstimator = "wpi/math/estimator/MecanumDrivePoseEstimator.hpp" -MecanumDrivePoseEstimator3d = "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp" -# MerweScaledSigmaPoints = "wpi/math/estimator/MerweScaledSigmaPoints.hpp" -PoseEstimator = "wpi/math/estimator/PoseEstimator.hpp" -PoseEstimator3d = "wpi/math/estimator/PoseEstimator3d.hpp" -SwerveDrivePoseEstimator = "wpi/math/estimator/SwerveDrivePoseEstimator.hpp" -SwerveDrivePoseEstimator3d = "wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp" -# UnscentedKalmanFilter = "wpi/math/estimator/UnscentedKalmanFilter.hpp" -# UnscentedTransform = "wpi/math/estimator/UnscentedTransform.hpp" - -# wpi/math/optimization -SimulatedAnnealing = "wpi/math/optimization/SimulatedAnnealing.hpp" - -# wpi/math/random -# Normal = "wpi/math/random/Normal.hpp" - -# wpi/math/path -TravelingSalesman = "wpi/math/path/TravelingSalesman.hpp" - # wpi/math/system # Discretization = "wpi/math/system/Discretization.hpp" LinearSystem = "wpi/math/system/LinearSystem.hpp" diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/ArmFeedforward.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/ArmFeedforward.yml index 65d3920df..10c597627 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ArmFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::ArmFeedforward: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml b/subprojects/robotpy-wpimath/semiwrap/BangBangController.yml similarity index 91% rename from subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml rename to subprojects/robotpy-wpimath/semiwrap/BangBangController.yml index daf522a64..62b9e6a20 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/BangBangController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::BangBangController: ignored_bases: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/CentripetalAccelerationConstraint.yml similarity index 93% rename from subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/CentripetalAccelerationConstraint.yml index 5de0cacf8..0de3696ac 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/CentripetalAccelerationConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::CentripetalAccelerationConstraint: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/ChassisSpeeds.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml rename to subprojects/robotpy-wpimath/semiwrap/ChassisSpeeds.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/ControlAffinePlantInversionFeedforward.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/ControlAffinePlantInversionFeedforward.yml index d765af91f..c9258ceda 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ControlAffinePlantInversionFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::ControlAffinePlantInversionFeedforward: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml b/subprojects/robotpy-wpimath/semiwrap/CoordinateAxis.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml rename to subprojects/robotpy-wpimath/semiwrap/CoordinateAxis.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml b/subprojects/robotpy-wpimath/semiwrap/CoordinateSystem.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml rename to subprojects/robotpy-wpimath/semiwrap/CoordinateSystem.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml b/subprojects/robotpy-wpimath/semiwrap/CubicHermiteSpline.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml rename to subprojects/robotpy-wpimath/semiwrap/CubicHermiteSpline.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml b/subprojects/robotpy-wpimath/semiwrap/DCMotor.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml rename to subprojects/robotpy-wpimath/semiwrap/DCMotor.yml index c5fd38711..f5a4b7c59 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DCMotor.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: plant - extra_includes: - wpystruct.h diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml b/subprojects/robotpy-wpimath/semiwrap/Debouncer.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml rename to subprojects/robotpy-wpimath/semiwrap/Debouncer.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveAccelerationLimiter.yml similarity index 93% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveAccelerationLimiter.yml index 291fdea9c..31ad391eb 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveAccelerationLimiter.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::DifferentialDriveAccelerationLimiter: methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveFeedforward.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveFeedforward.yml index edd1d33ba..6abe7270d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::DifferentialDriveFeedforward: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveKinematics.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveKinematics.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveKinematicsConstraint.yml similarity index 94% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveKinematicsConstraint.yml index 9a7433242..b1280fb02 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveKinematicsConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::DifferentialDriveKinematicsConstraint: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveOdometry.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveOdometry.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveOdometry3d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveOdometry3d.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator.yml index f765ca54c..7e8a6ec11 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::DifferentialDrivePoseEstimator: force_no_trampoline: true diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator3d.yml similarity index 93% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator3d.yml index 3466dbef7..b63aca0ae 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDrivePoseEstimator3d.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::DifferentialDrivePoseEstimator3d: force_no_trampoline: true diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveVoltageConstraint.yml similarity index 85% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveVoltageConstraint.yml index e8720f986..5565b12df 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveVoltageConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::DifferentialDriveVoltageConstraint: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelPositions.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelPositions.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelSpeeds.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelSpeeds.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelVoltages.yml similarity index 94% rename from subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml rename to subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelVoltages.yml index f2c0f5c4d..53fe7ceb8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml +++ b/subprojects/robotpy-wpimath/semiwrap/DifferentialDriveWheelVoltages.yml @@ -1,7 +1,3 @@ -defaults: - subpackage: controller - - classes: wpi::math::DifferentialDriveWheelVoltages: force_no_default_constructor: true diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/ElevatorFeedforward.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/ElevatorFeedforward.yml index 974d22b42..ff7d5a10d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ElevatorFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::ElevatorFeedforward: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml b/subprojects/robotpy-wpimath/semiwrap/Ellipse2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Ellipse2d.yml index bf717940f..641f1778b 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Ellipse2d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h classes: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/EllipticalRegionConstraint.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/EllipticalRegionConstraint.yml index d8c8dadbf..0318e2372 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/EllipticalRegionConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - extra_includes: - PyTrajectoryConstraint.h diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml b/subprojects/robotpy-wpimath/semiwrap/ExponentialProfile.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml rename to subprojects/robotpy-wpimath/semiwrap/ExponentialProfile.yml index 96532b038..5082664d1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ExponentialProfile.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: trajectory - classes: wpi::math::ExponentialProfile: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/ExtendedKalmanFilter.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml rename to subprojects/robotpy-wpimath/semiwrap/ExtendedKalmanFilter.yml index 95338b699..7d3a63ee3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ExtendedKalmanFilter.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::ExtendedKalmanFilter: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml b/subprojects/robotpy-wpimath/semiwrap/ImplicitModelFollower.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml rename to subprojects/robotpy-wpimath/semiwrap/ImplicitModelFollower.yml index f1d240a3c..b09f00733 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ImplicitModelFollower.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::ImplicitModelFollower: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/KalmanFilter.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml rename to subprojects/robotpy-wpimath/semiwrap/KalmanFilter.yml index 94b780203..d363c948d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/KalmanFilter.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::KalmanFilter: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml b/subprojects/robotpy-wpimath/semiwrap/Kinematics.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml rename to subprojects/robotpy-wpimath/semiwrap/Kinematics.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml b/subprojects/robotpy-wpimath/semiwrap/LTVDifferentialDriveController.yml similarity index 93% rename from subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml rename to subprojects/robotpy-wpimath/semiwrap/LTVDifferentialDriveController.yml index 5b63d020f..2041b92da 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LTVDifferentialDriveController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::LTVDifferentialDriveController: methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml b/subprojects/robotpy-wpimath/semiwrap/LTVUnicycleController.yml similarity index 94% rename from subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml rename to subprojects/robotpy-wpimath/semiwrap/LTVUnicycleController.yml index 0c94264d0..050581159 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LTVUnicycleController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::LTVUnicycleController: methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml b/subprojects/robotpy-wpimath/semiwrap/LinearFilter.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearFilter.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/LinearPlantInversionFeedforward.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearPlantInversionFeedforward.yml index 4e6743d34..f56fae754 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LinearPlantInversionFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::LinearPlantInversionFeedforward: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml b/subprojects/robotpy-wpimath/semiwrap/LinearQuadraticRegulator.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearQuadraticRegulator.yml index 025b5c0cf..835d06fe7 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LinearQuadraticRegulator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::LinearQuadraticRegulator: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml b/subprojects/robotpy-wpimath/semiwrap/LinearSystem.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearSystem.yml index 52ccfd459..242381ba4 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LinearSystem.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: system - classes: wpi::math::LinearSystem: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml b/subprojects/robotpy-wpimath/semiwrap/LinearSystemId.yml similarity index 99% rename from subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearSystemId.yml index 052bddddc..dd0674533 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LinearSystemId.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: plant - classes: wpi::math::LinearSystemId: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml b/subprojects/robotpy-wpimath/semiwrap/LinearSystemLoop.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml rename to subprojects/robotpy-wpimath/semiwrap/LinearSystemLoop.yml index 00a6897c8..55d53ab99 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml +++ b/subprojects/robotpy-wpimath/semiwrap/LinearSystemLoop.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: system - classes: wpi::math::LinearSystemLoop: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/MaxVelocityConstraint.yml similarity index 92% rename from subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/MaxVelocityConstraint.yml index b6a2c94f3..a75e63f0a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/MaxVelocityConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::MaxVelocityConstraint: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveKinematics.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveKinematics.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveKinematicsConstraint.yml similarity index 94% rename from subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveKinematicsConstraint.yml index acf677b0a..64249e3aa 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveKinematicsConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::MecanumDriveKinematicsConstraint: typealias: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveOdometry.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveOdometry.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveOdometry3d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveOdometry3d.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator.yml index 48c27ad85..3e6d0927a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::MecanumDrivePoseEstimator: force_no_trampoline: true diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator3d.yml similarity index 92% rename from subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator3d.yml index 66a08e5f3..84599fdc0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/MecanumDrivePoseEstimator3d.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - classes: wpi::math::MecanumDrivePoseEstimator3d: force_no_trampoline: true diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveWheelPositions.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveWheelPositions.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/MecanumDriveWheelSpeeds.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml rename to subprojects/robotpy-wpimath/semiwrap/MecanumDriveWheelSpeeds.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml b/subprojects/robotpy-wpimath/semiwrap/MedianFilter.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml rename to subprojects/robotpy-wpimath/semiwrap/MedianFilter.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml b/subprojects/robotpy-wpimath/semiwrap/Odometry.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml rename to subprojects/robotpy-wpimath/semiwrap/Odometry.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/Odometry3d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Odometry3d.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml b/subprojects/robotpy-wpimath/semiwrap/PIDController.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml rename to subprojects/robotpy-wpimath/semiwrap/PIDController.yml index 00b2b07bc..cb1f7e1cb 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/PIDController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - classes: wpi::math::PIDController: ignored_bases: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml b/subprojects/robotpy-wpimath/semiwrap/Pose2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Pose2d.yml index 2cc1c8ecf..0f4d9bb93 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Pose2d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h functions: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml b/subprojects/robotpy-wpimath/semiwrap/Pose3d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Pose3d.yml index 93f6755ba..e4491d520 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Pose3d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h functions: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/PoseEstimator.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml rename to subprojects/robotpy-wpimath/semiwrap/PoseEstimator.yml index 5e95d1dde..a1e8b1b03 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/PoseEstimator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - extra_includes: - wpi/math/kinematics/DifferentialDriveWheelPositions.hpp - wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/PoseEstimator3d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml rename to subprojects/robotpy-wpimath/semiwrap/PoseEstimator3d.yml index 69cd62b6e..a4945b030 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/PoseEstimator3d.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - extra_includes: - wpi/math/kinematics/DifferentialDriveWheelPositions.hpp - wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml b/subprojects/robotpy-wpimath/semiwrap/ProfiledPIDController.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml rename to subprojects/robotpy-wpimath/semiwrap/ProfiledPIDController.yml index f814482a9..dc60a8c0d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/ProfiledPIDController.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - functions: IncrementAndGetProfiledPIDControllerInstances: ignore: true diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml b/subprojects/robotpy-wpimath/semiwrap/Quaternion.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml rename to subprojects/robotpy-wpimath/semiwrap/Quaternion.yml index 717305bc0..71c2be418 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Quaternion.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h functions: diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml b/subprojects/robotpy-wpimath/semiwrap/QuinticHermiteSpline.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml rename to subprojects/robotpy-wpimath/semiwrap/QuinticHermiteSpline.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml b/subprojects/robotpy-wpimath/semiwrap/Rectangle2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Rectangle2d.yml index f02d69100..c28893fad 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Rectangle2d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h classes: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/RectangularRegionConstraint.yml similarity index 94% rename from subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/RectangularRegionConstraint.yml index 6aec5b893..b33b453aa 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/RectangularRegionConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - extra_includes: - PyTrajectoryConstraint.h diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml b/subprojects/robotpy-wpimath/semiwrap/Rotation2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Rotation2d.yml index 51c9489d5..23f1ab22e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Rotation2d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h functions: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml b/subprojects/robotpy-wpimath/semiwrap/Rotation3d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Rotation3d.yml index 8e2f469b1..8187011fe 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Rotation3d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h functions: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/SimpleMotorFeedforward.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml rename to subprojects/robotpy-wpimath/semiwrap/SimpleMotorFeedforward.yml index 2bab307c3..0431556c0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/SimpleMotorFeedforward.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: controller - extra_includes: - wpi/units/dimensionless.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml b/subprojects/robotpy-wpimath/semiwrap/SimulatedAnnealing.yml similarity index 88% rename from subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml rename to subprojects/robotpy-wpimath/semiwrap/SimulatedAnnealing.yml index eac432a10..20f4f3593 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml +++ b/subprojects/robotpy-wpimath/semiwrap/SimulatedAnnealing.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: optimization - extra_includes: - gilsafe_object.h diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml b/subprojects/robotpy-wpimath/semiwrap/SlewRateLimiter.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml rename to subprojects/robotpy-wpimath/semiwrap/SlewRateLimiter.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml b/subprojects/robotpy-wpimath/semiwrap/Spline.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml rename to subprojects/robotpy-wpimath/semiwrap/Spline.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml b/subprojects/robotpy-wpimath/semiwrap/SplineHelper.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml rename to subprojects/robotpy-wpimath/semiwrap/SplineHelper.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml b/subprojects/robotpy-wpimath/semiwrap/SplineParameterizer.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml rename to subprojects/robotpy-wpimath/semiwrap/SplineParameterizer.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDriveKinematics.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDriveKinematics.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDriveKinematicsConstraint.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDriveKinematicsConstraint.yml index 4f53b57a2..41a217029 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/SwerveDriveKinematicsConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::SwerveDriveKinematicsConstraint: template_params: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDriveOdometry.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDriveOdometry.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDriveOdometry3d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDriveOdometry3d.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator.yml index 05c75827e..956623de3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - extra_includes: - wpi/math/kinematics/SwerveModuleState.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator3d.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator3d.yml index d895537b3..d1a3c10f9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/SwerveDrivePoseEstimator3d.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: estimator - extra_includes: - wpi/math/kinematics/SwerveModuleState.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveModulePosition.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveModulePosition.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml b/subprojects/robotpy-wpimath/semiwrap/SwerveModuleState.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml rename to subprojects/robotpy-wpimath/semiwrap/SwerveModuleState.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml b/subprojects/robotpy-wpimath/semiwrap/TimeInterpolatableBuffer.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml rename to subprojects/robotpy-wpimath/semiwrap/TimeInterpolatableBuffer.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml b/subprojects/robotpy-wpimath/semiwrap/Trajectory.yml similarity index 96% rename from subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml rename to subprojects/robotpy-wpimath/semiwrap/Trajectory.yml index 30e2debe2..a69787116 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Trajectory.yml @@ -1,8 +1,5 @@ -defaults: - subpackage: trajectory - extra_includes: -- rpy/geometryToString.h +- geometryToString.h functions: to_json: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml b/subprojects/robotpy-wpimath/semiwrap/TrajectoryConfig.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml rename to subprojects/robotpy-wpimath/semiwrap/TrajectoryConfig.yml index 6622f8bf2..5cc5d6c95 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TrajectoryConfig.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: trajectory - extra_includes: - PyTrajectoryConstraint.h diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/TrajectoryConstraint.yml similarity index 97% rename from subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml rename to subprojects/robotpy-wpimath/semiwrap/TrajectoryConstraint.yml index e905595f8..a9a31fbbd 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TrajectoryConstraint.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: constraint - classes: wpi::math::TrajectoryConstraint: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml b/subprojects/robotpy-wpimath/semiwrap/TrajectoryGenerator.yml similarity index 95% rename from subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml rename to subprojects/robotpy-wpimath/semiwrap/TrajectoryGenerator.yml index 585af5ea6..4e2db0bd4 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TrajectoryGenerator.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: trajectory - extra_includes: - wpi/math/spline/CubicHermiteSpline.hpp - wpi/math/spline/QuinticHermiteSpline.hpp diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml b/subprojects/robotpy-wpimath/semiwrap/TrajectoryParameterizer.yml similarity index 82% rename from subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml rename to subprojects/robotpy-wpimath/semiwrap/TrajectoryParameterizer.yml index b102e527b..ccacb6634 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TrajectoryParameterizer.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: trajectory - classes: wpi::math::TrajectoryParameterizer: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml b/subprojects/robotpy-wpimath/semiwrap/Transform2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Transform2d.yml index ce14e4833..9a21a9d39 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Transform2d.yml @@ -1,6 +1,6 @@ extra_includes: - wpi/math/geometry/Pose2d.hpp -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h classes: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml b/subprojects/robotpy-wpimath/semiwrap/Transform3d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Transform3d.yml index d45d6d78d..453a32718 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Transform3d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h classes: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml b/subprojects/robotpy-wpimath/semiwrap/Translation2d.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Translation2d.yml index a00387586..1aea9d5a6 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Translation2d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h - pybind11/eigen.h diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml b/subprojects/robotpy-wpimath/semiwrap/Translation3d.yml similarity index 99% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Translation3d.yml index 6a1d8379e..408cefbed 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/Translation3d.yml @@ -1,5 +1,5 @@ extra_includes: -- rpy/geometryToString.h +- geometryToString.h - wpystruct.h - pybind11/eigen.h diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml b/subprojects/robotpy-wpimath/semiwrap/TrapezoidProfile.yml similarity index 98% rename from subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml rename to subprojects/robotpy-wpimath/semiwrap/TrapezoidProfile.yml index 8eea00a1a..7fff00fbc 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TrapezoidProfile.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: trajectory - classes: wpi::math::TrapezoidProfile: force_type_casters: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml b/subprojects/robotpy-wpimath/semiwrap/TravelingSalesman.yml similarity index 91% rename from subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml rename to subprojects/robotpy-wpimath/semiwrap/TravelingSalesman.yml index de8af84b2..261e0a320 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml +++ b/subprojects/robotpy-wpimath/semiwrap/TravelingSalesman.yml @@ -1,6 +1,3 @@ -defaults: - subpackage: path - classes: wpi::math::TravelingSalesman: methods: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml b/subprojects/robotpy-wpimath/semiwrap/Twist2d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml rename to subprojects/robotpy-wpimath/semiwrap/Twist2d.yml diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml b/subprojects/robotpy-wpimath/semiwrap/Twist3d.yml similarity index 100% rename from subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml rename to subprojects/robotpy-wpimath/semiwrap/Twist3d.yml diff --git a/subprojects/robotpy-wpimath/tests/geometry/test_rotation2d.py b/subprojects/robotpy-wpimath/tests/geometry/test_rotation2d.py index 8457d3877..eea63bf5f 100644 --- a/subprojects/robotpy-wpimath/tests/geometry/test_rotation2d.py +++ b/subprojects/robotpy-wpimath/tests/geometry/test_rotation2d.py @@ -3,7 +3,7 @@ import pytest -from wpimath.geometry import Rotation2d +from wpimath import Rotation2d @pytest.mark.parametrize( diff --git a/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py b/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py index 3b5fb1908..672129b65 100644 --- a/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py +++ b/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py @@ -1,7 +1,6 @@ import math -from wpimath.geometry import Rotation2d -from wpimath.kinematics import ChassisSpeeds +from wpimath import ChassisSpeeds def test_plus() -> None: diff --git a/subprojects/robotpy-wpimath/tests/kinematics/test_swerve.py b/subprojects/robotpy-wpimath/tests/kinematics/test_swerve.py index b431ff8b4..3f7af9bd8 100644 --- a/subprojects/robotpy-wpimath/tests/kinematics/test_swerve.py +++ b/subprojects/robotpy-wpimath/tests/kinematics/test_swerve.py @@ -1,7 +1,9 @@ import pytest -from wpimath.geometry import Pose2d, Rotation2d, Translation2d -from wpimath.kinematics import ( +from wpimath import ( + Pose2d, + Rotation2d, + Translation2d, ChassisSpeeds, SwerveDrive4Kinematics, SwerveDrive4Odometry, diff --git a/subprojects/robotpy-wpimath/tests/test_controller.py b/subprojects/robotpy-wpimath/tests/test_controller.py deleted file mode 100644 index 806897ca4..000000000 --- a/subprojects/robotpy-wpimath/tests/test_controller.py +++ /dev/null @@ -1,5 +0,0 @@ -import wpimath.controller - - -def test_todo(): - pass diff --git a/subprojects/robotpy-wpimath/tests/test_estimator.py b/subprojects/robotpy-wpimath/tests/test_estimator.py deleted file mode 100644 index cc040bb8f..000000000 --- a/subprojects/robotpy-wpimath/tests/test_estimator.py +++ /dev/null @@ -1,5 +0,0 @@ -import wpimath.estimator - - -def test_todo(): - pass diff --git a/subprojects/robotpy-wpimath/tests/test_interpolation.py b/subprojects/robotpy-wpimath/tests/test_interpolation.py index 8e8bd5547..276608d6a 100644 --- a/subprojects/robotpy-wpimath/tests/test_interpolation.py +++ b/subprojects/robotpy-wpimath/tests/test_interpolation.py @@ -1,7 +1,8 @@ import math -from wpimath.geometry import Pose2d, Rotation2d -from wpimath.interpolation import ( +from wpimath import ( + Pose2d, + Rotation2d, TimeInterpolatableFloatBuffer, TimeInterpolatablePose2dBuffer, TimeInterpolatableRotation2dBuffer, diff --git a/subprojects/robotpy-wpimath/tests/test_optimization_simulated_annealing.py b/subprojects/robotpy-wpimath/tests/test_optimization_simulated_annealing.py index 0adf39664..dc109a466 100644 --- a/subprojects/robotpy-wpimath/tests/test_optimization_simulated_annealing.py +++ b/subprojects/robotpy-wpimath/tests/test_optimization_simulated_annealing.py @@ -5,7 +5,7 @@ import math import random -from wpimath.optimization import SimulatedAnnealing +from wpimath import SimulatedAnnealing def clamp(v, minval, maxval): diff --git a/subprojects/robotpy-wpimath/tests/test_spline.py b/subprojects/robotpy-wpimath/tests/test_spline.py deleted file mode 100644 index d262b0d67..000000000 --- a/subprojects/robotpy-wpimath/tests/test_spline.py +++ /dev/null @@ -1,5 +0,0 @@ -import wpimath.spline - - -def test_todo(): - pass diff --git a/subprojects/robotpy-wpimath/tests/test_system.py b/subprojects/robotpy-wpimath/tests/test_system.py deleted file mode 100644 index 2fe2976a7..000000000 --- a/subprojects/robotpy-wpimath/tests/test_system.py +++ /dev/null @@ -1,6 +0,0 @@ -import wpimath.system -import wpimath.system.plant - - -def test_todo(): - pass diff --git a/subprojects/robotpy-wpimath/tests/test_trajectory.py b/subprojects/robotpy-wpimath/tests/test_trajectory.py index 1b16ab80b..c9c2f4e24 100644 --- a/subprojects/robotpy-wpimath/tests/test_trajectory.py +++ b/subprojects/robotpy-wpimath/tests/test_trajectory.py @@ -1,25 +1,22 @@ import math -from wpimath.geometry import ( +from wpimath import ( + CubicHermiteSpline, Ellipse2d, + EllipticalRegionConstraint, + MaxVelocityConstraint, Pose2d, Rectangle2d, + RectangularRegionConstraint, Rotation2d, - Transform2d, - Translation2d, -) -from wpimath.spline import CubicHermiteSpline, SplineHelper -from wpimath.trajectory import ( + SplineHelper, + TrajectoryConstraint, Trajectory, TrajectoryConfig, TrajectoryGenerator, TrajectoryParameterizer, -) -from wpimath.trajectory.constraint import ( - EllipticalRegionConstraint, - MaxVelocityConstraint, - RectangularRegionConstraint, - TrajectoryConstraint, + Transform2d, + Translation2d, ) diff --git a/subprojects/robotpy-wpimath/tests/test_trajectory_exponential_profile.py b/subprojects/robotpy-wpimath/tests/test_trajectory_exponential_profile.py index 0bb90cf15..3b63b79da 100644 --- a/subprojects/robotpy-wpimath/tests/test_trajectory_exponential_profile.py +++ b/subprojects/robotpy-wpimath/tests/test_trajectory_exponential_profile.py @@ -4,8 +4,7 @@ import pytest -from wpimath.controller import SimpleMotorFeedforwardMeters -from wpimath.trajectory import ExponentialProfileMeterVolts +from wpimath import ExponentialProfileMeterVolts, SimpleMotorFeedforwardMeters kDt = 0.01 feedforward = SimpleMotorFeedforwardMeters(0, 2.5629, 0.43277, kDt) diff --git a/subprojects/robotpy-wpimath/tests/test_trapezoid_profile.py b/subprojects/robotpy-wpimath/tests/test_trapezoid_profile.py index e28c55c95..8ad2b069e 100644 --- a/subprojects/robotpy-wpimath/tests/test_trapezoid_profile.py +++ b/subprojects/robotpy-wpimath/tests/test_trapezoid_profile.py @@ -1,10 +1,10 @@ import pytest -from wpimath import trajectory +import wpimath trapezoid_profile_types = [ - trajectory.TrapezoidProfile, - trajectory.TrapezoidProfileRadians, + wpimath.TrapezoidProfile, + wpimath.TrapezoidProfileRadians, ] diff --git a/subprojects/robotpy-wpimath/tests/trajectory/test_trapezoidal_profile.py b/subprojects/robotpy-wpimath/tests/trajectory/test_trapezoidal_profile.py index c77961135..6779e6963 100644 --- a/subprojects/robotpy-wpimath/tests/trajectory/test_trapezoidal_profile.py +++ b/subprojects/robotpy-wpimath/tests/trajectory/test_trapezoidal_profile.py @@ -5,7 +5,7 @@ import math -from wpimath.trajectory import TrapezoidProfile +from wpimath import TrapezoidProfile kDt = 0.01 # 10 ms diff --git a/subprojects/robotpy-wpimath/wpimath/__init__.py b/subprojects/robotpy-wpimath/wpimath/__init__.py index 84d08d352..9a37f1a8c 100644 --- a/subprojects/robotpy-wpimath/wpimath/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/__init__.py @@ -1,10 +1,182 @@ from . import _init__wpimath # noqa: F401 -# Needed for stubgen -from . import geometry - # autogenerated by 'semiwrap create-imports wpimath wpimath._wpimath' from ._wpimath import ( + ArmFeedforward, + BangBangController, + CentripetalAccelerationConstraint, + ChassisSpeeds, + ControlAffinePlantInversionFeedforward_1_1, + ControlAffinePlantInversionFeedforward_2_1, + ControlAffinePlantInversionFeedforward_2_2, + CoordinateAxis, + CoordinateSystem, + CubicHermiteSpline, + DCMotor, + Debouncer, + DifferentialDriveAccelerationLimiter, + DifferentialDriveFeedforward, + DifferentialDriveKinematics, + DifferentialDriveKinematicsBase, + DifferentialDriveKinematicsConstraint, + DifferentialDriveOdometry, + DifferentialDriveOdometry3d, + DifferentialDriveOdometry3dBase, + DifferentialDriveOdometryBase, + DifferentialDrivePoseEstimator, + DifferentialDrivePoseEstimator3d, + DifferentialDrivePoseEstimator3dBase, + DifferentialDrivePoseEstimatorBase, + DifferentialDriveVoltageConstraint, + DifferentialDriveWheelPositions, + DifferentialDriveWheelSpeeds, + DifferentialDriveWheelVoltages, + ElevatorFeedforward, + Ellipse2d, + EllipticalRegionConstraint, + ExponentialProfileMeterVolts, + ExtendedKalmanFilter_1_1_1, + ExtendedKalmanFilter_2_1_1, + ExtendedKalmanFilter_2_1_2, + ExtendedKalmanFilter_2_2_2, + ImplicitModelFollower_1_1, + ImplicitModelFollower_2_1, + ImplicitModelFollower_2_2, + KalmanFilter_1_1_1, + KalmanFilter_2_1_1, + KalmanFilter_2_1_2, + KalmanFilter_2_2_2, + KalmanFilter_3_2_3, + LTVDifferentialDriveController, + LTVUnicycleController, + LinearFilter, + LinearPlantInversionFeedforward_1_1, + LinearPlantInversionFeedforward_2_1, + LinearPlantInversionFeedforward_2_2, + LinearPlantInversionFeedforward_3_2, + LinearQuadraticRegulator_1_1, + LinearQuadraticRegulator_2_1, + LinearQuadraticRegulator_2_2, + LinearQuadraticRegulator_3_2, + LinearSystemId, + LinearSystemLoop_1_1_1, + LinearSystemLoop_2_1_1, + LinearSystemLoop_2_1_2, + LinearSystemLoop_2_2_2, + LinearSystemLoop_3_2_3, + LinearSystem_1_1_1, + LinearSystem_1_1_2, + LinearSystem_1_1_3, + LinearSystem_2_1_1, + LinearSystem_2_1_2, + LinearSystem_2_1_3, + LinearSystem_2_2_1, + LinearSystem_2_2_2, + LinearSystem_2_2_3, + LinearSystem_3_2_1, + LinearSystem_3_2_2, + LinearSystem_3_2_3, + MaxVelocityConstraint, + MecanumDriveKinematics, + MecanumDriveKinematicsBase, + MecanumDriveKinematicsConstraint, + MecanumDriveOdometry, + MecanumDriveOdometry3d, + MecanumDriveOdometry3dBase, + MecanumDriveOdometryBase, + MecanumDrivePoseEstimator, + MecanumDrivePoseEstimator3d, + MecanumDrivePoseEstimator3dBase, + MecanumDrivePoseEstimatorBase, + MecanumDriveWheelPositions, + MecanumDriveWheelSpeeds, + MedianFilter, + PIDController, + Pose2d, + Pose3d, + ProfiledPIDController, + ProfiledPIDControllerRadians, + Quaternion, + QuinticHermiteSpline, + Rectangle2d, + RectangularRegionConstraint, + Rotation2d, + Rotation3d, + SimpleMotorFeedforwardMeters, + SimpleMotorFeedforwardRadians, + SimulatedAnnealing, + SlewRateLimiter, + Spline3, + Spline5, + SplineHelper, + SplineParameterizer, + SwerveDrive2Kinematics, + SwerveDrive2KinematicsBase, + SwerveDrive2KinematicsConstraint, + SwerveDrive2Odometry, + SwerveDrive2Odometry3d, + SwerveDrive2Odometry3dBase, + SwerveDrive2OdometryBase, + SwerveDrive2PoseEstimator, + SwerveDrive2PoseEstimator3d, + SwerveDrive2PoseEstimator3dBase, + SwerveDrive2PoseEstimatorBase, + SwerveDrive3Kinematics, + SwerveDrive3KinematicsBase, + SwerveDrive3KinematicsConstraint, + SwerveDrive3Odometry, + SwerveDrive3Odometry3d, + SwerveDrive3Odometry3dBase, + SwerveDrive3OdometryBase, + SwerveDrive3PoseEstimator, + SwerveDrive3PoseEstimator3d, + SwerveDrive3PoseEstimator3dBase, + SwerveDrive3PoseEstimatorBase, + SwerveDrive4Kinematics, + SwerveDrive4KinematicsBase, + SwerveDrive4KinematicsConstraint, + SwerveDrive4Odometry, + SwerveDrive4Odometry3d, + SwerveDrive4Odometry3dBase, + SwerveDrive4OdometryBase, + SwerveDrive4PoseEstimator, + SwerveDrive4PoseEstimator3d, + SwerveDrive4PoseEstimator3dBase, + SwerveDrive4PoseEstimatorBase, + SwerveDrive6Kinematics, + SwerveDrive6KinematicsBase, + SwerveDrive6KinematicsConstraint, + SwerveDrive6Odometry, + SwerveDrive6Odometry3d, + SwerveDrive6Odometry3dBase, + SwerveDrive6OdometryBase, + SwerveDrive6PoseEstimator, + SwerveDrive6PoseEstimator3d, + SwerveDrive6PoseEstimator3dBase, + SwerveDrive6PoseEstimatorBase, + SwerveModulePosition, + SwerveModuleState, + TimeInterpolatableFloatBuffer, + TimeInterpolatablePose2dBuffer, + TimeInterpolatablePose3dBuffer, + TimeInterpolatableRotation2dBuffer, + TimeInterpolatableRotation3dBuffer, + TimeInterpolatableTranslation2dBuffer, + TimeInterpolatableTranslation3dBuffer, + Trajectory, + TrajectoryConfig, + TrajectoryConstraint, + TrajectoryGenerator, + TrajectoryParameterizer, + Transform2d, + Transform3d, + Translation2d, + Translation3d, + TrapezoidProfile, + TrapezoidProfileRadians, + TravelingSalesman, + Twist2d, + Twist3d, angleModulus, applyDeadband, inputModulus, @@ -13,6 +185,181 @@ ) __all__ = [ + "ArmFeedforward", + "BangBangController", + "CentripetalAccelerationConstraint", + "ChassisSpeeds", + "ControlAffinePlantInversionFeedforward_1_1", + "ControlAffinePlantInversionFeedforward_2_1", + "ControlAffinePlantInversionFeedforward_2_2", + "CoordinateAxis", + "CoordinateSystem", + "CubicHermiteSpline", + "DCMotor", + "Debouncer", + "DifferentialDriveAccelerationLimiter", + "DifferentialDriveFeedforward", + "DifferentialDriveKinematics", + "DifferentialDriveKinematicsBase", + "DifferentialDriveKinematicsConstraint", + "DifferentialDriveOdometry", + "DifferentialDriveOdometry3d", + "DifferentialDriveOdometry3dBase", + "DifferentialDriveOdometryBase", + "DifferentialDrivePoseEstimator", + "DifferentialDrivePoseEstimator3d", + "DifferentialDrivePoseEstimator3dBase", + "DifferentialDrivePoseEstimatorBase", + "DifferentialDriveVoltageConstraint", + "DifferentialDriveWheelPositions", + "DifferentialDriveWheelSpeeds", + "DifferentialDriveWheelVoltages", + "ElevatorFeedforward", + "Ellipse2d", + "EllipticalRegionConstraint", + "ExponentialProfileMeterVolts", + "ExtendedKalmanFilter_1_1_1", + "ExtendedKalmanFilter_2_1_1", + "ExtendedKalmanFilter_2_1_2", + "ExtendedKalmanFilter_2_2_2", + "ImplicitModelFollower_1_1", + "ImplicitModelFollower_2_1", + "ImplicitModelFollower_2_2", + "KalmanFilter_1_1_1", + "KalmanFilter_2_1_1", + "KalmanFilter_2_1_2", + "KalmanFilter_2_2_2", + "KalmanFilter_3_2_3", + "LTVDifferentialDriveController", + "LTVUnicycleController", + "LinearFilter", + "LinearPlantInversionFeedforward_1_1", + "LinearPlantInversionFeedforward_2_1", + "LinearPlantInversionFeedforward_2_2", + "LinearPlantInversionFeedforward_3_2", + "LinearQuadraticRegulator_1_1", + "LinearQuadraticRegulator_2_1", + "LinearQuadraticRegulator_2_2", + "LinearQuadraticRegulator_3_2", + "LinearSystemId", + "LinearSystemLoop_1_1_1", + "LinearSystemLoop_2_1_1", + "LinearSystemLoop_2_1_2", + "LinearSystemLoop_2_2_2", + "LinearSystemLoop_3_2_3", + "LinearSystem_1_1_1", + "LinearSystem_1_1_2", + "LinearSystem_1_1_3", + "LinearSystem_2_1_1", + "LinearSystem_2_1_2", + "LinearSystem_2_1_3", + "LinearSystem_2_2_1", + "LinearSystem_2_2_2", + "LinearSystem_2_2_3", + "LinearSystem_3_2_1", + "LinearSystem_3_2_2", + "LinearSystem_3_2_3", + "MaxVelocityConstraint", + "MecanumDriveKinematics", + "MecanumDriveKinematicsBase", + "MecanumDriveKinematicsConstraint", + "MecanumDriveOdometry", + "MecanumDriveOdometry3d", + "MecanumDriveOdometry3dBase", + "MecanumDriveOdometryBase", + "MecanumDrivePoseEstimator", + "MecanumDrivePoseEstimator3d", + "MecanumDrivePoseEstimator3dBase", + "MecanumDrivePoseEstimatorBase", + "MecanumDriveWheelPositions", + "MecanumDriveWheelSpeeds", + "MedianFilter", + "PIDController", + "Pose2d", + "Pose3d", + "ProfiledPIDController", + "ProfiledPIDControllerRadians", + "Quaternion", + "QuinticHermiteSpline", + "Rectangle2d", + "RectangularRegionConstraint", + "Rotation2d", + "Rotation3d", + "SimpleMotorFeedforwardMeters", + "SimpleMotorFeedforwardRadians", + "SimulatedAnnealing", + "SlewRateLimiter", + "Spline3", + "Spline5", + "SplineHelper", + "SplineParameterizer", + "SwerveDrive2Kinematics", + "SwerveDrive2KinematicsBase", + "SwerveDrive2KinematicsConstraint", + "SwerveDrive2Odometry", + "SwerveDrive2Odometry3d", + "SwerveDrive2Odometry3dBase", + "SwerveDrive2OdometryBase", + "SwerveDrive2PoseEstimator", + "SwerveDrive2PoseEstimator3d", + "SwerveDrive2PoseEstimator3dBase", + "SwerveDrive2PoseEstimatorBase", + "SwerveDrive3Kinematics", + "SwerveDrive3KinematicsBase", + "SwerveDrive3KinematicsConstraint", + "SwerveDrive3Odometry", + "SwerveDrive3Odometry3d", + "SwerveDrive3Odometry3dBase", + "SwerveDrive3OdometryBase", + "SwerveDrive3PoseEstimator", + "SwerveDrive3PoseEstimator3d", + "SwerveDrive3PoseEstimator3dBase", + "SwerveDrive3PoseEstimatorBase", + "SwerveDrive4Kinematics", + "SwerveDrive4KinematicsBase", + "SwerveDrive4KinematicsConstraint", + "SwerveDrive4Odometry", + "SwerveDrive4Odometry3d", + "SwerveDrive4Odometry3dBase", + "SwerveDrive4OdometryBase", + "SwerveDrive4PoseEstimator", + "SwerveDrive4PoseEstimator3d", + "SwerveDrive4PoseEstimator3dBase", + "SwerveDrive4PoseEstimatorBase", + "SwerveDrive6Kinematics", + "SwerveDrive6KinematicsBase", + "SwerveDrive6KinematicsConstraint", + "SwerveDrive6Odometry", + "SwerveDrive6Odometry3d", + "SwerveDrive6Odometry3dBase", + "SwerveDrive6OdometryBase", + "SwerveDrive6PoseEstimator", + "SwerveDrive6PoseEstimator3d", + "SwerveDrive6PoseEstimator3dBase", + "SwerveDrive6PoseEstimatorBase", + "SwerveModulePosition", + "SwerveModuleState", + "TimeInterpolatableFloatBuffer", + "TimeInterpolatablePose2dBuffer", + "TimeInterpolatablePose3dBuffer", + "TimeInterpolatableRotation2dBuffer", + "TimeInterpolatableRotation3dBuffer", + "TimeInterpolatableTranslation2dBuffer", + "TimeInterpolatableTranslation3dBuffer", + "Trajectory", + "TrajectoryConfig", + "TrajectoryConstraint", + "TrajectoryGenerator", + "TrajectoryParameterizer", + "Transform2d", + "Transform3d", + "Translation2d", + "Translation3d", + "TrapezoidProfile", + "TrapezoidProfileRadians", + "TravelingSalesman", + "Twist2d", + "Twist3d", "angleModulus", "applyDeadband", "inputModulus", diff --git a/subprojects/robotpy-wpimath/wpimath/_controls/__init__.py b/subprojects/robotpy-wpimath/wpimath/_controls/__init__.py deleted file mode 100644 index d3c258e60..000000000 --- a/subprojects/robotpy-wpimath/wpimath/_controls/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import _init__controls diff --git a/subprojects/robotpy-wpimath/wpimath/_controls/controls.cpp b/subprojects/robotpy-wpimath/wpimath/_controls/controls.cpp deleted file mode 100644 index 1c5864fe0..000000000 --- a/subprojects/robotpy-wpimath/wpimath/_controls/controls.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath._controls._controls.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h index e80ff7929..51712c0c9 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h @@ -31,7 +31,7 @@ namespace detail { template <> struct type_caster { using value_conv = make_caster>; - PYBIND11_TYPE_CASTER(wpi::math::PyTrajectoryConstraint, _("wpimath._controls._controls.constraint.TrajectoryConstraint")); + PYBIND11_TYPE_CASTER(wpi::math::PyTrajectoryConstraint, _("wpimath._wpimath.TrajectoryConstraint")); bool load(handle src, bool convert) { value_conv conv; diff --git a/subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/geometryToString.h similarity index 100% rename from subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h rename to subprojects/robotpy-wpimath/wpimath/_impl/src/geometryToString.h diff --git a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py b/subprojects/robotpy-wpimath/wpimath/controller/__init__.py deleted file mode 100644 index 842eab450..000000000 --- a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py +++ /dev/null @@ -1,60 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.controller wpimath._controls._controls.controller' -from .._controls._controls.controller import ( - ArmFeedforward, - BangBangController, - ControlAffinePlantInversionFeedforward_1_1, - ControlAffinePlantInversionFeedforward_2_1, - ControlAffinePlantInversionFeedforward_2_2, - DifferentialDriveAccelerationLimiter, - DifferentialDriveFeedforward, - DifferentialDriveWheelVoltages, - ElevatorFeedforward, - ImplicitModelFollower_1_1, - ImplicitModelFollower_2_1, - ImplicitModelFollower_2_2, - LTVDifferentialDriveController, - LTVUnicycleController, - LinearPlantInversionFeedforward_1_1, - LinearPlantInversionFeedforward_2_1, - LinearPlantInversionFeedforward_2_2, - LinearPlantInversionFeedforward_3_2, - LinearQuadraticRegulator_1_1, - LinearQuadraticRegulator_2_1, - LinearQuadraticRegulator_2_2, - LinearQuadraticRegulator_3_2, - PIDController, - ProfiledPIDController, - ProfiledPIDControllerRadians, - SimpleMotorFeedforwardMeters, - SimpleMotorFeedforwardRadians, -) - -__all__ = [ - "ArmFeedforward", - "BangBangController", - "ControlAffinePlantInversionFeedforward_1_1", - "ControlAffinePlantInversionFeedforward_2_1", - "ControlAffinePlantInversionFeedforward_2_2", - "DifferentialDriveAccelerationLimiter", - "DifferentialDriveFeedforward", - "DifferentialDriveWheelVoltages", - "ElevatorFeedforward", - "ImplicitModelFollower_1_1", - "ImplicitModelFollower_2_1", - "ImplicitModelFollower_2_2", - "LTVDifferentialDriveController", - "LTVUnicycleController", - "LinearPlantInversionFeedforward_1_1", - "LinearPlantInversionFeedforward_2_1", - "LinearPlantInversionFeedforward_2_2", - "LinearPlantInversionFeedforward_3_2", - "LinearQuadraticRegulator_1_1", - "LinearQuadraticRegulator_2_1", - "LinearQuadraticRegulator_2_2", - "LinearQuadraticRegulator_3_2", - "PIDController", - "ProfiledPIDController", - "ProfiledPIDControllerRadians", - "SimpleMotorFeedforwardMeters", - "SimpleMotorFeedforwardRadians", -] diff --git a/subprojects/robotpy-wpimath/wpimath/estimator/__init__.py b/subprojects/robotpy-wpimath/wpimath/estimator/__init__.py deleted file mode 100644 index dd9b3ca8e..000000000 --- a/subprojects/robotpy-wpimath/wpimath/estimator/__init__.py +++ /dev/null @@ -1,72 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.estimator wpimath._controls._controls.estimator' -from .._controls._controls.estimator import ( - DifferentialDrivePoseEstimator, - DifferentialDrivePoseEstimator3d, - DifferentialDrivePoseEstimator3dBase, - DifferentialDrivePoseEstimatorBase, - ExtendedKalmanFilter_1_1_1, - ExtendedKalmanFilter_2_1_1, - ExtendedKalmanFilter_2_1_2, - ExtendedKalmanFilter_2_2_2, - KalmanFilter_1_1_1, - KalmanFilter_2_1_1, - KalmanFilter_2_1_2, - KalmanFilter_2_2_2, - KalmanFilter_3_2_3, - MecanumDrivePoseEstimator, - MecanumDrivePoseEstimator3d, - MecanumDrivePoseEstimator3dBase, - MecanumDrivePoseEstimatorBase, - SwerveDrive2PoseEstimator, - SwerveDrive2PoseEstimator3d, - SwerveDrive2PoseEstimator3dBase, - SwerveDrive2PoseEstimatorBase, - SwerveDrive3PoseEstimator, - SwerveDrive3PoseEstimator3d, - SwerveDrive3PoseEstimator3dBase, - SwerveDrive3PoseEstimatorBase, - SwerveDrive4PoseEstimator, - SwerveDrive4PoseEstimator3d, - SwerveDrive4PoseEstimator3dBase, - SwerveDrive4PoseEstimatorBase, - SwerveDrive6PoseEstimator, - SwerveDrive6PoseEstimator3d, - SwerveDrive6PoseEstimator3dBase, - SwerveDrive6PoseEstimatorBase, -) - -__all__ = [ - "DifferentialDrivePoseEstimator", - "DifferentialDrivePoseEstimator3d", - "DifferentialDrivePoseEstimator3dBase", - "DifferentialDrivePoseEstimatorBase", - "ExtendedKalmanFilter_1_1_1", - "ExtendedKalmanFilter_2_1_1", - "ExtendedKalmanFilter_2_1_2", - "ExtendedKalmanFilter_2_2_2", - "KalmanFilter_1_1_1", - "KalmanFilter_2_1_1", - "KalmanFilter_2_1_2", - "KalmanFilter_2_2_2", - "KalmanFilter_3_2_3", - "MecanumDrivePoseEstimator", - "MecanumDrivePoseEstimator3d", - "MecanumDrivePoseEstimator3dBase", - "MecanumDrivePoseEstimatorBase", - "SwerveDrive2PoseEstimator", - "SwerveDrive2PoseEstimator3d", - "SwerveDrive2PoseEstimator3dBase", - "SwerveDrive2PoseEstimatorBase", - "SwerveDrive3PoseEstimator", - "SwerveDrive3PoseEstimator3d", - "SwerveDrive3PoseEstimator3dBase", - "SwerveDrive3PoseEstimatorBase", - "SwerveDrive4PoseEstimator", - "SwerveDrive4PoseEstimator3d", - "SwerveDrive4PoseEstimator3dBase", - "SwerveDrive4PoseEstimatorBase", - "SwerveDrive6PoseEstimator", - "SwerveDrive6PoseEstimator3d", - "SwerveDrive6PoseEstimator3dBase", - "SwerveDrive6PoseEstimatorBase", -] diff --git a/subprojects/robotpy-wpimath/wpimath/filter/__init__.py b/subprojects/robotpy-wpimath/wpimath/filter/__init__.py deleted file mode 100644 index c9386e49d..000000000 --- a/subprojects/robotpy-wpimath/wpimath/filter/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from . import _init__filter - -# autogenerated by 'semiwrap create-imports wpimath.filter wpimath.filter._filter' -from ._filter import Debouncer, LinearFilter, MedianFilter, SlewRateLimiter - -__all__ = ["Debouncer", "LinearFilter", "MedianFilter", "SlewRateLimiter"] diff --git a/subprojects/robotpy-wpimath/wpimath/filter/filter.cpp b/subprojects/robotpy-wpimath/wpimath/filter/filter.cpp deleted file mode 100644 index 1f541d1e9..000000000 --- a/subprojects/robotpy-wpimath/wpimath/filter/filter.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath.filter._filter.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/geometry/__init__.py b/subprojects/robotpy-wpimath/wpimath/geometry/__init__.py deleted file mode 100644 index a6f3e5970..000000000 --- a/subprojects/robotpy-wpimath/wpimath/geometry/__init__.py +++ /dev/null @@ -1,38 +0,0 @@ -from . import _init__geometry - -# autogenerated by 'semiwrap create-imports wpimath.geometry wpimath.geometry._geometry' -from ._geometry import ( - CoordinateAxis, - CoordinateSystem, - Ellipse2d, - Pose2d, - Pose3d, - Quaternion, - Rectangle2d, - Rotation2d, - Rotation3d, - Transform2d, - Transform3d, - Translation2d, - Translation3d, - Twist2d, - Twist3d, -) - -__all__ = [ - "CoordinateAxis", - "CoordinateSystem", - "Ellipse2d", - "Pose2d", - "Pose3d", - "Quaternion", - "Rectangle2d", - "Rotation2d", - "Rotation3d", - "Transform2d", - "Transform3d", - "Translation2d", - "Translation3d", - "Twist2d", - "Twist3d", -] diff --git a/subprojects/robotpy-wpimath/wpimath/geometry/geometry.cpp b/subprojects/robotpy-wpimath/wpimath/geometry/geometry.cpp deleted file mode 100644 index 3ae0f5430..000000000 --- a/subprojects/robotpy-wpimath/wpimath/geometry/geometry.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath.geometry._geometry.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py b/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py deleted file mode 100644 index 8cdd3d6c4..000000000 --- a/subprojects/robotpy-wpimath/wpimath/interpolation/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -from . import _init__interpolation # noqa: F401 - -# autogenerated by 'semiwrap create-imports wpimath.interpolation wpimath.interpolation._interpolation' -from ._interpolation import ( - TimeInterpolatableFloatBuffer, - TimeInterpolatablePose2dBuffer, - TimeInterpolatablePose3dBuffer, - TimeInterpolatableRotation2dBuffer, - TimeInterpolatableRotation3dBuffer, - TimeInterpolatableTranslation2dBuffer, - TimeInterpolatableTranslation3dBuffer, -) - -__all__ = [ - "TimeInterpolatableFloatBuffer", - "TimeInterpolatablePose2dBuffer", - "TimeInterpolatablePose3dBuffer", - "TimeInterpolatableRotation2dBuffer", - "TimeInterpolatableRotation3dBuffer", - "TimeInterpolatableTranslation2dBuffer", - "TimeInterpolatableTranslation3dBuffer", -] diff --git a/subprojects/robotpy-wpimath/wpimath/interpolation/interpolation.cpp b/subprojects/robotpy-wpimath/wpimath/interpolation/interpolation.cpp deleted file mode 100644 index d7e3226cc..000000000 --- a/subprojects/robotpy-wpimath/wpimath/interpolation/interpolation.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath.interpolation._interpolation.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py b/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py deleted file mode 100644 index f2c7f29aa..000000000 --- a/subprojects/robotpy-wpimath/wpimath/kinematics/__init__.py +++ /dev/null @@ -1,94 +0,0 @@ -from . import _init__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, -) - -__all__ = [ - "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", -] diff --git a/subprojects/robotpy-wpimath/wpimath/kinematics/kinematics.cpp b/subprojects/robotpy-wpimath/wpimath/kinematics/kinematics.cpp deleted file mode 100644 index 6b35ec1de..000000000 --- a/subprojects/robotpy-wpimath/wpimath/kinematics/kinematics.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath.kinematics._kinematics.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/optimization/__init__.py b/subprojects/robotpy-wpimath/wpimath/optimization/__init__.py deleted file mode 100644 index 8f7a6c650..000000000 --- a/subprojects/robotpy-wpimath/wpimath/optimization/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.optimization wpimath._controls._controls.optimization' -from .._controls._controls.optimization import SimulatedAnnealing - -__all__ = ["SimulatedAnnealing"] diff --git a/subprojects/robotpy-wpimath/wpimath/path/__init__.py b/subprojects/robotpy-wpimath/wpimath/path/__init__.py deleted file mode 100644 index 8e82c2640..000000000 --- a/subprojects/robotpy-wpimath/wpimath/path/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.path wpimath._controls._controls.path' -from .._controls._controls.path import TravelingSalesman - -__all__ = ["TravelingSalesman"] diff --git a/subprojects/robotpy-wpimath/wpimath/spline/__init__.py b/subprojects/robotpy-wpimath/wpimath/spline/__init__.py deleted file mode 100644 index 37f1a65ec..000000000 --- a/subprojects/robotpy-wpimath/wpimath/spline/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -from . import _init__spline - -# autogenerated by 'semiwrap create-imports wpimath.spline wpimath.spline._spline' -from ._spline import ( - CubicHermiteSpline, - QuinticHermiteSpline, - Spline3, - Spline5, - SplineHelper, - SplineParameterizer, -) - -__all__ = [ - "CubicHermiteSpline", - "QuinticHermiteSpline", - "Spline3", - "Spline5", - "SplineHelper", - "SplineParameterizer", -] diff --git a/subprojects/robotpy-wpimath/wpimath/spline/spline.cpp b/subprojects/robotpy-wpimath/wpimath/spline/spline.cpp deleted file mode 100644 index b3cd6d33a..000000000 --- a/subprojects/robotpy-wpimath/wpimath/spline/spline.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "semiwrap_init.wpimath.spline._spline.hpp" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); -} diff --git a/subprojects/robotpy-wpimath/wpimath/system/__init__.py b/subprojects/robotpy-wpimath/wpimath/system/__init__.py deleted file mode 100644 index 500033b15..000000000 --- a/subprojects/robotpy-wpimath/wpimath/system/__init__.py +++ /dev/null @@ -1,40 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.system wpimath._controls._controls.system' -from .._controls._controls.system import ( - LinearSystemLoop_1_1_1, - LinearSystemLoop_2_1_1, - LinearSystemLoop_2_1_2, - LinearSystemLoop_2_2_2, - LinearSystemLoop_3_2_3, - LinearSystem_1_1_1, - LinearSystem_1_1_2, - LinearSystem_1_1_3, - LinearSystem_2_1_1, - LinearSystem_2_1_2, - LinearSystem_2_1_3, - LinearSystem_2_2_1, - LinearSystem_2_2_2, - LinearSystem_2_2_3, - LinearSystem_3_2_1, - LinearSystem_3_2_2, - LinearSystem_3_2_3, -) - -__all__ = [ - "LinearSystemLoop_1_1_1", - "LinearSystemLoop_2_1_1", - "LinearSystemLoop_2_1_2", - "LinearSystemLoop_2_2_2", - "LinearSystemLoop_3_2_3", - "LinearSystem_1_1_1", - "LinearSystem_1_1_2", - "LinearSystem_1_1_3", - "LinearSystem_2_1_1", - "LinearSystem_2_1_2", - "LinearSystem_2_1_3", - "LinearSystem_2_2_1", - "LinearSystem_2_2_2", - "LinearSystem_2_2_3", - "LinearSystem_3_2_1", - "LinearSystem_3_2_2", - "LinearSystem_3_2_3", -] diff --git a/subprojects/robotpy-wpimath/wpimath/system/plant/__init__.py b/subprojects/robotpy-wpimath/wpimath/system/plant/__init__.py deleted file mode 100644 index a509aa3ca..000000000 --- a/subprojects/robotpy-wpimath/wpimath/system/plant/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from ..._controls._controls.plant import DCMotor, LinearSystemId - -__all__ = ["DCMotor", "LinearSystemId"] diff --git a/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py b/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py deleted file mode 100644 index 6a0916bbb..000000000 --- a/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.trajectory wpimath._controls._controls.trajectory' -from .._controls._controls.trajectory import ( - ExponentialProfileMeterVolts, - Trajectory, - TrajectoryConfig, - TrajectoryGenerator, - TrajectoryParameterizer, - TrapezoidProfile, - TrapezoidProfileRadians, -) - -__all__ = [ - "ExponentialProfileMeterVolts", - "Trajectory", - "TrajectoryConfig", - "TrajectoryGenerator", - "TrajectoryParameterizer", - "TrapezoidProfile", - "TrapezoidProfileRadians", -] diff --git a/subprojects/robotpy-wpimath/wpimath/trajectory/constraint/__init__.py b/subprojects/robotpy-wpimath/wpimath/trajectory/constraint/__init__.py deleted file mode 100644 index 392ba9d8c..000000000 --- a/subprojects/robotpy-wpimath/wpimath/trajectory/constraint/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -# autogenerated by 'semiwrap create-imports wpimath.trajectory.constraint wpimath._controls._controls.constraint' -from ..._controls._controls.constraint import ( - CentripetalAccelerationConstraint, - DifferentialDriveKinematicsConstraint, - DifferentialDriveVoltageConstraint, - EllipticalRegionConstraint, - MaxVelocityConstraint, - MecanumDriveKinematicsConstraint, - RectangularRegionConstraint, - SwerveDrive2KinematicsConstraint, - SwerveDrive3KinematicsConstraint, - SwerveDrive4KinematicsConstraint, - SwerveDrive6KinematicsConstraint, - TrajectoryConstraint, -) - -__all__ = [ - "CentripetalAccelerationConstraint", - "DifferentialDriveKinematicsConstraint", - "DifferentialDriveVoltageConstraint", - "EllipticalRegionConstraint", - "MaxVelocityConstraint", - "MecanumDriveKinematicsConstraint", - "RectangularRegionConstraint", - "SwerveDrive2KinematicsConstraint", - "SwerveDrive3KinematicsConstraint", - "SwerveDrive4KinematicsConstraint", - "SwerveDrive6KinematicsConstraint", - "TrajectoryConstraint", -] diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index 6f7f6f5df..425b455bc 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -54,7 +54,7 @@ update_init = ["xrp"] [tool.semiwrap.extension_modules."xrp._xrp"] name = "xrp" wraps = ["robotpy-native-xrp"] -depends = ["wpilib", "wpimath_geometry"] +depends = ["wpilib", "wpimath"] [tool.semiwrap.extension_modules."xrp._xrp".headers] # frc/xrp diff --git a/subprojects/robotpy-xrp/xrp/xrp.pc b/subprojects/robotpy-xrp/xrp/xrp.pc index a1896bdc4..cf61cff01 100644 --- a/subprojects/robotpy-xrp/xrp/xrp.pc +++ b/subprojects/robotpy-xrp/xrp/xrp.pc @@ -6,4 +6,4 @@ Name: xrp Description: semiwrap pybind11 module Version: Cflags: -I${prefix} -Requires: robotpy-native-xrp wpilib wpimath_geometry +Requires: robotpy-native-xrp wpilib wpimath