From d956d88c65f32ccf7216658d8304dd5d48ab003f Mon Sep 17 00:00:00 2001 From: Default email Date: Sun, 9 Nov 2025 13:32:58 -0500 Subject: [PATCH 1/4] Project import generated by Copybara. GitOrigin-RevId: 892666fbbe8753167e91e1b02e8611173d365521 --- subprojects/pyntcore/README.md | 2 +- .../pyntcore/ntcore/src/NetworkTable.cpp.inl | 40 +- .../ntcore/src/NetworkTableEntry.cpp.inl | 40 +- .../pyntcore/ntcore/src/nt_instance.cpp | 14 +- subprojects/pyntcore/ntcore/src/nt_instance.h | 12 +- subprojects/pyntcore/ntcore/src/py2value.cpp | 46 +- subprojects/pyntcore/ntcore/src/py2value.h | 12 +- subprojects/pyntcore/ntcore/src/pyentry.cpp | 72 +- subprojects/pyntcore/ntcore/src/pyentry.h | 28 +- subprojects/pyntcore/pyproject.toml | 84 +- .../pyntcore/semiwrap/BooleanArrayTopic.yml | 16 +- .../pyntcore/semiwrap/BooleanTopic.yml | 8 +- .../pyntcore/semiwrap/DoubleArrayTopic.yml | 16 +- subprojects/pyntcore/semiwrap/DoubleTopic.yml | 8 +- .../pyntcore/semiwrap/FloatArrayTopic.yml | 16 +- subprojects/pyntcore/semiwrap/FloatTopic.yml | 8 +- .../pyntcore/semiwrap/GenericEntry.yml | 6 +- .../pyntcore/semiwrap/IntegerArrayTopic.yml | 16 +- .../pyntcore/semiwrap/IntegerTopic.yml | 8 +- .../pyntcore/semiwrap/MultiSubscriber.yml | 2 +- subprojects/pyntcore/semiwrap/NTSendable.yml | 6 +- .../pyntcore/semiwrap/NTSendableBuilder.yml | 4 +- .../pyntcore/semiwrap/NetworkTable.yml | 48 +- .../pyntcore/semiwrap/NetworkTableEntry.yml | 6 +- .../semiwrap/NetworkTableInstance.yml | 38 +- .../semiwrap/NetworkTableListener.yml | 4 +- .../pyntcore/semiwrap/NetworkTableValue.yml | 6 +- subprojects/pyntcore/semiwrap/RawTopic.yml | 16 +- .../pyntcore/semiwrap/StringArrayTopic.yml | 8 +- subprojects/pyntcore/semiwrap/StringTopic.yml | 16 +- .../pyntcore/semiwrap/StructArrayTopic.yml | 62 +- subprojects/pyntcore/semiwrap/StructTopic.yml | 62 +- subprojects/pyntcore/semiwrap/Topic.yml | 10 +- subprojects/pyntcore/semiwrap/ntcore_cpp.yml | 50 +- .../pyntcore/semiwrap/ntcore_cpp_types.yml | 28 +- subprojects/robotpy-apriltag/pyproject.toml | 32 +- .../robotpy-apriltag/semiwrap/AprilTag.yml | 2 +- .../semiwrap/AprilTagDetection.yml | 4 +- .../semiwrap/AprilTagDetector.yml | 8 +- .../semiwrap/AprilTagFieldLayout.yml | 6 +- .../semiwrap/AprilTagPoseEstimate.yml | 2 +- .../semiwrap/AprilTagPoseEstimator.yml | 8 +- subprojects/robotpy-hal/README.md | 2 +- .../hal/simulation/resethandles.cpp | 8 +- .../robotpy-hal/hal/simulation/sim_value_cb.h | 2 +- .../robotpy-hal/hal/src/ds_types_fmt.h | 2 +- subprojects/robotpy-hal/hal/src/hal.cpp | 6 +- subprojects/robotpy-hal/pyproject.toml | 198 +- .../robotpy-hal/semiwrap/DriverStation.yml | 3 +- .../semiwrap/DriverStationTypes.yml | 11 +- subprojects/robotpy-hal/semiwrap/HALBase.yml | 4 +- .../robotpy-hal/semiwrap/HandlesInternal.yml | 2 +- .../robotpy-hal/semiwrap/SimDevice.yml | 40 +- .../semiwrap/simulation/DriverStationData.yml | 15 +- .../semiwrap/simulation/RoboRioData.yml | 8 +- .../semiwrap/simulation/SimDeviceData.yml | 6 +- .../robotpy-native-apriltag/pyproject.toml | 12 +- .../robotpy-native-datalog/pyproject.toml | 8 +- .../robotpy-native-ntcore/pyproject.toml | 16 +- .../robotpy-native-romi/pyproject.toml | 8 +- .../robotpy-native-wpihal/pyproject.toml | 12 +- .../robotpy-native-wpilib/pyproject.toml | 24 +- .../robotpy-native-wpimath/pyproject.toml | 8 +- .../robotpy-native-wpinet/pyproject.toml | 8 +- .../robotpy-native-wpiutil/pyproject.toml | 4 +- subprojects/robotpy-native-xrp/pyproject.toml | 8 +- subprojects/robotpy-romi/pyproject.toml | 16 +- .../robotpy-romi/semiwrap/OnBoardIO.yml | 2 +- .../robotpy-romi/semiwrap/RomiGyro.yml | 2 +- .../robotpy-romi/semiwrap/RomiMotor.yml | 2 +- subprojects/robotpy-wpilib/README.md | 4 +- subprojects/robotpy-wpilib/pyproject.toml | 363 +-- .../robotpy-wpilib/semiwrap/ADXL345_I2C.yml | 10 +- .../semiwrap/AddressableLED.yml | 4 +- subprojects/robotpy-wpilib/semiwrap/Alert.yml | 8 +- .../semiwrap/AnalogAccelerometer.yml | 6 +- .../robotpy-wpilib/semiwrap/AnalogEncoder.yml | 8 +- .../robotpy-wpilib/semiwrap/AnalogInput.yml | 6 +- .../semiwrap/AnalogPotentiometer.yml | 6 +- subprojects/robotpy-wpilib/semiwrap/CAN.yml | 2 +- subprojects/robotpy-wpilib/semiwrap/Color.yml | 4 +- .../robotpy-wpilib/semiwrap/Color8Bit.yml | 6 +- .../robotpy-wpilib/semiwrap/Compressor.yml | 12 +- .../robotpy-wpilib/semiwrap/CounterBase.yml | 2 +- subprojects/robotpy-wpilib/semiwrap/DMC60.yml | 7 - .../robotpy-wpilib/semiwrap/DSControlWord.yml | 2 +- .../semiwrap/DataLogManager.yml | 4 +- .../robotpy-wpilib/semiwrap/DigitalInput.yml | 6 +- .../robotpy-wpilib/semiwrap/DigitalOutput.yml | 6 +- .../semiwrap/DoubleSolenoid.yml | 6 +- .../robotpy-wpilib/semiwrap/DriverStation.yml | 16 +- .../semiwrap/DriverStationModeThread.yml | 2 +- .../robotpy-wpilib/semiwrap/DutyCycle.yml | 6 +- .../semiwrap/DutyCycleEncoder.yml | 8 +- .../robotpy-wpilib/semiwrap/Encoder.yml | 12 +- .../robotpy-wpilib/semiwrap/Errors.yml | 2 +- .../robotpy-wpilib/semiwrap/ExpansionHub.yml | 16 + .../semiwrap/ExpansionHubMotor.yml | 20 + .../semiwrap/ExpansionHubPidConstants.yml | 7 + .../semiwrap/ExpansionHubServo.yml | 14 + .../robotpy-wpilib/semiwrap/Field2d.yml | 10 +- .../robotpy-wpilib/semiwrap/FieldObject2d.yml | 14 +- .../robotpy-wpilib/semiwrap/Gamepad.yml | 161 ++ .../robotpy-wpilib/semiwrap/GenericHID.yml | 16 +- subprojects/robotpy-wpilib/semiwrap/I2C.yml | 2 +- .../semiwrap/IterativeRobotBase.yml | 4 +- .../robotpy-wpilib/semiwrap/Jaguar.yml | 7 - .../robotpy-wpilib/semiwrap/Joystick.yml | 6 +- .../robotpy-wpilib/semiwrap/Koors40.yml | 2 +- .../robotpy-wpilib/semiwrap/LEDPattern.yml | 14 +- .../robotpy-wpilib/semiwrap/Mechanism2d.yml | 6 +- .../semiwrap/MechanismLigament2d.yml | 2 +- .../semiwrap/MechanismObject2d.yml | 12 +- .../semiwrap/MechanismRoot2d.yml | 12 +- .../semiwrap/MotorController.yml | 2 +- .../semiwrap/MotorControllerGroup.yml | 6 +- .../robotpy-wpilib/semiwrap/MotorSafety.yml | 4 +- .../robotpy-wpilib/semiwrap/Notifier.yml | 6 +- .../robotpy-wpilib/semiwrap/OnboardIMU.yml | 2 +- .../robotpy-wpilib/semiwrap/PS4Controller.yml | 12 +- .../robotpy-wpilib/semiwrap/PS5Controller.yml | 10 +- subprojects/robotpy-wpilib/semiwrap/PWM.yml | 10 +- .../semiwrap/PWMMotorController.yml | 6 +- .../robotpy-wpilib/semiwrap/PWMSparkFlex.yml | 2 +- .../robotpy-wpilib/semiwrap/PWMSparkMax.yml | 4 +- .../robotpy-wpilib/semiwrap/PWMTalonFX.yml | 4 +- .../robotpy-wpilib/semiwrap/PWMTalonSRX.yml | 4 +- .../robotpy-wpilib/semiwrap/PWMVenom.yml | 4 +- .../robotpy-wpilib/semiwrap/PWMVictorSPX.yml | 4 +- .../robotpy-wpilib/semiwrap/PneumaticHub.yml | 16 +- .../semiwrap/PneumaticsBase.yml | 10 +- .../semiwrap/PneumaticsControlModule.yml | 10 +- .../semiwrap/PowerDistribution.yml | 12 +- .../robotpy-wpilib/semiwrap/Preferences.yml | 2 +- .../robotpy-wpilib/semiwrap/RobotBase.yml | 4 +- .../semiwrap/RobotController.yml | 4 +- .../robotpy-wpilib/semiwrap/RobotState.yml | 2 +- subprojects/robotpy-wpilib/semiwrap/SD540.yml | 7 - .../semiwrap/SendableBuilderImpl.yml | 2 +- .../semiwrap/SendableChooser.yml | 8 +- .../semiwrap/SendableChooserBase.yml | 6 +- .../robotpy-wpilib/semiwrap/SensorUtil.yml | 2 +- .../robotpy-wpilib/semiwrap/SerialPort.yml | 14 +- .../robotpy-wpilib/semiwrap/SharpIR.yml | 6 +- .../semiwrap/SmartDashboard.yml | 64 +- .../robotpy-wpilib/semiwrap/Solenoid.yml | 6 +- subprojects/robotpy-wpilib/semiwrap/Spark.yml | 4 +- .../robotpy-wpilib/semiwrap/SparkMini.yml | 2 +- .../semiwrap/StadiaController.yml | 10 +- .../semiwrap/SysIdRoutineLog.yml | 16 +- .../robotpy-wpilib/semiwrap/SystemServer.yml | 2 +- subprojects/robotpy-wpilib/semiwrap/Talon.yml | 4 +- .../robotpy-wpilib/semiwrap/TimedRobot.yml | 7 +- subprojects/robotpy-wpilib/semiwrap/Timer.yml | 2 +- .../semiwrap/TimesliceRobot.yml | 2 +- .../robotpy-wpilib/semiwrap/Tracer.yml | 12 +- .../robotpy-wpilib/semiwrap/Victor.yml | 7 - .../robotpy-wpilib/semiwrap/VictorSP.yml | 4 +- .../robotpy-wpilib/semiwrap/Watchdog.yml | 8 +- .../semiwrap/XboxController.yml | 14 +- .../semiwrap/counter/Tachometer.yml | 4 +- .../semiwrap/counter/UpDownCounter.yml | 4 +- .../semiwrap/drive/DifferentialDrive.yml | 10 +- .../semiwrap/drive/MecanumDrive.yml | 16 +- .../semiwrap/drive/RobotDriveBase.yml | 6 +- .../semiwrap/event/BooleanEvent.yml | 2 +- .../semiwrap/event/EventLoop.yml | 2 +- .../semiwrap/event/NetworkBooleanEvent.yml | 20 +- .../semiwrap/simulation/ADXL345Sim.yml | 4 +- .../semiwrap/simulation/AddressableLEDSim.yml | 4 +- .../semiwrap/simulation/AnalogEncoderSim.yml | 4 +- .../semiwrap/simulation/AnalogInputSim.yml | 4 +- .../semiwrap/simulation/BatterySim.yml | 12 +- .../semiwrap/simulation/CTREPCMSim.yml | 6 +- .../semiwrap/simulation/CallbackStore.yml | 2 +- .../semiwrap/simulation/DCMotorSim.yml | 12 +- .../semiwrap/simulation/DIOSim.yml | 6 +- .../simulation/DifferentialDrivetrainSim.yml | 36 +- .../semiwrap/simulation/DigitalPWMSim.yml | 4 +- .../semiwrap/simulation/DoubleSolenoidSim.yml | 4 +- .../semiwrap/simulation/DriverStationSim.yml | 13 +- .../simulation/DutyCycleEncoderSim.yml | 4 +- .../semiwrap/simulation/DutyCycleSim.yml | 4 +- .../semiwrap/simulation/ElevatorSim.yml | 20 +- .../semiwrap/simulation/EncoderSim.yml | 4 +- .../semiwrap/simulation/FlywheelSim.yml | 10 +- .../semiwrap/simulation/GamepadSim.yml | 43 + .../semiwrap/simulation/GenericHIDSim.yml | 12 +- .../semiwrap/simulation/JoystickSim.yml | 4 +- .../semiwrap/simulation/LinearSystemSim.yml | 20 +- .../semiwrap/simulation/PS4ControllerSim.yml | 4 +- .../semiwrap/simulation/PS5ControllerSim.yml | 4 +- .../simulation/PWMMotorControllerSim.yml | 2 +- .../semiwrap/simulation/PWMSim.yml | 6 +- .../semiwrap/simulation/PneumaticsBaseSim.yml | 4 +- .../simulation/PowerDistributionSim.yml | 4 +- .../semiwrap/simulation/REVPHSim.yml | 6 +- .../semiwrap/simulation/RoboRioSim.yml | 2 +- .../simulation/SendableChooserSim.yml | 4 +- .../semiwrap/simulation/SharpIRSim.yml | 2 +- .../semiwrap/simulation/SimDeviceSim.yml | 6 +- .../simulation/SingleJointedArmSim.yml | 16 +- .../semiwrap/simulation/SolenoidSim.yml | 4 +- .../simulation/StadiaControllerSim.yml | 4 +- .../semiwrap/simulation/XboxControllerSim.yml | 6 +- subprojects/robotpy-wpilib/wpilib/__init__.py | 18 +- .../wpilib/simulation/__init__.py | 2 + .../wpilib/simulation/simulation.cpp | 14 +- .../wpilib/src/rpy/ControlWord.cpp | 2 +- .../wpilib/src/rpy/Filesystem.h | 2 +- .../wpilib/src/rpy/MotorControllerGroup.cpp | 12 +- .../wpilib/src/rpy/MotorControllerGroup.h | 20 +- .../wpilib/src/rpy/Notifier.cpp | 24 +- .../robotpy-wpilib/wpilib/src/rpy/Notifier.h | 20 +- .../wpilib/src/rpy/SmartDashboardData.cpp | 2 +- .../wpilib/src/rpy/SmartDashboardData.h | 4 +- subprojects/robotpy-wpilog/pyproject.toml | 26 +- .../semiwrap/DataLogBackgroundWriter.yml | 4 +- .../robotpy-wpilog/semiwrap/DataLogReader.yml | 6 +- .../robotpy-wpilog/semiwrap/DataLogWriter.yml | 6 +- subprojects/robotpy-wpimath/pyproject.toml | 2060 ++++++++--------- .../robotpy-wpimath/semiwrap/MathUtil.yml | 4 +- .../semiwrap/controls/ArmFeedforward.yml | 22 +- .../semiwrap/controls/BangBangController.yml | 4 +- .../CentripetalAccelerationConstraint.yml | 6 +- ...ControlAffinePlantInversionFeedforward.yml | 12 +- .../semiwrap/controls/DCMotor.yml | 11 +- .../DifferentialDriveAccelerationLimiter.yml | 7 +- .../controls/DifferentialDriveFeedforward.yml | 16 +- .../DifferentialDriveKinematicsConstraint.yml | 6 +- .../DifferentialDrivePoseEstimator.yml | 6 +- .../DifferentialDrivePoseEstimator3d.yml | 6 +- .../DifferentialDriveVoltageConstraint.yml | 4 +- .../DifferentialDriveWheelVoltages.yml | 6 +- .../semiwrap/controls/ElevatorFeedforward.yml | 16 +- .../controls/EllipticalRegionConstraint.yml | 14 +- .../semiwrap/controls/ExponentialProfile.yml | 20 +- .../controls/ExtendedKalmanFilter.yml | 14 +- .../controls/ImplicitModelFollower.yml | 14 +- .../semiwrap/controls/KalmanFilter.yml | 12 +- .../LTVDifferentialDriveController.yml | 6 +- .../controls/LTVUnicycleController.yml | 8 +- .../LinearPlantInversionFeedforward.yml | 14 +- .../controls/LinearQuadraticRegulator.yml | 24 +- .../semiwrap/controls/LinearSystem.yml | 26 +- .../semiwrap/controls/LinearSystemId.yml | 32 +- .../semiwrap/controls/LinearSystemLoop.yml | 18 +- .../controls/MaxVelocityConstraint.yml | 8 +- .../MecanumDriveKinematicsConstraint.yml | 10 +- .../controls/MecanumDrivePoseEstimator.yml | 4 +- .../controls/MecanumDrivePoseEstimator3d.yml | 4 +- .../semiwrap/controls/PIDController.yml | 4 +- .../semiwrap/controls/PoseEstimator.yml | 52 +- .../semiwrap/controls/PoseEstimator3d.yml | 52 +- .../controls/ProfiledPIDController.yml | 20 +- .../controls/RectangularRegionConstraint.yml | 8 +- .../controls/SimpleMotorFeedforward.yml | 38 +- .../semiwrap/controls/SimulatedAnnealing.yml | 4 +- .../SwerveDriveKinematicsConstraint.yml | 18 +- .../controls/SwerveDrivePoseEstimator.yml | 17 +- .../controls/SwerveDrivePoseEstimator3d.yml | 17 +- .../semiwrap/controls/Trajectory.yml | 22 +- .../semiwrap/controls/TrajectoryConfig.yml | 20 +- .../controls/TrajectoryConstraint.yml | 18 +- .../semiwrap/controls/TrajectoryGenerator.yml | 10 +- .../controls/TrajectoryParameterizer.yml | 6 +- .../semiwrap/controls/TrapezoidProfile.yml | 20 +- .../semiwrap/controls/TravelingSalesman.yml | 4 +- .../semiwrap/filter/Debouncer.yml | 4 +- .../semiwrap/filter/LinearFilter.yml | 4 +- .../semiwrap/filter/MedianFilter.yml | 4 +- .../semiwrap/filter/SlewRateLimiter.yml | 10 +- .../semiwrap/geometry/CoordinateAxis.yml | 2 +- .../semiwrap/geometry/CoordinateSystem.yml | 2 +- .../semiwrap/geometry/Ellipse2d.yml | 16 +- .../semiwrap/geometry/Pose2d.yml | 22 +- .../semiwrap/geometry/Pose3d.yml | 14 +- .../semiwrap/geometry/Quaternion.yml | 4 +- .../semiwrap/geometry/Rectangle2d.yml | 16 +- .../semiwrap/geometry/Rotation2d.yml | 12 +- .../semiwrap/geometry/Rotation3d.yml | 18 +- .../semiwrap/geometry/Transform2d.yml | 22 +- .../semiwrap/geometry/Transform3d.yml | 14 +- .../semiwrap/geometry/Translation2d.yml | 20 +- .../semiwrap/geometry/Translation3d.yml | 20 +- .../semiwrap/geometry/Twist2d.yml | 20 +- .../semiwrap/geometry/Twist3d.yml | 36 +- .../TimeInterpolatableBuffer.yml | 34 +- .../semiwrap/kinematics/ChassisSpeeds.yml | 26 +- .../DifferentialDriveKinematics.yml | 6 +- .../kinematics/DifferentialDriveOdometry.yml | 2 +- .../DifferentialDriveOdometry3d.yml | 2 +- .../DifferentialDriveWheelPositions.yml | 2 +- .../DifferentialDriveWheelSpeeds.yml | 16 +- .../semiwrap/kinematics/Kinematics.yml | 50 +- .../kinematics/MecanumDriveKinematics.yml | 4 +- .../kinematics/MecanumDriveOdometry.yml | 2 +- .../kinematics/MecanumDriveOdometry3d.yml | 2 +- .../kinematics/MecanumDriveWheelPositions.yml | 2 +- .../kinematics/MecanumDriveWheelSpeeds.yml | 32 +- .../semiwrap/kinematics/Odometry.yml | 48 +- .../semiwrap/kinematics/Odometry3d.yml | 48 +- .../kinematics/SwerveDriveKinematics.yml | 41 +- .../kinematics/SwerveDriveOdometry.yml | 10 +- .../kinematics/SwerveDriveOdometry3d.yml | 10 +- .../kinematics/SwerveModulePosition.yml | 12 +- .../semiwrap/kinematics/SwerveModuleState.yml | 12 +- .../semiwrap/spline/CubicHermiteSpline.yml | 2 +- .../semiwrap/spline/QuinticHermiteSpline.yml | 2 +- .../semiwrap/spline/Spline.yml | 16 +- .../semiwrap/spline/SplineHelper.yml | 2 +- .../semiwrap/spline/SplineParameterizer.yml | 6 +- .../tests/cpp/semiwrap/module.yml | 1 - .../tests/cpp/wpimath_test/__init__.py | 2 +- .../tests/cpp/wpimath_test/include/module.h | 24 +- .../tests/cpp/wpimath_test/src/module.cpp | 22 +- .../_impl/src/PyTrajectoryConstraint.h | 26 +- .../type_casters/_units_base_type_caster.h | 12 +- .../units_acceleration_type_caster.h | 14 +- .../type_casters/units_angle_type_caster.h | 46 +- .../units_angular_acceleration_type_caster.h | 14 +- .../units_angular_velocity_type_caster.h | 22 +- .../src/type_casters/units_area_type_caster.h | 30 +- .../units_capacitance_type_caster.h | 22 +- .../type_casters/units_charge_type_caster.h | 42 +- .../type_casters/units_compound_type_caster.h | 68 +- .../units_concentration_type_caster.h | 18 +- .../units_conductance_type_caster.h | 22 +- .../type_casters/units_current_type_caster.h | 22 +- .../units_data_transfer_rate_type_caster.h | 10 +- .../src/type_casters/units_data_type_caster.h | 10 +- .../type_casters/units_density_type_caster.h | 42 +- .../type_casters/units_energy_type_caster.h | 70 +- .../type_casters/units_force_type_caster.h | 38 +- .../units_frequency_type_caster.h | 22 +- .../units_illuminance_type_caster.h | 34 +- .../units_impedance_type_caster.h | 22 +- .../units_inductance_type_caster.h | 22 +- .../type_casters/units_length_type_caster.h | 94 +- .../units_luminous_flux_type_caster.h | 22 +- .../units_luminous_intensity_type_caster.h | 22 +- ...nits_magnetic_field_strength_type_caster.h | 26 +- .../units_magnetic_flux_type_caster.h | 26 +- .../src/type_casters/units_mass_type_caster.h | 54 +- .../src/type_casters/units_misc_type_caster.h | 10 +- .../units_moment_of_inertia_type_caster.h | 6 +- .../type_casters/units_power_type_caster.h | 26 +- .../type_casters/units_pressure_type_caster.h | 42 +- .../units_radiation_type_caster.h | 74 +- .../units_solid_angle_type_caster.h | 30 +- .../units_substance_type_caster.h | 6 +- .../units_temperature_type_caster.h | 22 +- .../src/type_casters/units_time_type_caster.h | 50 +- .../type_casters/units_torque_type_caster.h | 22 +- .../type_casters/units_velocity_type_caster.h | 22 +- .../type_casters/units_voltage_type_caster.h | 30 +- .../type_casters/units_volume_type_caster.h | 134 +- .../geometry/include/rpy/geometryToString.h | 38 +- subprojects/robotpy-wpinet/pyproject.toml | 14 +- .../robotpy-wpinet/semiwrap/PortForwarder.yml | 2 +- .../robotpy-wpinet/semiwrap/WebServer.yml | 2 +- subprojects/robotpy-wpiutil/pyproject.toml | 34 +- .../robotpy-wpiutil/semiwrap/Sendable.yml | 4 +- .../semiwrap/SendableBuilder.yml | 2 +- .../semiwrap/SendableRegistry.yml | 6 +- .../semiwrap/Synchronization.yml | 4 +- .../tests/cpp/wpiutil_test/module.cpp | 32 +- .../tests/cpp/wpiutil_test/sendable_test.cpp | 28 +- .../tests/cpp/wpiutil_test/struct_test.cpp | 20 +- .../robotpy-wpiutil/wpiutil/src/main.cpp | 6 +- .../wpiutil/src/safethread_gil.cpp | 4 +- .../wpiutil/src/stacktracehook.cpp | 10 +- .../src/type_casters/wpi_array_type_caster.h | 16 +- .../type_casters/wpi_ct_string_type_caster.h | 10 +- .../src/type_casters/wpi_json_type_caster.h | 20 +- .../type_casters/wpi_smallset_type_caster.h | 6 +- .../wpi_smallvector_type_caster.h | 6 +- .../wpi_smallvectorimpl_type_caster.h | 14 +- .../src/type_casters/wpi_span_type_caster.h | 4 +- .../src/type_casters/wpi_string_map_caster.h | 6 +- .../wpiutil/src/wpistruct/wpystruct.h | 28 +- .../wpiutil/src/wpistruct/wpystruct_fns.cpp | 32 +- subprojects/robotpy-xrp/pyproject.toml | 24 +- subprojects/robotpy-xrp/semiwrap/XRPGyro.yml | 2 +- subprojects/robotpy-xrp/semiwrap/XRPMotor.yml | 2 +- .../robotpy-xrp/semiwrap/XRPOnBoardIO.yml | 2 +- .../robotpy-xrp/semiwrap/XRPRangefinder.yml | 2 +- .../semiwrap/XRPReflectanceSensor.yml | 2 +- subprojects/robotpy-xrp/semiwrap/XRPServo.yml | 2 +- 389 files changed, 4236 insertions(+), 3977 deletions(-) delete mode 100644 subprojects/robotpy-wpilib/semiwrap/DMC60.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/ExpansionHub.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/ExpansionHubMotor.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/ExpansionHubPidConstants.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/ExpansionHubServo.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/Gamepad.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/Jaguar.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/SD540.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/Victor.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/simulation/GamepadSim.yml diff --git a/subprojects/pyntcore/README.md b/subprojects/pyntcore/README.md index f8ffdfce7..6c83bf570 100644 --- a/subprojects/pyntcore/README.md +++ b/subprojects/pyntcore/README.md @@ -1,4 +1,4 @@ pyntcore ======== -Python pybind11 wrappers around the C++ ntcore library. \ No newline at end of file +Python pybind11 wrappers around the C++ ntcore library. diff --git a/subprojects/pyntcore/ntcore/src/NetworkTable.cpp.inl b/subprojects/pyntcore/ntcore/src/NetworkTable.cpp.inl index 1c127232e..0d9ff95d1 100644 --- a/subprojects/pyntcore/ntcore/src/NetworkTable.cpp.inl +++ b/subprojects/pyntcore/ntcore/src/NetworkTable.cpp.inl @@ -1,6 +1,6 @@ cls_NetworkTable .def("getValue", [](const NetworkTable &self, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = self.GetEntry(key); @@ -9,48 +9,48 @@ cls_NetworkTable }, py::arg("key"), py::arg("value")) // double overload must come before boolean version - .def("putValue", [](nt::NetworkTable *self, std::string_view key, double value) { - return self->PutValue(key, nt::Value::MakeDouble(value)); + .def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, double value) { + return self->PutValue(key, wpi::nt::Value::MakeDouble(value)); }, py::arg("key"), py::arg("value"), release_gil()) - .def("putValue", [](nt::NetworkTable *self, std::string_view key, bool value) { - return self->PutValue(key, nt::Value::MakeBoolean(value)); + .def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, bool value) { + return self->PutValue(key, wpi::nt::Value::MakeBoolean(value)); }, py::arg("key"), py::arg("value"), release_gil()) - .def("putValue", [](nt::NetworkTable *self, std::string_view key, py::bytes value) { - auto v = nt::Value::MakeRaw(value.cast>()); + .def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::bytes value) { + auto v = wpi::nt::Value::MakeRaw(value.cast>()); py::gil_scoped_release release; return self->PutValue(key, v); }, py::arg("key"), py::arg("value")) - .def("putValue", [](nt::NetworkTable *self, std::string_view key, std::string value) { - return self->PutValue(key, nt::Value::MakeString(std::move(value))); + .def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, std::string value) { + return self->PutValue(key, wpi::nt::Value::MakeString(std::move(value))); }, py::arg("key"), py::arg("value"), release_gil()) - .def("putValue", [](nt::NetworkTable *self, std::string_view key, py::sequence value) { + .def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::sequence value) { auto v = pyntcore::py2ntvalue(value); py::gil_scoped_release release; return self->PutValue(key, v); }, py::arg("key"), py::arg("value")) // double overload must come before boolean version - .def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, double value) { - return self->SetDefaultValue(key, nt::Value::MakeDouble(value)); + .def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, double value) { + return self->SetDefaultValue(key, wpi::nt::Value::MakeDouble(value)); }, py::arg("key"), py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, bool value) { - return self->SetDefaultValue(key, nt::Value::MakeBoolean(value)); + .def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, bool value) { + return self->SetDefaultValue(key, wpi::nt::Value::MakeBoolean(value)); }, py::arg("key"), py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, py::bytes value) { - auto v = nt::Value::MakeRaw(value.cast>()); + .def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::bytes value) { + auto v = wpi::nt::Value::MakeRaw(value.cast>()); py::gil_scoped_release release; return self->SetDefaultValue(key, v); }, py::arg("key"), py::arg("value")) - .def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, std::string value) { - return self->SetDefaultValue(key, nt::Value::MakeString(std::move(value))); + .def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, std::string value) { + return self->SetDefaultValue(key, wpi::nt::Value::MakeString(std::move(value))); }, py::arg("key"), py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, py::sequence value) { + .def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::sequence value) { auto v = pyntcore::py2ntvalue(value); py::gil_scoped_release release; return self->SetDefaultValue(key, v); }, py::arg("key"), py::arg("value")) - .def("__contains__", [](const nt::NetworkTable &self, std::string_view key) -> bool { + .def("__contains__", [](const wpi::nt::NetworkTable &self, std::string_view key) -> bool { return self.ContainsKey(key); }, release_gil()) ; diff --git a/subprojects/pyntcore/ntcore/src/NetworkTableEntry.cpp.inl b/subprojects/pyntcore/ntcore/src/NetworkTableEntry.cpp.inl index a0e0e60a0..12ab7ab4f 100644 --- a/subprojects/pyntcore/ntcore/src/NetworkTableEntry.cpp.inl +++ b/subprojects/pyntcore/ntcore/src/NetworkTableEntry.cpp.inl @@ -1,6 +1,6 @@ cls_NetworkTableEntry - .def_property_readonly("value", [](const nt::NetworkTableEntry &self) { - nt::Value v; + .def_property_readonly("value", [](const wpi::nt::NetworkTableEntry &self) { + wpi::nt::Value v; { py::gil_scoped_release release; v = self.GetValue(); @@ -9,40 +9,40 @@ cls_NetworkTableEntry }) // double overload must come before boolean version - .def("setValue", [](nt::NetworkTableEntry *self, double value) { - return self->SetValue(nt::Value::MakeDouble(value)); + .def("setValue", [](wpi::nt::NetworkTableEntry *self, double value) { + return self->SetValue(wpi::nt::Value::MakeDouble(value)); }, py::arg("value"), release_gil()) - .def("setValue", [](nt::NetworkTableEntry *self, bool value) { - return self->SetValue(nt::Value::MakeBoolean(value)); + .def("setValue", [](wpi::nt::NetworkTableEntry *self, bool value) { + return self->SetValue(wpi::nt::Value::MakeBoolean(value)); }, py::arg("value"), release_gil()) - .def("setValue", [](nt::NetworkTableEntry *self, py::bytes value) { - auto v = nt::Value::MakeRaw(value.cast>()); + .def("setValue", [](wpi::nt::NetworkTableEntry *self, py::bytes value) { + auto v = wpi::nt::Value::MakeRaw(value.cast>()); py::gil_scoped_release release; return self->SetValue(v); }, py::arg("value")) - .def("setValue", [](nt::NetworkTableEntry *self, std::string value) { - return self->SetValue(nt::Value::MakeString(value)); + .def("setValue", [](wpi::nt::NetworkTableEntry *self, std::string value) { + return self->SetValue(wpi::nt::Value::MakeString(value)); }, py::arg("value"), release_gil()) - .def("setValue", [](nt::NetworkTableEntry *self, py::sequence value) { + .def("setValue", [](wpi::nt::NetworkTableEntry *self, py::sequence value) { return self->SetValue(pyntcore::py2ntvalue(value)); }, py::arg("value")) // double overload must come before boolean version - .def("setDefaultValue", [](nt::NetworkTableEntry *self, double value) { - return self->SetDefaultValue(nt::Value::MakeDouble(value)); + .def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, double value) { + return self->SetDefaultValue(wpi::nt::Value::MakeDouble(value)); }, py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTableEntry *self, bool value) { - return self->SetDefaultValue(nt::Value::MakeBoolean(value)); + .def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, bool value) { + return self->SetDefaultValue(wpi::nt::Value::MakeBoolean(value)); }, py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTableEntry *self, py::bytes value) { - auto v = nt::Value::MakeRaw(value.cast>()); + .def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, py::bytes value) { + auto v = wpi::nt::Value::MakeRaw(value.cast>()); py::gil_scoped_release release; return self->SetDefaultValue(v); }, py::arg("value")) - .def("setDefaultValue", [](nt::NetworkTableEntry *self, std::string value) { - return self->SetDefaultValue(nt::Value::MakeString(value)); + .def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, std::string value) { + return self->SetDefaultValue(wpi::nt::Value::MakeString(value)); }, py::arg("value"), release_gil()) - .def("setDefaultValue", [](nt::NetworkTableEntry *self, py::sequence value) { + .def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, py::sequence value) { return self->SetDefaultValue(pyntcore::py2ntvalue(value)); }, py::arg("value")) ; diff --git a/subprojects/pyntcore/ntcore/src/nt_instance.cpp b/subprojects/pyntcore/ntcore/src/nt_instance.cpp index 9924c44da..27eddf868 100644 --- a/subprojects/pyntcore/ntcore/src/nt_instance.cpp +++ b/subprojects/pyntcore/ntcore/src/nt_instance.cpp @@ -1,6 +1,6 @@ #include #include "nt_instance.h" -#include "ntcore_cpp.h" +#include "wpi/nt/ntcore_cpp.hpp" #include @@ -9,24 +9,24 @@ static std::set g_known_instances; namespace pyntcore { -void onInstanceStart(nt::NetworkTableInstance *instance) { +void onInstanceStart(wpi::nt::NetworkTableInstance *instance) { g_known_instances.emplace(instance->GetHandle()); py::module::import("ntcore._logutil") .attr("NtLogForwarder").attr("onInstanceStart")(instance); } -void onInstancePreReset(nt::NetworkTableInstance *instance) { +void onInstancePreReset(wpi::nt::NetworkTableInstance *instance) { py::module::import("ntcore._logutil") .attr("NtLogForwarder").attr("onInstanceDestroy")(instance); } -void onInstancePostReset(nt::NetworkTableInstance *instance) { +void onInstancePostReset(wpi::nt::NetworkTableInstance *instance) { py::module::import("ntcore.util") .attr("_NtProperty").attr("onInstancePostReset")(instance); } -void onInstanceDestroy(nt::NetworkTableInstance *instance) { +void onInstanceDestroy(wpi::nt::NetworkTableInstance *instance) { py::module::import("ntcore._logutil") .attr("NtLogForwarder").attr("onInstanceDestroy")(instance); py::module::import("ntcore.util") @@ -43,12 +43,12 @@ void resetAllInstances() known_instances.swap(g_known_instances); // always reset the default instance - known_instances.emplace(nt::GetDefaultInstance()); + known_instances.emplace(wpi::nt::GetDefaultInstance()); py::gil_scoped_release unlock; for (auto &inst: known_instances) { - nt::ResetInstance(inst); + wpi::nt::ResetInstance(inst); } } diff --git a/subprojects/pyntcore/ntcore/src/nt_instance.h b/subprojects/pyntcore/ntcore/src/nt_instance.h index 67b51da98..087d9b2e2 100644 --- a/subprojects/pyntcore/ntcore/src/nt_instance.h +++ b/subprojects/pyntcore/ntcore/src/nt_instance.h @@ -1,15 +1,15 @@ #pragma once -#include -#include +#include "wpi/nt/ntcore.h" +#include "wpi/nt/NetworkTableInstance.hpp" namespace pyntcore { -void onInstanceStart(nt::NetworkTableInstance *instance); -void onInstancePreReset(nt::NetworkTableInstance *instance); -void onInstancePostReset(nt::NetworkTableInstance *instance); -void onInstanceDestroy(nt::NetworkTableInstance *instance); +void onInstanceStart(wpi::nt::NetworkTableInstance *instance); +void onInstancePreReset(wpi::nt::NetworkTableInstance *instance); +void onInstancePostReset(wpi::nt::NetworkTableInstance *instance); +void onInstanceDestroy(wpi::nt::NetworkTableInstance *instance); void resetAllInstances(); diff --git a/subprojects/pyntcore/ntcore/src/py2value.cpp b/subprojects/pyntcore/ntcore/src/py2value.cpp index 0634c40f6..1dcb4a4bd 100644 --- a/subprojects/pyntcore/ntcore/src/py2value.cpp +++ b/subprojects/pyntcore/ntcore/src/py2value.cpp @@ -41,7 +41,7 @@ const char * nttype2str(NT_Type type) { } -py::object ntvalue2py(const nt::Value &ntvalue) { +py::object ntvalue2py(const wpi::nt::Value &ntvalue) { auto &v = ntvalue.value(); switch (v.type) { case NT_BOOLEAN: @@ -109,17 +109,17 @@ py::object ntvalue2py(const nt::Value &ntvalue) { } } -nt::Value py2ntvalue(py::handle h) { +wpi::nt::Value py2ntvalue(py::handle h) { if (py::isinstance(h)) { - return nt::Value::MakeBoolean(h.cast()); + return wpi::nt::Value::MakeBoolean(h.cast()); } else if (py::isinstance(h)) { - return nt::Value::MakeDouble(h.cast()); + return wpi::nt::Value::MakeDouble(h.cast()); } else if (py::isinstance(h)) { - return nt::Value::MakeInteger(h.cast()); + return wpi::nt::Value::MakeInteger(h.cast()); } else if (py::isinstance(h)) { - return nt::Value::MakeString(h.cast()); + return wpi::nt::Value::MakeString(h.cast()); } else if (py::isinstance(h)) { - return nt::Value::MakeRaw(h.cast>()); + return wpi::nt::Value::MakeRaw(h.cast>()); } else if (py::isinstance(h)) { throw py::value_error("Cannot put None into NetworkTable"); } @@ -132,45 +132,45 @@ nt::Value py2ntvalue(py::handle h) { auto i1 = seq[0]; if (py::isinstance(i1)) { auto v = h.cast>(); - return nt::Value::MakeBooleanArray(v); + return wpi::nt::Value::MakeBooleanArray(v); } else if (py::isinstance(i1)) { auto v = h.cast>(); - return nt::Value::MakeDoubleArray(v); + return wpi::nt::Value::MakeDoubleArray(v); } else if (py::isinstance(i1)) { auto v = h.cast>(); - return nt::Value::MakeIntegerArray(v); + return wpi::nt::Value::MakeIntegerArray(v); } else if (py::isinstance(i1)) { auto v = h.cast>(); - return nt::Value::MakeStringArray(v); + return wpi::nt::Value::MakeStringArray(v); } else { throw py::value_error("Can only put bool/int/float/str/bytes or lists/tuples of them"); } } -py::function valueFactoryByType(nt::NetworkTableType type) { +py::function valueFactoryByType(wpi::nt::NetworkTableType type) { py::object PyNtValue = py::module::import("ntcore").attr("Value"); switch (type) { - case nt::NetworkTableType::kBoolean: + case wpi::nt::NetworkTableType::kBoolean: return PyNtValue.attr("makeBoolean"); - case nt::NetworkTableType::kDouble: + case wpi::nt::NetworkTableType::kDouble: return PyNtValue.attr("makeDouble"); - case nt::NetworkTableType::kString: + case wpi::nt::NetworkTableType::kString: return PyNtValue.attr("makeString"); - case nt::NetworkTableType::kRaw: + case wpi::nt::NetworkTableType::kRaw: return PyNtValue.attr("makeRaw"); - case nt::NetworkTableType::kBooleanArray: + case wpi::nt::NetworkTableType::kBooleanArray: return PyNtValue.attr("makeBooleanArray"); - case nt::NetworkTableType::kDoubleArray: + case wpi::nt::NetworkTableType::kDoubleArray: return PyNtValue.attr("makeDoubleArray"); - case nt::NetworkTableType::kStringArray: + case wpi::nt::NetworkTableType::kStringArray: return PyNtValue.attr("makeStringArray"); - case nt::NetworkTableType::kInteger: + case wpi::nt::NetworkTableType::kInteger: return PyNtValue.attr("makeInteger"); - case nt::NetworkTableType::kFloat: + case wpi::nt::NetworkTableType::kFloat: return PyNtValue.attr("makeFloat"); - case nt::NetworkTableType::kIntegerArray: + case wpi::nt::NetworkTableType::kIntegerArray: return PyNtValue.attr("makeIntegerArray"); - case nt::NetworkTableType::kFloatArray: + case wpi::nt::NetworkTableType::kFloatArray: return PyNtValue.attr("makeFloatArray"); default: throw py::type_error("empty nt value"); diff --git a/subprojects/pyntcore/ntcore/src/py2value.h b/subprojects/pyntcore/ntcore/src/py2value.h index 410ba5a7c..53f144c73 100644 --- a/subprojects/pyntcore/ntcore/src/py2value.h +++ b/subprojects/pyntcore/ntcore/src/py2value.h @@ -1,20 +1,20 @@ #include -#include -#include +#include "wpi/nt/NetworkTableValue.hpp" +#include "wpi/nt/NetworkTableType.hpp" #include namespace pyntcore { const char * nttype2str(NT_Type type); -py::object ntvalue2py(const nt::Value &ntvalue); +py::object ntvalue2py(const wpi::nt::Value &ntvalue); -nt::Value py2ntvalue(py::handle h); +wpi::nt::Value py2ntvalue(py::handle h); -py::function valueFactoryByType(nt::NetworkTableType type); +py::function valueFactoryByType(wpi::nt::NetworkTableType type); -inline void ensure_value_is(NT_Type expected, nt::Value *v) { +inline void ensure_value_is(NT_Type expected, wpi::nt::Value *v) { if (v->type() != expected) { throw py::value_error(fmt::format( "Value type is {}, not {}", nttype2str(v->type()), nttype2str(expected) diff --git a/subprojects/pyntcore/ntcore/src/pyentry.cpp b/subprojects/pyntcore/ntcore/src/pyentry.cpp index f9cad5b33..c4147953f 100644 --- a/subprojects/pyntcore/ntcore/src/pyentry.cpp +++ b/subprojects/pyntcore/ntcore/src/pyentry.cpp @@ -7,73 +7,73 @@ namespace pyntcore { -py::object GetBooleanEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetBooleanEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_BOOLEAN) return defaultValue; return py::cast(value.GetBoolean()); } -py::object GetDoubleEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetDoubleEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_DOUBLE) return defaultValue; return py::cast(value.GetDouble()); } -py::object GetFloatEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetFloatEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_FLOAT) return defaultValue; return py::cast(value.GetFloat()); } -py::object GetIntegerEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetIntegerEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_INTEGER) return defaultValue; return py::cast(value.GetInteger()); } -py::object GetStringEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetStringEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_STRING) return defaultValue; auto s = value.GetString(); return py::str(s.data(), s.size()); } -py::object GetRawEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetRawEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_RAW) return defaultValue; return py::cast(value.GetRaw()); } -py::object GetBooleanArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetBooleanArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_BOOLEAN_ARRAY) return defaultValue; // ntcore will return bit vector by default. Convert to List[bool] @@ -86,52 +86,52 @@ py::object GetBooleanArrayEntry(const nt::NetworkTableEntry &entry, py::object d return std::move(l); } -py::object GetDoubleArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetDoubleArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_DOUBLE_ARRAY) return defaultValue; return py::cast(value.GetDoubleArray()); } -py::object GetFloatArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetFloatArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_FLOAT_ARRAY) return defaultValue; return py::cast(value.GetFloatArray()); } -py::object GetIntegerArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetIntegerArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_INTEGER_ARRAY) return defaultValue; return py::cast(value.GetIntegerArray()); } -py::object GetStringArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetStringArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_STRING_ARRAY) return defaultValue; std::span rval = value.GetStringArray(); return py::cast(rval); } -py::object GetValueEntry(const nt::NetworkTableEntry &entry, py::object defaultValue) { - nt::Value value; +py::object GetValueEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue) { + wpi::nt::Value value; { py::gil_scoped_release release; - value = nt::GetEntryValue(entry.GetHandle()); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value) return defaultValue; return ntvalue2py(value); diff --git a/subprojects/pyntcore/ntcore/src/pyentry.h b/subprojects/pyntcore/ntcore/src/pyentry.h index 8693ccfe7..9c2d71563 100644 --- a/subprojects/pyntcore/ntcore/src/pyentry.h +++ b/subprojects/pyntcore/ntcore/src/pyentry.h @@ -1,21 +1,21 @@ #include -#include -#include +#include "wpi/nt/NetworkTableEntry.hpp" +#include "wpi/nt/NetworkTableValue.hpp" namespace pyntcore { -py::object GetBooleanEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetDoubleEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetFloatEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetIntegerEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetStringEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetRawEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetBooleanArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetDoubleArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetFloatArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetIntegerArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetStringArrayEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); -py::object GetValueEntry(const nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetBooleanEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetDoubleEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetFloatEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetIntegerEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetStringEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetRawEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetBooleanArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetDoubleArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetFloatArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetIntegerArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetStringArrayEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); +py::object GetValueEntry(const wpi::nt::NetworkTableEntry &entry, py::object defaultValue); }; diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index 5c983bcb2..1401c7c14 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -5,26 +5,26 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-ntcore==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpinet==2027.0.0a3", - "robotpy-wpilog==2027.0.0a3", + "robotpy-native-ntcore==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpinet==0.0.0", + "robotpy-wpilog==0.0.0", ] [project] name = "pyntcore" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrappers for the FRC ntcore library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-ntcore==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpinet==2027.0.0a3", - "robotpy-wpilog==2027.0.0a3", + "robotpy-native-ntcore==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpinet==0.0.0", + "robotpy-wpilog==0.0.0", ] [project.urls] @@ -48,13 +48,13 @@ update_init = [ "ntcore.meta ntcore._ntcore.meta" ] scan_headers_ignore = [ - "networktables/ProtobufTopic.h", - "networktables/UnitTopic.h", + "wpi/nt/ProtobufTopic.hpp", + "wpi/nt/UnitTopic.hpp", - "ntcore.h", - "ntcore_c.h", - "ntcore_c_types.h", - "ntcore_test.h", + "wpi/nt/ntcore.h", + "wpi/nt/ntcore_c.h", + "wpi/nt/ntcore_c_types.h", + "wpi/nt/ntcore_test.hpp", "src/*", ] @@ -67,30 +67,30 @@ depends = ["wpiutil", "wpinet", "wpilog"] [tool.semiwrap.extension_modules."ntcore._ntcore".headers] # networktables -BooleanArrayTopic = "networktables/BooleanArrayTopic.h" -BooleanTopic = "networktables/BooleanTopic.h" -DoubleArrayTopic = "networktables/DoubleArrayTopic.h" -DoubleTopic = "networktables/DoubleTopic.h" -FloatArrayTopic = "networktables/FloatArrayTopic.h" -FloatTopic = "networktables/FloatTopic.h" -GenericEntry = "networktables/GenericEntry.h" -IntegerArrayTopic = "networktables/IntegerArrayTopic.h" -IntegerTopic = "networktables/IntegerTopic.h" -MultiSubscriber = "networktables/MultiSubscriber.h" -NTSendable = "networktables/NTSendable.h" -NTSendableBuilder = "networktables/NTSendableBuilder.h" -NetworkTable = "networktables/NetworkTable.h" -NetworkTableEntry = "networktables/NetworkTableEntry.h" -NetworkTableInstance = "networktables/NetworkTableInstance.h" -NetworkTableListener = "networktables/NetworkTableListener.h" -NetworkTableType = "networktables/NetworkTableType.h" -NetworkTableValue = "networktables/NetworkTableValue.h" -RawTopic = "networktables/RawTopic.h" -StructTopic = "networktables/StructTopic.h" -StructArrayTopic = "networktables/StructArrayTopic.h" -StringArrayTopic = "networktables/StringArrayTopic.h" -StringTopic = "networktables/StringTopic.h" -Topic = "networktables/Topic.h" - -ntcore_cpp = "ntcore_cpp.h" -ntcore_cpp_types = "ntcore_cpp_types.h" +BooleanArrayTopic = "wpi/nt/BooleanArrayTopic.hpp" +BooleanTopic = "wpi/nt/BooleanTopic.hpp" +DoubleArrayTopic = "wpi/nt/DoubleArrayTopic.hpp" +DoubleTopic = "wpi/nt/DoubleTopic.hpp" +FloatArrayTopic = "wpi/nt/FloatArrayTopic.hpp" +FloatTopic = "wpi/nt/FloatTopic.hpp" +GenericEntry = "wpi/nt/GenericEntry.hpp" +IntegerArrayTopic = "wpi/nt/IntegerArrayTopic.hpp" +IntegerTopic = "wpi/nt/IntegerTopic.hpp" +MultiSubscriber = "wpi/nt/MultiSubscriber.hpp" +NTSendable = "wpi/nt/NTSendable.hpp" +NTSendableBuilder = "wpi/nt/NTSendableBuilder.hpp" +NetworkTable = "wpi/nt/NetworkTable.hpp" +NetworkTableEntry = "wpi/nt/NetworkTableEntry.hpp" +NetworkTableInstance = "wpi/nt/NetworkTableInstance.hpp" +NetworkTableListener = "wpi/nt/NetworkTableListener.hpp" +NetworkTableType = "wpi/nt/NetworkTableType.hpp" +NetworkTableValue = "wpi/nt/NetworkTableValue.hpp" +RawTopic = "wpi/nt/RawTopic.hpp" +StructTopic = "wpi/nt/StructTopic.hpp" +StructArrayTopic = "wpi/nt/StructArrayTopic.hpp" +StringArrayTopic = "wpi/nt/StringArrayTopic.hpp" +StringTopic = "wpi/nt/StringTopic.hpp" +Topic = "wpi/nt/Topic.hpp" + +ntcore_cpp = "wpi/nt/ntcore_cpp.hpp" +ntcore_cpp_types = "wpi/nt/ntcore_cpp_types.hpp" diff --git a/subprojects/pyntcore/semiwrap/BooleanArrayTopic.yml b/subprojects/pyntcore/semiwrap/BooleanArrayTopic.yml index 0133c4ad7..e2d79b0bd 100644 --- a/subprojects/pyntcore/semiwrap/BooleanArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/BooleanArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::BooleanArraySubscriber: + wpi::nt::BooleanArraySubscriber: methods: BooleanArraySubscriber: overloads: @@ -11,17 +11,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -37,7 +37,7 @@ classes: py::gil_scoped_release release; *self = BooleanArraySubscriber(); }) - nt::BooleanArrayPublisher: + wpi::nt::BooleanArrayPublisher: methods: BooleanArrayPublisher: overloads: @@ -60,7 +60,7 @@ classes: py::gil_scoped_release release; *self = BooleanArrayPublisher(); }) - nt::BooleanArrayEntry: + wpi::nt::BooleanArrayEntry: methods: BooleanArrayEntry: overloads: @@ -84,7 +84,7 @@ classes: py::gil_scoped_release release; *self = BooleanArrayEntry(); }) - nt::BooleanArrayTopic: + wpi::nt::BooleanArrayTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/BooleanTopic.yml b/subprojects/pyntcore/semiwrap/BooleanTopic.yml index 8a4d3ddef..2de884de8 100644 --- a/subprojects/pyntcore/semiwrap/BooleanTopic.yml +++ b/subprojects/pyntcore/semiwrap/BooleanTopic.yml @@ -1,5 +1,5 @@ classes: - nt::BooleanSubscriber: + wpi::nt::BooleanSubscriber: methods: BooleanSubscriber: overloads: @@ -29,7 +29,7 @@ classes: py::gil_scoped_release release; *self = BooleanSubscriber(); }) - nt::BooleanPublisher: + wpi::nt::BooleanPublisher: methods: BooleanPublisher: overloads: @@ -52,7 +52,7 @@ classes: py::gil_scoped_release release; *self = BooleanPublisher(); }) - nt::BooleanEntry: + wpi::nt::BooleanEntry: methods: BooleanEntry: overloads: @@ -76,7 +76,7 @@ classes: py::gil_scoped_release release; *self = BooleanEntry(); }) - nt::BooleanTopic: + wpi::nt::BooleanTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/DoubleArrayTopic.yml b/subprojects/pyntcore/semiwrap/DoubleArrayTopic.yml index 52892083f..a72335071 100644 --- a/subprojects/pyntcore/semiwrap/DoubleArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/DoubleArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::DoubleArraySubscriber: + wpi::nt::DoubleArraySubscriber: methods: DoubleArraySubscriber: overloads: @@ -11,17 +11,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -37,7 +37,7 @@ classes: py::gil_scoped_release release; *self = DoubleArraySubscriber(); }) - nt::DoubleArrayPublisher: + wpi::nt::DoubleArrayPublisher: methods: DoubleArrayPublisher: overloads: @@ -60,7 +60,7 @@ classes: py::gil_scoped_release release; *self = DoubleArrayPublisher(); }) - nt::DoubleArrayEntry: + wpi::nt::DoubleArrayEntry: methods: DoubleArrayEntry: overloads: @@ -84,7 +84,7 @@ classes: py::gil_scoped_release release; *self = DoubleArrayEntry(); }) - nt::DoubleArrayTopic: + wpi::nt::DoubleArrayTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/DoubleTopic.yml b/subprojects/pyntcore/semiwrap/DoubleTopic.yml index de572d690..2a7bb47e7 100644 --- a/subprojects/pyntcore/semiwrap/DoubleTopic.yml +++ b/subprojects/pyntcore/semiwrap/DoubleTopic.yml @@ -1,5 +1,5 @@ classes: - nt::DoubleSubscriber: + wpi::nt::DoubleSubscriber: methods: DoubleSubscriber: overloads: @@ -29,7 +29,7 @@ classes: py::gil_scoped_release release; *self = DoubleSubscriber(); }) - nt::DoublePublisher: + wpi::nt::DoublePublisher: methods: DoublePublisher: overloads: @@ -52,7 +52,7 @@ classes: py::gil_scoped_release release; *self = DoublePublisher(); }) - nt::DoubleEntry: + wpi::nt::DoubleEntry: methods: DoubleEntry: overloads: @@ -76,7 +76,7 @@ classes: py::gil_scoped_release release; *self = DoubleEntry(); }) - nt::DoubleTopic: + wpi::nt::DoubleTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/FloatArrayTopic.yml b/subprojects/pyntcore/semiwrap/FloatArrayTopic.yml index a00b48bb9..7d4f3eec1 100644 --- a/subprojects/pyntcore/semiwrap/FloatArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/FloatArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::FloatArraySubscriber: + wpi::nt::FloatArraySubscriber: methods: FloatArraySubscriber: overloads: @@ -11,17 +11,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -37,7 +37,7 @@ classes: py::gil_scoped_release release; *self = FloatArraySubscriber(); }) - nt::FloatArrayPublisher: + wpi::nt::FloatArrayPublisher: methods: FloatArrayPublisher: overloads: @@ -60,7 +60,7 @@ classes: py::gil_scoped_release release; *self = FloatArrayPublisher(); }) - nt::FloatArrayEntry: + wpi::nt::FloatArrayEntry: methods: FloatArrayEntry: overloads: @@ -84,7 +84,7 @@ classes: py::gil_scoped_release release; *self = FloatArrayEntry(); }) - nt::FloatArrayTopic: + wpi::nt::FloatArrayTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/FloatTopic.yml b/subprojects/pyntcore/semiwrap/FloatTopic.yml index c0f3e192b..9d66609c0 100644 --- a/subprojects/pyntcore/semiwrap/FloatTopic.yml +++ b/subprojects/pyntcore/semiwrap/FloatTopic.yml @@ -1,5 +1,5 @@ classes: - nt::FloatSubscriber: + wpi::nt::FloatSubscriber: methods: FloatSubscriber: overloads: @@ -29,7 +29,7 @@ classes: py::gil_scoped_release release; *self = FloatSubscriber(); }) - nt::FloatPublisher: + wpi::nt::FloatPublisher: methods: FloatPublisher: overloads: @@ -52,7 +52,7 @@ classes: py::gil_scoped_release release; *self = FloatPublisher(); }) - nt::FloatEntry: + wpi::nt::FloatEntry: methods: FloatEntry: overloads: @@ -76,7 +76,7 @@ classes: py::gil_scoped_release release; *self = FloatEntry(); }) - nt::FloatTopic: + wpi::nt::FloatTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/GenericEntry.yml b/subprojects/pyntcore/semiwrap/GenericEntry.yml index 3b7335d5c..643c96637 100644 --- a/subprojects/pyntcore/semiwrap/GenericEntry.yml +++ b/subprojects/pyntcore/semiwrap/GenericEntry.yml @@ -2,7 +2,7 @@ extra_includes: - src/nt_type_caster.h classes: - nt::GenericSubscriber: + wpi::nt::GenericSubscriber: methods: GenericSubscriber: overloads: @@ -24,7 +24,7 @@ classes: GetStringArray: ReadQueue: GetTopic: - nt::GenericPublisher: + wpi::nt::GenericPublisher: methods: GenericPublisher: overloads: @@ -60,7 +60,7 @@ classes: SetDefaultDoubleArray: SetDefaultStringArray: GetTopic: - nt::GenericEntry: + wpi::nt::GenericEntry: methods: GenericEntry: overloads: diff --git a/subprojects/pyntcore/semiwrap/IntegerArrayTopic.yml b/subprojects/pyntcore/semiwrap/IntegerArrayTopic.yml index 2582c32de..9816cf3db 100644 --- a/subprojects/pyntcore/semiwrap/IntegerArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/IntegerArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::IntegerArraySubscriber: + wpi::nt::IntegerArraySubscriber: methods: IntegerArraySubscriber: overloads: @@ -11,17 +11,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -37,7 +37,7 @@ classes: py::gil_scoped_release release; *self = IntegerArraySubscriber(); }) - nt::IntegerArrayPublisher: + wpi::nt::IntegerArrayPublisher: methods: IntegerArrayPublisher: overloads: @@ -60,7 +60,7 @@ classes: py::gil_scoped_release release; *self = IntegerArrayPublisher(); }) - nt::IntegerArrayEntry: + wpi::nt::IntegerArrayEntry: methods: IntegerArrayEntry: overloads: @@ -84,7 +84,7 @@ classes: py::gil_scoped_release release; *self = IntegerArrayEntry(); }) - nt::IntegerArrayTopic: + wpi::nt::IntegerArrayTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/IntegerTopic.yml b/subprojects/pyntcore/semiwrap/IntegerTopic.yml index 07b6859cd..f39a7aa00 100644 --- a/subprojects/pyntcore/semiwrap/IntegerTopic.yml +++ b/subprojects/pyntcore/semiwrap/IntegerTopic.yml @@ -1,5 +1,5 @@ classes: - nt::IntegerSubscriber: + wpi::nt::IntegerSubscriber: methods: IntegerSubscriber: overloads: @@ -29,7 +29,7 @@ classes: py::gil_scoped_release release; *self = IntegerSubscriber(); }) - nt::IntegerPublisher: + wpi::nt::IntegerPublisher: methods: IntegerPublisher: overloads: @@ -52,7 +52,7 @@ classes: py::gil_scoped_release release; *self = IntegerPublisher(); }) - nt::IntegerEntry: + wpi::nt::IntegerEntry: methods: IntegerEntry: overloads: @@ -76,7 +76,7 @@ classes: py::gil_scoped_release release; *self = IntegerEntry(); }) - nt::IntegerTopic: + wpi::nt::IntegerTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/MultiSubscriber.yml b/subprojects/pyntcore/semiwrap/MultiSubscriber.yml index a980e9b5a..1c0dd4919 100644 --- a/subprojects/pyntcore/semiwrap/MultiSubscriber.yml +++ b/subprojects/pyntcore/semiwrap/MultiSubscriber.yml @@ -1,5 +1,5 @@ classes: - nt::MultiSubscriber: + wpi::nt::MultiSubscriber: methods: MultiSubscriber: overloads: diff --git a/subprojects/pyntcore/semiwrap/NTSendable.yml b/subprojects/pyntcore/semiwrap/NTSendable.yml index b105e6fa1..7ec37cc71 100644 --- a/subprojects/pyntcore/semiwrap/NTSendable.yml +++ b/subprojects/pyntcore/semiwrap/NTSendable.yml @@ -1,8 +1,8 @@ extra_includes: -- networktables/NTSendableBuilder.h +- wpi/nt/NTSendableBuilder.hpp classes: - nt::NTSendable: + wpi::nt::NTSendable: methods: InitSendable: overloads: @@ -12,7 +12,7 @@ classes: auto builderHandle = py::cast(builder, py::return_value_policy::reference); fn(builderHandle); } - wpi::SendableBuilder&: + wpi::util::SendableBuilder&: virtual_xform: | [&](py::function fn) { auto builderHandle = py::cast(builder, py::return_value_policy::reference); diff --git a/subprojects/pyntcore/semiwrap/NTSendableBuilder.yml b/subprojects/pyntcore/semiwrap/NTSendableBuilder.yml index afa178a30..ac842df6d 100644 --- a/subprojects/pyntcore/semiwrap/NTSendableBuilder.yml +++ b/subprojects/pyntcore/semiwrap/NTSendableBuilder.yml @@ -1,9 +1,9 @@ classes: - nt::NTSendableBuilder: + wpi::nt::NTSendableBuilder: force_type_casters: - std::function typealias: - - BackendKind = wpi::SendableBuilder::BackendKind + - BackendKind = wpi::util::SendableBuilder::BackendKind methods: SetUpdateTable: cpp_code: | diff --git a/subprojects/pyntcore/semiwrap/NetworkTable.yml b/subprojects/pyntcore/semiwrap/NetworkTable.yml index c940e475b..09f0649ca 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTable.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTable.yml @@ -1,25 +1,25 @@ extra_includes: -- networktables/BooleanArrayTopic.h -- networktables/BooleanTopic.h -- networktables/DoubleArrayTopic.h -- networktables/DoubleTopic.h -- networktables/FloatArrayTopic.h -- networktables/FloatTopic.h -- networktables/IntegerArrayTopic.h -- networktables/IntegerTopic.h -- networktables/NetworkTableInstance.h -- networktables/RawTopic.h -- networktables/StringArrayTopic.h -- networktables/StringTopic.h -- networktables/StructArrayTopic.h -- networktables/StructTopic.h -- networktables/Topic.h +- wpi/nt/BooleanArrayTopic.hpp +- wpi/nt/BooleanTopic.hpp +- wpi/nt/DoubleArrayTopic.hpp +- wpi/nt/DoubleTopic.hpp +- wpi/nt/FloatArrayTopic.hpp +- wpi/nt/FloatTopic.hpp +- wpi/nt/IntegerArrayTopic.hpp +- wpi/nt/IntegerTopic.hpp +- wpi/nt/NetworkTableInstance.hpp +- wpi/nt/RawTopic.hpp +- wpi/nt/StringArrayTopic.hpp +- wpi/nt/StringTopic.hpp +- wpi/nt/StructArrayTopic.hpp +- wpi/nt/StructTopic.hpp +- wpi/nt/Topic.hpp - src/py2value.h - src/pyentry.h - wpystruct.h classes: - nt::NetworkTable: + wpi::nt::NetworkTable: attributes: PATH_SEPARATOR_CHAR: methods: @@ -27,7 +27,7 @@ classes: NormalizeKey: overloads: std::string_view, bool: - std::string_view, wpi::SmallVectorImpl&, bool: + std::string_view, wpi::util::SmallVectorImpl&, bool: ignore: true GetHierarchy: NetworkTable: @@ -81,7 +81,7 @@ classes: GetNumber: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -93,7 +93,7 @@ classes: GetString: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -105,7 +105,7 @@ classes: GetBoolean: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -117,7 +117,7 @@ classes: GetBooleanArray: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -129,7 +129,7 @@ classes: GetNumberArray: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -141,7 +141,7 @@ classes: GetStringArray: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); @@ -153,7 +153,7 @@ classes: GetRaw: cpp_code: | [](NetworkTable * table, std::string_view key, py::object defaultValue) -> py::object { - nt::NetworkTableEntry entry; + wpi::nt::NetworkTableEntry entry; { py::gil_scoped_release release; entry = table->GetEntry(key); diff --git a/subprojects/pyntcore/semiwrap/NetworkTableEntry.yml b/subprojects/pyntcore/semiwrap/NetworkTableEntry.yml index 107fa6f65..d38054f9f 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTableEntry.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTableEntry.yml @@ -1,13 +1,13 @@ extra_includes: -- networktables/NetworkTableInstance.h -- networktables/Topic.h +- wpi/nt/NetworkTableInstance.hpp +- wpi/nt/Topic.hpp - src/py2value.h - src/pyentry.h inline_code: | #include classes: - nt::NetworkTableEntry: + wpi::nt::NetworkTableEntry: methods: NetworkTableEntry: overloads: diff --git a/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml b/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml index 82f2a9bb1..2bf33daa1 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml @@ -1,26 +1,26 @@ extra_includes: -- networktables/BooleanArrayTopic.h -- networktables/BooleanTopic.h -- networktables/DoubleArrayTopic.h -- networktables/DoubleTopic.h -- networktables/FloatArrayTopic.h -- networktables/FloatTopic.h -- networktables/IntegerArrayTopic.h -- networktables/IntegerTopic.h -- networktables/MultiSubscriber.h -- networktables/RawTopic.h -- networktables/StringArrayTopic.h -- networktables/StringTopic.h -- networktables/StructArrayTopic.h -- networktables/StructTopic.h -- networktables/Topic.h +- wpi/nt/BooleanArrayTopic.hpp +- wpi/nt/BooleanTopic.hpp +- wpi/nt/DoubleArrayTopic.hpp +- wpi/nt/DoubleTopic.hpp +- wpi/nt/FloatArrayTopic.hpp +- wpi/nt/FloatTopic.hpp +- wpi/nt/IntegerArrayTopic.hpp +- wpi/nt/IntegerTopic.hpp +- wpi/nt/MultiSubscriber.hpp +- wpi/nt/RawTopic.hpp +- wpi/nt/StringArrayTopic.hpp +- wpi/nt/StringTopic.hpp +- wpi/nt/StructArrayTopic.hpp +- wpi/nt/StructTopic.hpp +- wpi/nt/Topic.hpp - src/py2value.h - src/nt_instance.h -- wpi/datalog/DataLog.h +- wpi/datalog/DataLog.hpp - wpystruct.h classes: - nt::NetworkTableInstance: + wpi::nt::NetworkTableInstance: force_type_casters: - std::function attributes: @@ -29,7 +29,7 @@ classes: NetworkMode: arithmetic: true inline_code: | - .value("kNetModeStarting", (nt::NetworkTableInstance::NetworkMode)NT_NET_MODE_STARTING) + .value("kNetModeStarting", (wpi::nt::NetworkTableInstance::NetworkMode)NT_NET_MODE_STARTING) LogLevel: methods: NetworkTableInstance: @@ -175,7 +175,7 @@ classes: pyntcore::onInstancePreReset(self); { py::gil_scoped_release release; - nt::ResetInstance(self->GetHandle()); + wpi::nt::ResetInstance(self->GetHandle()); } pyntcore::onInstancePostReset(self); }) diff --git a/subprojects/pyntcore/semiwrap/NetworkTableListener.yml b/subprojects/pyntcore/semiwrap/NetworkTableListener.yml index e96cfabe8..daa8537e7 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTableListener.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTableListener.yml @@ -1,5 +1,5 @@ classes: - nt::NetworkTableListener: + wpi::nt::NetworkTableListener: force_type_casters: - std::function methods: @@ -30,7 +30,7 @@ classes: py::gil_scoped_release release; *self = NetworkTableListener(); }) - nt::NetworkTableListenerPoller: + wpi::nt::NetworkTableListenerPoller: methods: NetworkTableListenerPoller: overloads: diff --git a/subprojects/pyntcore/semiwrap/NetworkTableValue.yml b/subprojects/pyntcore/semiwrap/NetworkTableValue.yml index 3d5af6247..f1317289c 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTableValue.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTableValue.yml @@ -1,5 +1,5 @@ extra_includes: -- networktables/NetworkTableType.h +- wpi/nt/NetworkTableType.hpp - src/py2value.h functions: @@ -7,7 +7,7 @@ functions: ignore: true classes: - nt::Value: + wpi::nt::Value: methods: Value: overloads: @@ -174,7 +174,7 @@ classes: .def_static("makeValue", [](py::handle value) { return pyntcore::py2ntvalue(value); }, py::arg("value")) - .def_static("getFactoryByType", [](nt::NetworkTableType type) { + .def_static("getFactoryByType", [](wpi::nt::NetworkTableType type) { return pyntcore::valueFactoryByType(type); }, py::arg("type")) .def("__repr__", [](const Value &self) -> py::str { diff --git a/subprojects/pyntcore/semiwrap/RawTopic.yml b/subprojects/pyntcore/semiwrap/RawTopic.yml index a7a844d4c..66329b62c 100644 --- a/subprojects/pyntcore/semiwrap/RawTopic.yml +++ b/subprojects/pyntcore/semiwrap/RawTopic.yml @@ -2,7 +2,7 @@ extra_includes: - src/nt_type_caster.h classes: - nt::RawSubscriber: + wpi::nt::RawSubscriber: methods: RawSubscriber: overloads: @@ -14,17 +14,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -40,7 +40,7 @@ classes: py::gil_scoped_release release; *self = RawSubscriber(); }) - nt::RawPublisher: + wpi::nt::RawPublisher: methods: RawPublisher: overloads: @@ -63,7 +63,7 @@ classes: py::gil_scoped_release release; *self = RawPublisher(); }) - nt::RawEntry: + wpi::nt::RawEntry: methods: RawEntry: overloads: @@ -87,7 +87,7 @@ classes: py::gil_scoped_release release; *self = RawEntry(); }) - nt::RawTopic: + wpi::nt::RawTopic: methods: RawTopic: overloads: diff --git a/subprojects/pyntcore/semiwrap/StringArrayTopic.yml b/subprojects/pyntcore/semiwrap/StringArrayTopic.yml index c55444273..0ac466ed6 100644 --- a/subprojects/pyntcore/semiwrap/StringArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/StringArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::StringArraySubscriber: + wpi::nt::StringArraySubscriber: methods: StringArraySubscriber: overloads: @@ -29,7 +29,7 @@ classes: py::gil_scoped_release release; *self = StringArraySubscriber(); }) - nt::StringArrayPublisher: + wpi::nt::StringArrayPublisher: methods: StringArrayPublisher: overloads: @@ -52,7 +52,7 @@ classes: py::gil_scoped_release release; *self = StringArrayPublisher(); }) - nt::StringArrayEntry: + wpi::nt::StringArrayEntry: methods: StringArrayEntry: overloads: @@ -76,7 +76,7 @@ classes: py::gil_scoped_release release; *self = StringArrayEntry(); }) - nt::StringArrayTopic: + wpi::nt::StringArrayTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/StringTopic.yml b/subprojects/pyntcore/semiwrap/StringTopic.yml index fc908747e..aae37909b 100644 --- a/subprojects/pyntcore/semiwrap/StringTopic.yml +++ b/subprojects/pyntcore/semiwrap/StringTopic.yml @@ -1,5 +1,5 @@ classes: - nt::StringSubscriber: + wpi::nt::StringSubscriber: methods: StringSubscriber: overloads: @@ -11,17 +11,17 @@ classes: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true GetAtomic: overloads: '[const]': ParamType [const]: - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true - wpi::SmallVectorImpl&, ParamType [const]: + wpi::util::SmallVectorImpl&, ParamType [const]: ignore: true ReadQueue: GetTopic: @@ -37,7 +37,7 @@ classes: py::gil_scoped_release release; *self = StringSubscriber(); }) - nt::StringPublisher: + wpi::nt::StringPublisher: methods: StringPublisher: overloads: @@ -60,7 +60,7 @@ classes: py::gil_scoped_release release; *self = StringPublisher(); }) - nt::StringEntry: + wpi::nt::StringEntry: methods: StringEntry: overloads: @@ -84,7 +84,7 @@ classes: py::gil_scoped_release release; *self = StringEntry(); }) - nt::StringTopic: + wpi::nt::StringTopic: attributes: kTypeString: methods: diff --git a/subprojects/pyntcore/semiwrap/StructArrayTopic.yml b/subprojects/pyntcore/semiwrap/StructArrayTopic.yml index 88960b499..57e538fd9 100644 --- a/subprojects/pyntcore/semiwrap/StructArrayTopic.yml +++ b/subprojects/pyntcore/semiwrap/StructArrayTopic.yml @@ -1,5 +1,5 @@ classes: - nt::StructArraySubscriber: + wpi::nt::StructArraySubscriber: template_params: - T - I @@ -25,18 +25,18 @@ classes: ReadQueue: GetTopic: inline_code: | - .def("close", [](nt::StructArraySubscriber *self) { + .def("close", [](wpi::nt::StructArraySubscriber *self) { py::gil_scoped_release release; - *self = nt::StructArraySubscriber(); + *self = wpi::nt::StructArraySubscriber(); }, py::doc("Destroys the subscriber")) - .def("__enter__", [](nt::StructArraySubscriber *self) { + .def("__enter__", [](wpi::nt::StructArraySubscriber *self) { return self; }) - .def("__exit__", [](nt::StructArraySubscriber *self, py::args args) { + .def("__exit__", [](wpi::nt::StructArraySubscriber *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructArraySubscriber(); + *self = wpi::nt::StructArraySubscriber(); }) - nt::StructArrayPublisher: + wpi::nt::StructArrayPublisher: template_params: - T - I @@ -59,24 +59,24 @@ classes: std::span: GetTopic: inline_code: | - .def("close", [](nt::StructArrayPublisher *self) { + .def("close", [](wpi::nt::StructArrayPublisher *self) { py::gil_scoped_release release; - *self = nt::StructArrayPublisher(); + *self = wpi::nt::StructArrayPublisher(); }, py::doc("Destroys the publisher")) - .def("__enter__", [](nt::StructArrayPublisher *self) { + .def("__enter__", [](wpi::nt::StructArrayPublisher *self) { return self; }) - .def("__exit__", [](nt::StructArrayPublisher *self, py::args args) { + .def("__exit__", [](wpi::nt::StructArrayPublisher *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructArrayPublisher(); + *self = wpi::nt::StructArrayPublisher(); }) - nt::StructArrayEntry: + wpi::nt::StructArrayEntry: template_params: - T - I base_qualnames: - StructArraySubscriber: nt::StructArraySubscriber - StructArrayPublisher: nt::StructArrayPublisher + StructArraySubscriber: wpi::nt::StructArraySubscriber + StructArrayPublisher: wpi::nt::StructArrayPublisher methods: StructArrayEntry: overloads: @@ -89,18 +89,18 @@ classes: GetTopic: Unpublish: inline_code: | - .def("close", [](nt::StructArrayEntry *self) { + .def("close", [](wpi::nt::StructArrayEntry *self) { py::gil_scoped_release release; - *self = nt::StructArrayEntry(); + *self = wpi::nt::StructArrayEntry(); }, py::doc("Destroys the entry")) - .def("__enter__", [](nt::StructArrayEntry *self) { + .def("__enter__", [](wpi::nt::StructArrayEntry *self) { return self; }) - .def("__exit__", [](nt::StructArrayEntry *self, py::args args) { + .def("__exit__", [](wpi::nt::StructArrayEntry *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructArrayEntry(); + *self = wpi::nt::StructArrayEntry(); }) - nt::StructArrayTopic: + wpi::nt::StructArrayTopic: template_params: - T - I @@ -118,7 +118,7 @@ classes: cpp_code: | [](Topic topic, const py::type &t) { WPyStructInfo info(t); - return nt::StructArrayTopic(topic, info); + return wpi::nt::StructArrayTopic(topic, info); } Subscribe: overloads: @@ -133,35 +133,35 @@ classes: ignore: true std::span, const PubSubOptions&: inline_code: | - .def("close", [](nt::StructArrayTopic *self) { + .def("close", [](wpi::nt::StructArrayTopic *self) { py::gil_scoped_release release; - *self = nt::StructArrayTopic(); + *self = wpi::nt::StructArrayTopic(); }, py::doc("Destroys the topic")) - .def("__enter__", [](nt::StructArrayTopic *self) { + .def("__enter__", [](wpi::nt::StructArrayTopic *self) { return self; }) - .def("__exit__", [](nt::StructArrayTopic *self, py::args args) { + .def("__exit__", [](wpi::nt::StructArrayTopic *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructArrayTopic(); + *self = wpi::nt::StructArrayTopic(); }) templates: StructArraySubscriber: - qualname: nt::StructArraySubscriber + qualname: wpi::nt::StructArraySubscriber params: - WPyStruct - WPyStructInfo StructArrayPublisher: - qualname: nt::StructArrayPublisher + qualname: wpi::nt::StructArrayPublisher params: - WPyStruct - WPyStructInfo StructArrayEntry: - qualname: nt::StructArrayEntry + qualname: wpi::nt::StructArrayEntry params: - WPyStruct - WPyStructInfo StructArrayTopic: - qualname: nt::StructArrayTopic + qualname: wpi::nt::StructArrayTopic params: - WPyStruct - WPyStructInfo diff --git a/subprojects/pyntcore/semiwrap/StructTopic.yml b/subprojects/pyntcore/semiwrap/StructTopic.yml index 694f0af8d..8ff5ad5a7 100644 --- a/subprojects/pyntcore/semiwrap/StructTopic.yml +++ b/subprojects/pyntcore/semiwrap/StructTopic.yml @@ -1,5 +1,5 @@ classes: - nt::StructSubscriber: + wpi::nt::StructSubscriber: template_params: - T - I @@ -23,18 +23,18 @@ classes: ReadQueue: GetTopic: inline_code: | - .def("close", [](nt::StructSubscriber *self) { + .def("close", [](wpi::nt::StructSubscriber *self) { py::gil_scoped_release release; - *self = nt::StructSubscriber(); + *self = wpi::nt::StructSubscriber(); }, py::doc("Destroys the subscriber")) - .def("__enter__", [](nt::StructSubscriber *self) { + .def("__enter__", [](wpi::nt::StructSubscriber *self) { return self; }) - .def("__exit__", [](nt::StructSubscriber *self, py::args args) { + .def("__exit__", [](wpi::nt::StructSubscriber *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructSubscriber(); + *self = wpi::nt::StructSubscriber(); }) - nt::StructPublisher: + wpi::nt::StructPublisher: template_params: - T - I @@ -49,24 +49,24 @@ classes: SetDefault: GetTopic: inline_code: | - .def("close", [](nt::StructPublisher *self) { + .def("close", [](wpi::nt::StructPublisher *self) { py::gil_scoped_release release; - *self = nt::StructPublisher(); + *self = wpi::nt::StructPublisher(); }, py::doc("Destroys the publisher")) - .def("__enter__", [](nt::StructPublisher *self) { + .def("__enter__", [](wpi::nt::StructPublisher *self) { return self; }) - .def("__exit__", [](nt::StructPublisher *self, py::args args) { + .def("__exit__", [](wpi::nt::StructPublisher *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructPublisher(); + *self = wpi::nt::StructPublisher(); }) - nt::StructEntry: + wpi::nt::StructEntry: template_params: - T - I base_qualnames: - StructSubscriber: nt::StructSubscriber - StructPublisher: nt::StructPublisher + StructSubscriber: wpi::nt::StructSubscriber + StructPublisher: wpi::nt::StructPublisher methods: StructEntry: overloads: @@ -79,18 +79,18 @@ classes: GetTopic: Unpublish: inline_code: | - .def("close", [](nt::StructEntry *self) { + .def("close", [](wpi::nt::StructEntry *self) { py::gil_scoped_release release; - *self = nt::StructEntry(); + *self = wpi::nt::StructEntry(); }, py::doc("Destroys the entry")) - .def("__enter__", [](nt::StructEntry *self) { + .def("__enter__", [](wpi::nt::StructEntry *self) { return self; }) - .def("__exit__", [](nt::StructEntry *self, py::args args) { + .def("__exit__", [](wpi::nt::StructEntry *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructEntry(); + *self = wpi::nt::StructEntry(); }) - nt::StructTopic: + wpi::nt::StructTopic: template_params: - T - I @@ -108,42 +108,42 @@ classes: cpp_code: | [](Topic topic, const py::type &t) { WPyStructInfo info(t); - return nt::StructTopic(topic, info); + return wpi::nt::StructTopic(topic, info); } Subscribe: Publish: PublishEx: GetEntry: inline_code: | - .def("close", [](nt::StructTopic *self) { + .def("close", [](wpi::nt::StructTopic *self) { py::gil_scoped_release release; - *self = nt::StructTopic(); + *self = wpi::nt::StructTopic(); }, py::doc("Destroys the topic")) - .def("__enter__", [](nt::StructTopic *self) { + .def("__enter__", [](wpi::nt::StructTopic *self) { return self; }) - .def("__exit__", [](nt::StructTopic *self, py::args args) { + .def("__exit__", [](wpi::nt::StructTopic *self, py::args args) { py::gil_scoped_release release; - *self = nt::StructTopic(); + *self = wpi::nt::StructTopic(); }) templates: StructSubscriber: - qualname: nt::StructSubscriber + qualname: wpi::nt::StructSubscriber params: - WPyStruct - WPyStructInfo StructPublisher: - qualname: nt::StructPublisher + qualname: wpi::nt::StructPublisher params: - WPyStruct - WPyStructInfo StructEntry: - qualname: nt::StructEntry + qualname: wpi::nt::StructEntry params: - WPyStruct - WPyStructInfo StructTopic: - qualname: nt::StructTopic + qualname: wpi::nt::StructTopic params: - WPyStruct - WPyStructInfo diff --git a/subprojects/pyntcore/semiwrap/Topic.yml b/subprojects/pyntcore/semiwrap/Topic.yml index d2a951a84..bb52df81e 100644 --- a/subprojects/pyntcore/semiwrap/Topic.yml +++ b/subprojects/pyntcore/semiwrap/Topic.yml @@ -1,9 +1,9 @@ extra_includes: -- networktables/GenericEntry.h -- networktables/NetworkTableInstance.h +- wpi/nt/GenericEntry.hpp +- wpi/nt/NetworkTableInstance.hpp classes: - nt::Topic: + wpi::nt::Topic: methods: Topic: overloads: @@ -47,7 +47,7 @@ classes: std::string name = self.cast().GetName(); return py::str("<{} {!r}>").format(type_name, name); }) - nt::Subscriber: + wpi::nt::Subscriber: attributes: m_subHandle: methods: @@ -68,7 +68,7 @@ classes: auto topic = self.cast().GetTopic(); return py::str("<{} {!r}>").format(type_name, topic.GetName()); }) - nt::Publisher: + wpi::nt::Publisher: attributes: m_pubHandle: methods: diff --git a/subprojects/pyntcore/semiwrap/ntcore_cpp.yml b/subprojects/pyntcore/semiwrap/ntcore_cpp.yml index 6e1a237f1..6a7e93828 100644 --- a/subprojects/pyntcore/semiwrap/ntcore_cpp.yml +++ b/subprojects/pyntcore/semiwrap/ntcore_cpp.yml @@ -4,7 +4,7 @@ defaults: extra_includes: - pybind11/stl.h -- networktables/Topic.h +- wpi/nt/Topic.hpp functions: RemoveListener: @@ -28,7 +28,7 @@ functions: DecodeClients: subpackage: meta classes: - nt::EventFlags: + wpi::nt::EventFlags: attributes: kNone: kImmediate: @@ -44,7 +44,7 @@ classes: kValueAll: kLogMessage: kTimeSync: - nt::TopicInfo: + wpi::nt::TopicInfo: attributes: name: type_str: @@ -57,16 +57,16 @@ classes: GetProperties: inline_code: | .def_property_readonly("topic", [](const TopicInfo &self) { - return std::make_shared(self.topic); + return std::make_shared(self.topic); }) .def_property_readonly("type", [](const TopicInfo &self) { - return nt::NetworkTableType(self.type); + return wpi::nt::NetworkTableType(self.type); }) .def("__repr__", [](const TopicInfo &self) -> py::str { return py::str("") .format(self.name, self.type_str); }) - nt::ConnectionInfo: + wpi::nt::ConnectionInfo: attributes: remote_id: remote_ip: @@ -79,7 +79,7 @@ classes: .format(self.remote_id, self.remote_ip, self.remote_port, self.last_update, self.protocol_version); }) - nt::ValueEventData: + wpi::nt::ValueEventData: attributes: topic: ignore: true @@ -95,14 +95,14 @@ classes: ignore: true inline_code: | .def_property_readonly("topic", [](const ValueEventData &self) { - return std::make_shared(self.topic); + return std::make_shared(self.topic); }) .def("__repr__", [](const ValueEventData &self) -> py::str { - auto topicInfo = nt::GetTopicInfo(self.topic); + auto topicInfo = wpi::nt::GetTopicInfo(self.topic); return py::str("") .format(topicInfo.name, topicInfo.type_str, self.value); }) - nt::LogMessage: + wpi::nt::LogMessage: attributes: level: filename: @@ -115,7 +115,7 @@ classes: ignore: true unsigned int, std::string_view, unsigned int, std::string_view: ignore: true - nt::TimeSyncEventData: + wpi::nt::TimeSyncEventData: attributes: serverTimeOffset: rtt2: @@ -126,7 +126,7 @@ classes: '': ignore: true int64_t, int64_t, bool: - nt::Event: + wpi::nt::Event: attributes: listener: flags: @@ -184,14 +184,14 @@ classes: '': ignore: true inline_code: | - .def_property_readonly("data", [](nt::Event *self){ + .def_property_readonly("data", [](wpi::nt::Event *self){ return self->data; }) - .def("__repr__", [](const nt::Event &self) -> py::str { + .def("__repr__", [](const wpi::nt::Event &self) -> py::str { return py::str("") .format(self.listener, self.flags, self.data); }) - nt::PubSubOptions: + wpi::nt::PubSubOptions: force_no_default_constructor: true attributes: kDefaultPeriodic: @@ -213,7 +213,7 @@ classes: .def(py::init([]( unsigned int pollStorage, double periodic, - std::optional> excludePublisher, + std::optional> excludePublisher, bool sendAll, bool topicsOnly, bool keepDuplicates, @@ -222,8 +222,8 @@ classes: bool disableLocal, bool excludeSelf, bool hidden - ) -> nt::PubSubOptions { - return nt::PubSubOptions{ + ) -> wpi::nt::PubSubOptions { + return wpi::nt::PubSubOptions{ .pollStorage = pollStorage, .periodic = periodic, .excludePublisher = excludePublisher.has_value() ? excludePublisher.value()->GetHandle() : 0, @@ -239,7 +239,7 @@ classes: }), py::kw_only(), py::arg("pollStorage") = 0, - py::arg("periodic") = nt::PubSubOptions::kDefaultPeriodic, + py::arg("periodic") = wpi::nt::PubSubOptions::kDefaultPeriodic, py::arg("excludePublisher") = std::nullopt, py::arg("sendAll") = false, py::arg("topicsOnly") = false, @@ -280,36 +280,36 @@ classes: will not appear in metatopics. )" ) - nt::meta::SubscriberOptions: + wpi::nt::meta::SubscriberOptions: subpackage: meta attributes: periodic: topicsOnly: sendAll: prefixMatch: - nt::meta::TopicPublisher: + wpi::nt::meta::TopicPublisher: subpackage: meta attributes: client: pubuid: - nt::meta::TopicSubscriber: + wpi::nt::meta::TopicSubscriber: subpackage: meta attributes: client: subuid: options: - nt::meta::ClientPublisher: + wpi::nt::meta::ClientPublisher: subpackage: meta attributes: uid: topic: - nt::meta::ClientSubscriber: + wpi::nt::meta::ClientSubscriber: subpackage: meta attributes: uid: topics: options: - nt::meta::Client: + wpi::nt::meta::Client: subpackage: meta attributes: id: diff --git a/subprojects/pyntcore/semiwrap/ntcore_cpp_types.yml b/subprojects/pyntcore/semiwrap/ntcore_cpp_types.yml index 0fddb11e9..aa31e612c 100644 --- a/subprojects/pyntcore/semiwrap/ntcore_cpp_types.yml +++ b/subprojects/pyntcore/semiwrap/ntcore_cpp_types.yml @@ -6,7 +6,7 @@ defaults: report_ignored_missing: false classes: - nt::Timestamped: + wpi::nt::Timestamped: template_params: - T attributes: @@ -29,54 +29,54 @@ classes: templates: TimestampedBoolean: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - bool TimestampedInteger: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - int64_t TimestampedFloat: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - float TimestampedDouble: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - double TimestampedString: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::string TimestampedRaw: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedBooleanArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedIntegerArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedFloatArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedDoubleArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedStringArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector TimestampedStruct: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - WPyStruct TimestampedStructArray: - qualname: nt::Timestamped + qualname: wpi::nt::Timestamped params: - std::vector diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index 86b5e6024..83e4728f6 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -5,23 +5,23 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-apriltag==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpimath==2027.0.0a3", + "robotpy-native-apriltag==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", ] [project] name = "robotpy-apriltag" -version = "2027.0.0a3" +version = "0.0.0" description = "RobotPy bindings for WPILib's AprilTag library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-apriltag==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpimath==2027.0.0a3", + "robotpy-native-apriltag==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", ] [project.urls] @@ -51,7 +51,7 @@ scan_headers_ignore = [ "apriltag_math.h", "apriltag_pose.h", - "frc/apriltag/AprilTagDetector_cv.h", + "wpi/apriltag/AprilTagDetector_cv.hpp", "tag16h5.h", "tag36h11.h", @@ -64,11 +64,11 @@ depends = ["wpiutil", "wpimath"] [tool.semiwrap.extension_modules."robotpy_apriltag._apriltag".headers] # frc/apriltag -AprilTag = "frc/apriltag/AprilTag.h" -AprilTagDetection = "frc/apriltag/AprilTagDetection.h" -AprilTagDetector = "frc/apriltag/AprilTagDetector.h" -# AprilTagDetector_cv = "frc/apriltag/AprilTagDetector_cv.h" -AprilTagFieldLayout = "frc/apriltag/AprilTagFieldLayout.h" -AprilTagFields = "frc/apriltag/AprilTagFields.h" -AprilTagPoseEstimate = "frc/apriltag/AprilTagPoseEstimate.h" -AprilTagPoseEstimator = "frc/apriltag/AprilTagPoseEstimator.h" +AprilTag = "wpi/apriltag/AprilTag.hpp" +AprilTagDetection = "wpi/apriltag/AprilTagDetection.hpp" +AprilTagDetector = "wpi/apriltag/AprilTagDetector.hpp" +# AprilTagDetector_cv = "wpi/apriltag/AprilTagDetector_cv.hpp" +AprilTagFieldLayout = "wpi/apriltag/AprilTagFieldLayout.hpp" +AprilTagFields = "wpi/apriltag/AprilTagFields.hpp" +AprilTagPoseEstimate = "wpi/apriltag/AprilTagPoseEstimate.hpp" +AprilTagPoseEstimator = "wpi/apriltag/AprilTagPoseEstimator.hpp" diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTag.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTag.yml index 42ae4168c..5e8b2ebd8 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTag.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTag.yml @@ -4,7 +4,7 @@ functions: from_json: ignore: true classes: - frc::AprilTag: + wpi::apriltag::AprilTag: attributes: ID: pose: diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTagDetection.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTagDetection.yml index 23a35df5d..78332dad9 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTagDetection.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTagDetection.yml @@ -2,7 +2,7 @@ extra_includes: - pybind11/eigen.h classes: - frc::AprilTagDetection: + wpi::apriltag::AprilTagDetection: methods: GetFamily: GetId: @@ -18,7 +18,7 @@ classes: return py::str("") .format(self.GetFamily(), self.GetId(), self.GetHamming(), self.GetDecisionMargin(), self.GetCenter()); }) - frc::AprilTagDetection::Point: + wpi::apriltag::AprilTagDetection::Point: attributes: x: y: diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTagDetector.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTagDetector.yml index 3385e5172..df9e1d970 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTagDetector.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTagDetector.yml @@ -2,7 +2,7 @@ extra_includes: - pybind11_typing.h classes: - frc::AprilTagDetector: + wpi::apriltag::AprilTagDetector: methods: AprilTagDetector: SetConfig: @@ -59,7 +59,7 @@ classes: :return: list of results )doc" ) - frc::AprilTagDetector::Config: + wpi::apriltag::AprilTagDetector::Config: attributes: numThreads: quadDecimate: @@ -69,7 +69,7 @@ classes: debug: methods: operator==: - frc::AprilTagDetector::QuadThresholdParameters: + wpi::apriltag::AprilTagDetector::QuadThresholdParameters: attributes: minClusterPixels: maxNumMaxima: @@ -79,7 +79,7 @@ classes: deglitch: methods: operator==: - frc::AprilTagDetector::Results: + wpi::apriltag::AprilTagDetector::Results: rename: _Results ignored_bases: - std::span diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTagFieldLayout.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTagFieldLayout.yml index eba162f44..ac032718d 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTagFieldLayout.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTagFieldLayout.yml @@ -6,7 +6,7 @@ functions: LoadAprilTagLayoutField: ignore: true classes: - frc::AprilTagFieldLayout: + wpi::apriltag::AprilTagFieldLayout: enums: OriginPosition: methods: @@ -14,7 +14,7 @@ classes: overloads: '': std::string_view: - std::vector, units::meter_t, units::meter_t: + std::vector, wpi::units::meter_t, wpi::units::meter_t: LoadField: GetFieldLength: GetFieldWidth: @@ -22,7 +22,7 @@ classes: SetOrigin: overloads: OriginPosition: - const Pose3d&: + const wpi::math::Pose3d&: GetOrigin: GetTagPose: Serialize: diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimate.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimate.yml index 37faf79df..2e31bb8f4 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimate.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimate.yml @@ -1,5 +1,5 @@ classes: - frc::AprilTagPoseEstimate: + wpi::apriltag::AprilTagPoseEstimate: attributes: pose1: pose2: diff --git a/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimator.yml b/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimator.yml index d5f39edf3..d2cc7e8ea 100644 --- a/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimator.yml +++ b/subprojects/robotpy-apriltag/semiwrap/AprilTagPoseEstimator.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/apriltag/AprilTagDetection.h +- wpi/apriltag/AprilTagDetection.hpp classes: - frc::AprilTagPoseEstimator: + wpi::apriltag::AprilTagPoseEstimator: methods: AprilTagPoseEstimator: SetConfig: @@ -19,7 +19,7 @@ classes: overloads: const AprilTagDetection& [const]: std::span, std::span [const]: - frc::AprilTagPoseEstimator::Config: + wpi::apriltag::AprilTagPoseEstimator::Config: force_no_default_constructor: true attributes: tagSize: @@ -30,7 +30,7 @@ classes: methods: operator==: inline_code: | - .def(py::init([](units::meter_t tagSize, double fx, double fy, double cx, double cy) { + .def(py::init([](wpi::units::meter_t tagSize, double fx, double fy, double cx, double cy) { AprilTagPoseEstimator::Config cfg{tagSize, fx, fy, cx, cy}; return std::make_unique(std::move(cfg)); }), py::arg("tagSize"), py::arg("fx"), py::arg("fy"), py::arg("cx"), py::arg("cy")) diff --git a/subprojects/robotpy-hal/README.md b/subprojects/robotpy-hal/README.md index 4507d696c..a37a6cdad 100644 --- a/subprojects/robotpy-hal/README.md +++ b/subprojects/robotpy-hal/README.md @@ -4,4 +4,4 @@ robotpy-hal Python wrappers around the WPILib HAL. API Documentation can be found at -https://robotpy.readthedocs.io/projects/hal/en/latest \ No newline at end of file +https://robotpy.readthedocs.io/projects/hal/en/latest diff --git a/subprojects/robotpy-hal/hal/simulation/resethandles.cpp b/subprojects/robotpy-hal/hal/simulation/resethandles.cpp index 5caf333a3..b6bf48eb6 100644 --- a/subprojects/robotpy-hal/hal/simulation/resethandles.cpp +++ b/subprojects/robotpy-hal/hal/simulation/resethandles.cpp @@ -1,9 +1,9 @@ #ifndef __FRC_SYSTEMCORE__ -#include -#include -#include +#include "wpi/hal/Notifier.h" +#include "wpi/hal/handles/HandlesInternal.h" +#include "wpi/hal/simulation/NotifierData.h" void HALSIM_ResetGlobalHandles() { @@ -19,7 +19,7 @@ void HALSIM_ResetGlobalHandles() { } } - hal::HandleBase::ResetGlobalHandles(); + wpi::hal::HandleBase::ResetGlobalHandles(); } #else diff --git a/subprojects/robotpy-hal/hal/simulation/sim_value_cb.h b/subprojects/robotpy-hal/hal/simulation/sim_value_cb.h index d7477caaa..ff128fc89 100644 --- a/subprojects/robotpy-hal/hal/simulation/sim_value_cb.h +++ b/subprojects/robotpy-hal/hal/simulation/sim_value_cb.h @@ -1,7 +1,7 @@ #pragma once -#include +#include "wpi/hal/SimDevice.h" class SimValueCB { public: diff --git a/subprojects/robotpy-hal/hal/src/ds_types_fmt.h b/subprojects/robotpy-hal/hal/src/ds_types_fmt.h index 04bffd232..e126365be 100644 --- a/subprojects/robotpy-hal/hal/src/ds_types_fmt.h +++ b/subprojects/robotpy-hal/hal/src/ds_types_fmt.h @@ -2,7 +2,7 @@ #include -#include "hal/DriverStationTypes.h" +#include "wpi/hal/DriverStationTypes.h" namespace pybind11 { diff --git a/subprojects/robotpy-hal/hal/src/hal.cpp b/subprojects/robotpy-hal/hal/src/hal.cpp index 505197743..f846db552 100644 --- a/subprojects/robotpy-hal/hal/src/hal.cpp +++ b/subprojects/robotpy-hal/hal/src/hal.cpp @@ -1,8 +1,8 @@ -#include -#include -#include +#include "wpi/hal/HALBase.h" +#include "wpi/hal/DriverStation.h" +#include "wpi/hal/Value.h" #include using namespace pybind11::literals; diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 77c18d358..2c14ae0a5 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -4,23 +4,23 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "pyntcore==2027.0.0a3", - "robotpy-native-wpihal==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", + "pyntcore==0.0.0", + "robotpy-native-wpihal==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project] name = "robotpy-hal" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC HAL" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "pyntcore==2027.0.0a3", - "robotpy-native-wpihal==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", + "pyntcore==0.0.0", + "robotpy-native-wpihal==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project.urls] @@ -41,38 +41,30 @@ packages = ["hal"] [tool.semiwrap] update_init = [] scan_headers_ignore = [ - "hal/ChipObject.h", - "hal/DMA.h", - "hal/Errors.h", - "hal/HAL.h", - "hal/IMU.h", - "hal/IMUTypes.h", - "hal/SystemServer.h", - "hal/Types.h", - "hal/Value.h", - - "hal/cpp/SerialHelper.h", - "hal/cpp/UnsafeDIO.h", - "hal/cpp/fpga_clock.h", - - "hal/handles/DigitalHandleResource.h", - "hal/handles/IndexedClassedHandleResource.h", - "hal/handles/IndexedHandleResource.h", - "hal/handles/LimitedClassedHandleResource.h", - "hal/handles/LimitedHandleResource.h", - "hal/handles/UnlimitedHandleResource.h", - - "hal/proto/*", - - "hal/roborio/HMB.h", - "hal/roborio/InterruptManager.h", - - "hal/simulation/CanData.h", - "hal/simulation/I2CData.h", - "hal/simulation/NotifyListener.h", - "hal/simulation/SPIData.h", - "hal/simulation/SimCallbackRegistry.h", - "hal/simulation/SimDataValue.h", + "wpi/hal/Errors.h", + "wpi/hal/HAL.h", + "wpi/hal/IMU.h", + "wpi/hal/IMUTypes.h", + "wpi/hal/SystemServer.h", + "wpi/hal/Types.h", + "wpi/hal/Value.h", + + "wpi/hal/cpp/fpga_clock.h", + + "wpi/hal/handles/DigitalHandleResource.h", + "wpi/hal/handles/IndexedClassedHandleResource.h", + "wpi/hal/handles/IndexedHandleResource.h", + "wpi/hal/handles/LimitedClassedHandleResource.h", + "wpi/hal/handles/LimitedHandleResource.h", + "wpi/hal/handles/UnlimitedHandleResource.h", + + "wpi/hal/proto/*", + + "wpi/hal/simulation/CanData.h", + "wpi/hal/simulation/I2CData.h", + "wpi/hal/simulation/NotifyListener.h", + "wpi/hal/simulation/SimCallbackRegistry.h", + "wpi/hal/simulation/SimDataValue.h", # TODO: might want this in the future "mrc/*", @@ -89,54 +81,54 @@ depends = ["wpiutil", "ntcore"] [tool.semiwrap.extension_modules."hal._wpiHal".headers] # hal -AddressableLED = "hal/AddressableLED.h" -AddressableLEDTypes = "hal/AddressableLEDTypes.h" -AnalogInput = "hal/AnalogInput.h" -CAN = "hal/CAN.h" -CANAPI = "hal/CANAPI.h" -CANAPITypes = "hal/CANAPITypes.h" -CTREPCM = "hal/CTREPCM.h" -Constants = "hal/Constants.h" -Counter = "hal/Counter.h" -DIO = "hal/DIO.h" +AddressableLED = "wpi/hal/AddressableLED.h" +AddressableLEDTypes = "wpi/hal/AddressableLEDTypes.h" +AnalogInput = "wpi/hal/AnalogInput.h" +CAN = "wpi/hal/CAN.h" +CANAPI = "wpi/hal/CANAPI.h" +CANAPITypes = "wpi/hal/CANAPITypes.h" +CTREPCM = "wpi/hal/CTREPCM.h" +Constants = "wpi/hal/Constants.h" +Counter = "wpi/hal/Counter.h" +DIO = "wpi/hal/DIO.h" # DMA = "hal/DMA.h" -DriverStation = "hal/DriverStation.h" -DriverStationTypes = "hal/DriverStationTypes.h" -DutyCycle = "hal/DutyCycle.h" -Encoder = "hal/Encoder.h" -# Errors = "hal/Errors.h" -Extensions = "hal/Extensions.h" -# HAL = "hal/HAL.h" -HALBase = "hal/HALBase.h" -I2C = "hal/I2C.h" -I2CTypes = "hal/I2CTypes.h" -# IMU = "hal/IMU.h" -# IMUTypes = "hal/IMUTypes.h" -Main = "hal/Main.h" -Notifier = "hal/Notifier.h" -PWM = "hal/PWM.h" -Ports = "hal/Ports.h" -Power = "hal/Power.h" -PowerDistribution = "hal/PowerDistribution.h" -REVPH = "hal/REVPH.h" -SerialPort = "hal/SerialPort.h" -SimDevice = "hal/SimDevice.h" -UsageReporting = "hal/UsageReporting.h" -Threads = "hal/Threads.h" -# Types = "hal/Types.h" -# Value = "hal/Value.h" +DriverStation = "wpi/hal/DriverStation.h" +DriverStationTypes = "wpi/hal/DriverStationTypes.h" +DutyCycle = "wpi/hal/DutyCycle.h" +Encoder = "wpi/hal/Encoder.h" +# Errors = "wpi/hal/Errors.h" +Extensions = "wpi/hal/Extensions.h" +# HAL = "wpi/hal/HAL.h" +HALBase = "wpi/hal/HALBase.h" +I2C = "wpi/hal/I2C.h" +I2CTypes = "wpi/hal/I2CTypes.h" +# IMU = "wpi/hal/IMU.h" +# IMUTypes = "wpi/hal/IMUTypes.h" +Main = "wpi/hal/Main.h" +Notifier = "wpi/hal/Notifier.h" +PWM = "wpi/hal/PWM.h" +Ports = "wpi/hal/Ports.h" +Power = "wpi/hal/Power.h" +PowerDistribution = "wpi/hal/PowerDistribution.h" +REVPH = "wpi/hal/REVPH.h" +SerialPort = "wpi/hal/SerialPort.h" +SimDevice = "wpi/hal/SimDevice.h" +UsageReporting = "wpi/hal/UsageReporting.h" +Threads = "wpi/hal/Threads.h" +# Types = "wpi/hal/Types.h" +# Value = "wpi/hal/Value.h" # hal/cpp -# fpga_clock = "hal/cpp/fpga_clock.h" +# fpga_clock = "wpi/hal/cpp/fpga_clock.h" # hal/handles -# DigitalHandleResource = "hal/handles/DigitalHandleResource.h" -HandlesInternal = "hal/handles/HandlesInternal.h" -# IndexedClassedHandleResource = "hal/handles/IndexedClassedHandleResource.h" -# IndexedHandleResource = "hal/handles/IndexedHandleResource.h" -# LimitedClassedHandleResource = "hal/handles/LimitedClassedHandleResource.h" -# LimitedHandleResource = "hal/handles/LimitedHandleResource.h" -# UnlimitedHandleResource = "hal/handles/UnlimitedHandleResource.h" +# DigitalHandleResource = "wpi/hal/handles/DigitalHandleResource.h" +HandlesInternal = "wpi/hal/handles/HandlesInternal.h" +# IndexedClassedHandleResource = "wpi/hal/handles/IndexedClassedHandleResource.h" +# IndexedHandleResource = "wpi/hal/handles/IndexedHandleResource.h" +# LimitedClassedHandleResource = "wpi/hal/handles/LimitedClassedHandleResource.h" +# LimitedHandleResource = "wpi/hal/handles/LimitedHandleResource.h" +# UnlimitedHandleResource = "wpi/hal/handles/UnlimitedHandleResource.h" [tool.semiwrap.extension_modules."hal.simulation._simulation"] @@ -146,24 +138,24 @@ depends = ["wpiutil", "ntcore"] yaml_path = "semiwrap/simulation" [tool.semiwrap.extension_modules."hal.simulation._simulation".headers] -AddressableLEDData = "hal/simulation/AddressableLEDData.h" -AnalogInData = "hal/simulation/AnalogInData.h" -CTREPCMData = "hal/simulation/CTREPCMData.h" -# CanData = "hal/simulation/CanData.h" -DIOData = "hal/simulation/DIOData.h" -DigitalPWMData = "hal/simulation/DigitalPWMData.h" -DriverStationData = "hal/simulation/DriverStationData.h" -DutyCycleData = "hal/simulation/DutyCycleData.h" -EncoderData = "hal/simulation/EncoderData.h" -# I2CData = "hal/simulation/I2CData.h" -MockHooks = "hal/simulation/MockHooks.h" -NotifierData = "hal/simulation/NotifierData.h" -# NotifyListener = "hal/simulation/NotifyListener.h" -PWMData = "hal/simulation/PWMData.h" -PowerDistributionData = "hal/simulation/PowerDistributionData.h" -REVPHData = "hal/simulation/REVPHData.h" -Reset = "hal/simulation/Reset.h" -RoboRioData = "hal/simulation/RoboRioData.h" -# SimCallbackRegistry = "hal/simulation/SimCallbackRegistry.h" -# SimDataValue = "hal/simulation/SimDataValue.h" -SimDeviceData = "hal/simulation/SimDeviceData.h" +AddressableLEDData = "wpi/hal/simulation/AddressableLEDData.h" +AnalogInData = "wpi/hal/simulation/AnalogInData.h" +CTREPCMData = "wpi/hal/simulation/CTREPCMData.h" +# CanData = "wpi/hal/simulation/CanData.h" +DIOData = "wpi/hal/simulation/DIOData.h" +DigitalPWMData = "wpi/hal/simulation/DigitalPWMData.h" +DriverStationData = "wpi/hal/simulation/DriverStationData.h" +DutyCycleData = "wpi/hal/simulation/DutyCycleData.h" +EncoderData = "wpi/hal/simulation/EncoderData.h" +# I2CData = "wpi/hal/simulation/I2CData.h" +MockHooks = "wpi/hal/simulation/MockHooks.h" +NotifierData = "wpi/hal/simulation/NotifierData.h" +# NotifyListener = "wpi/hal/simulation/NotifyListener.h" +PWMData = "wpi/hal/simulation/PWMData.h" +PowerDistributionData = "wpi/hal/simulation/PowerDistributionData.h" +REVPHData = "wpi/hal/simulation/REVPHData.h" +Reset = "wpi/hal/simulation/Reset.h" +RoboRioData = "wpi/hal/simulation/RoboRioData.h" +# SimCallbackRegistry = "wpi/hal/simulation/SimCallbackRegistry.h" +# SimDataValue = "wpi/hal/simulation/SimDataValue.h" +SimDeviceData = "wpi/hal/simulation/SimDeviceData.h" diff --git a/subprojects/robotpy-hal/semiwrap/DriverStation.yml b/subprojects/robotpy-hal/semiwrap/DriverStation.yml index 98f378780..42cc2006c 100644 --- a/subprojects/robotpy-hal/semiwrap/DriverStation.yml +++ b/subprojects/robotpy-hal/semiwrap/DriverStation.yml @@ -22,11 +22,10 @@ functions: [](int32_t joystickNum) { WPI_String name; HAL_GetJoystickName(&name, joystickNum); - std::string sname(wpi::to_string_view(&name)); + std::string sname(wpi::util::to_string_view(&name)); WPI_FreeString(&name); return sname; } - HAL_GetJoystickAxisType: HAL_SetJoystickOutputs: HAL_GetMatchTime: HAL_GetOutputsEnabled: diff --git a/subprojects/robotpy-hal/semiwrap/DriverStationTypes.yml b/subprojects/robotpy-hal/semiwrap/DriverStationTypes.yml index 63662e6eb..cdba6496f 100644 --- a/subprojects/robotpy-hal/semiwrap/DriverStationTypes.yml +++ b/subprojects/robotpy-hal/semiwrap/DriverStationTypes.yml @@ -21,27 +21,24 @@ classes: fmsAttached: dsAttached: control_reserved: + watchdogEnabled: HAL_JoystickAxes: attributes: - count: axes: raw: + available: HAL_JoystickPOVs: attributes: - count: povs: + available: HAL_JoystickButtons: attributes: buttons: - count: + available: HAL_JoystickDescriptor: attributes: type: name: - axisCount: - axisTypes: - buttonCount: - povCount: isGamepad: HAL_MatchInfo: attributes: diff --git a/subprojects/robotpy-hal/semiwrap/HALBase.yml b/subprojects/robotpy-hal/semiwrap/HALBase.yml index d81d5ac32..a731548e1 100644 --- a/subprojects/robotpy-hal/semiwrap/HALBase.yml +++ b/subprojects/robotpy-hal/semiwrap/HALBase.yml @@ -13,7 +13,7 @@ functions: []() { WPI_String s; HAL_GetSerialNumber(&s); - std::string ss(wpi::to_string_view(&s)); + std::string ss(wpi::util::to_string_view(&s)); WPI_FreeString(&s); return ss; } @@ -25,7 +25,7 @@ functions: []() { WPI_String s; HAL_GetComments(&s); - std::string ss(wpi::to_string_view(&s)); + std::string ss(wpi::util::to_string_view(&s)); WPI_FreeString(&s); return ss; } diff --git a/subprojects/robotpy-hal/semiwrap/HandlesInternal.yml b/subprojects/robotpy-hal/semiwrap/HandlesInternal.yml index fb088df26..8fd81e0f9 100644 --- a/subprojects/robotpy-hal/semiwrap/HandlesInternal.yml +++ b/subprojects/robotpy-hal/semiwrap/HandlesInternal.yml @@ -11,5 +11,5 @@ functions: getHandleTypedIndex: createHandle: classes: - hal::HandleBase: + wpi::hal::HandleBase: ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/SimDevice.yml b/subprojects/robotpy-hal/semiwrap/SimDevice.yml index 47cca971b..d6e93d0c6 100644 --- a/subprojects/robotpy-hal/semiwrap/SimDevice.yml +++ b/subprojects/robotpy-hal/semiwrap/SimDevice.yml @@ -3,7 +3,7 @@ defaults: report_ignored_missing: false extra_includes: -- hal/simulation/SimDeviceData.h +- wpi/hal/simulation/SimDeviceData.h strip_prefixes: - HAL_ @@ -11,7 +11,7 @@ strip_prefixes: enums: HAL_SimValueDirection: classes: - hal::SimValue: + wpi::hal::SimValue: doc: | Readonly wrapper around a HAL simulator value. @@ -30,7 +30,7 @@ classes: ignore: true SetValue: ignore: true - hal::SimInt: + wpi::hal::SimInt: doc: | Wrapper around a HAL simulator int value handle. @@ -49,7 +49,7 @@ classes: Get: Set: Reset: - hal::SimLong: + wpi::hal::SimLong: doc: | Wrapper around a HAL simulator long value handle. @@ -68,7 +68,7 @@ classes: Get: Set: Reset: - hal::SimDouble: + wpi::hal::SimDouble: doc: | Wrapper around a HAL simulator double value. @@ -87,7 +87,7 @@ classes: Get: Set: Reset: - hal::SimEnum: + wpi::hal::SimEnum: doc: | Wrapper around a HAL simulator enum value. @@ -105,7 +105,7 @@ classes: name: handle Get: Set: - hal::SimBoolean: + wpi::hal::SimBoolean: doc: | Wrapper around a HAL simulator boolean value. @@ -123,7 +123,7 @@ classes: name: handle Get: Set: - hal::SimDevice: + wpi::hal::SimDevice: doc: | Wrapper around a HAL simulation 'device' @@ -133,7 +133,7 @@ classes: .. note:: To interact with an existing device use :class:`hal.simulation.SimDeviceSim` instead. force_type_casters: - - wpi::SmallVector + - wpi::util::SmallVector enums: Direction: methods: @@ -154,8 +154,8 @@ classes: ignore: true const char*, int32_t, std::span, int32_t: cpp_code: | - [](SimDevice &self, const char * name, int32_t direction, const wpi::SmallVector &options, int32_t initialValue) { - wpi::SmallVector coptions; + [](SimDevice &self, const char * name, int32_t direction, const wpi::util::SmallVector &options, int32_t initialValue) { + wpi::util::SmallVector coptions; coptions.reserve(options.size()); for (auto &s: options) { coptions.push_back(s.c_str()); @@ -169,8 +169,8 @@ classes: ignore: true const char*, int32_t, std::span, std::span, int32_t: cpp_code: | - [](SimDevice &self, const char * name, int32_t direction, const wpi::SmallVector &options, const wpi::SmallVector &optionValues, int32_t initialValue) { - wpi::SmallVector coptions; + [](SimDevice &self, const char * name, int32_t direction, const wpi::util::SmallVector &options, const wpi::util::SmallVector &optionValues, int32_t initialValue) { + wpi::util::SmallVector coptions; coptions.reserve(options.size()); for (auto &s: options) { coptions.push_back(s.c_str()); @@ -185,7 +185,7 @@ classes: inline_code: |2 cls_SimValue - .def_property_readonly("value", [](const hal::SimValue &self) -> py::object { + .def_property_readonly("value", [](const wpi::hal::SimValue &self) -> py::object { HAL_Value value; { py::gil_scoped_release release; @@ -206,14 +206,14 @@ inline_code: |2 return py::none(); } }) - .def_property_readonly("type", [](const hal::SimValue &self) -> HAL_Type { + .def_property_readonly("type", [](const wpi::hal::SimValue &self) -> HAL_Type { py::gil_scoped_release release; return self.GetValue().type; }) - .def("__bool__", [](const hal::SimValue &self) -> bool { + .def("__bool__", [](const wpi::hal::SimValue &self) -> bool { return (bool)self; }) - .def("__repr__", [](const hal::SimValue &self) -> py::str { + .def("__repr__", [](const wpi::hal::SimValue &self) -> py::str { if (!self) { return ""; } @@ -258,10 +258,10 @@ inline_code: |2 }); cls_SimDevice - .def("__bool__", [](const hal::SimDevice &self) -> bool { + .def("__bool__", [](const wpi::hal::SimDevice &self) -> bool { return (bool)self; }) - .def_property_readonly("name", [](const hal::SimDevice &self) -> py::str { + .def_property_readonly("name", [](const wpi::hal::SimDevice &self) -> py::str { #ifdef __FRC_SYSTEMCORE__ return ""; #else @@ -277,7 +277,7 @@ inline_code: |2 } #endif }) - .def("__repr__", [](const hal::SimDevice &self) -> py::str { + .def("__repr__", [](const wpi::hal::SimDevice &self) -> py::str { #ifdef __FRC_SYSTEMCORE__ return ""; #else diff --git a/subprojects/robotpy-hal/semiwrap/simulation/DriverStationData.yml b/subprojects/robotpy-hal/semiwrap/simulation/DriverStationData.yml index 29b5a91ac..79f39480b 100644 --- a/subprojects/robotpy-hal/semiwrap/simulation/DriverStationData.yml +++ b/subprojects/robotpy-hal/semiwrap/simulation/DriverStationData.yml @@ -77,28 +77,23 @@ functions: HALSIM_SetJoystickAxis: HALSIM_SetJoystickPOV: HALSIM_SetJoystickButtonsValue: - HALSIM_SetJoystickAxisCount: - HALSIM_SetJoystickPOVCount: - HALSIM_SetJoystickButtonCount: - HALSIM_GetJoystickCounts: HALSIM_SetJoystickType: HALSIM_SetJoystickName: cpp_code: | [](int32_t stick, std::string_view sv) { - auto s = wpi::make_string(sv); + auto s = wpi::util::make_string(sv); HALSIM_SetJoystickName(stick, &s); } - HALSIM_SetJoystickAxisType: HALSIM_SetGameSpecificMessage: cpp_code: | [](std::string_view sv) { - auto s = wpi::make_string(sv); + auto s = wpi::util::make_string(sv); HALSIM_SetGameSpecificMessage(&s); } HALSIM_SetEventName: cpp_code: | [](std::string_view sv) { - auto s = wpi::make_string(sv); + auto s = wpi::util::make_string(sv); HALSIM_SetEventName(&s); } HALSIM_SetMatchType: @@ -111,3 +106,7 @@ functions: HALSIM_CancelDriverStationNewDataCallback: HALSIM_NotifyDriverStationNewData: HALSIM_SetJoystickIsGamepad: + HALSIM_SetJoystickAxesAvailable: + HALSIM_SetJoystickPOVsAvailable: + HALSIM_SetJoystickButtonsAvailable: + HALSIM_GetJoystickAvailables: diff --git a/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml b/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml index 8bf0f231b..e016fed57 100644 --- a/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml +++ b/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml @@ -57,14 +57,14 @@ functions: []() { WPI_String s; HALSIM_GetRoboRioSerialNumber(&s); - std::string ss(wpi::to_string_view(&s)); + std::string ss(wpi::util::to_string_view(&s)); WPI_FreeString(&s); return ss; } HALSIM_SetRoboRioSerialNumber: cpp_code: | [](std::string_view sv) { - auto s = wpi::make_string(sv); + auto s = wpi::util::make_string(sv); HALSIM_SetRoboRioSerialNumber(&s); } HALSIM_RegisterRoboRioCommentsCallback: @@ -78,14 +78,14 @@ functions: []() { WPI_String s; HALSIM_GetRoboRioComments(&s); - std::string ss(wpi::to_string_view(&s)); + std::string ss(wpi::util::to_string_view(&s)); WPI_FreeString(&s); return ss; } HALSIM_SetRoboRioComments: cpp_code: | [](std::string_view sv) { - auto s = wpi::make_string(sv); + auto s = wpi::util::make_string(sv); HALSIM_SetRoboRioComments(&s); } HALSIM_RegisterRoboRioAllCallbacks: diff --git a/subprojects/robotpy-hal/semiwrap/simulation/SimDeviceData.yml b/subprojects/robotpy-hal/semiwrap/simulation/SimDeviceData.yml index de6cf5b83..a20a28413 100644 --- a/subprojects/robotpy-hal/semiwrap/simulation/SimDeviceData.yml +++ b/subprojects/robotpy-hal/semiwrap/simulation/SimDeviceData.yml @@ -26,7 +26,7 @@ functions: param: ignore: true cpp_code: | - [](hal::SimDevice &simdevice, std::function fn, bool initialNotify) -> std::unique_ptr { + [](wpi::hal::SimDevice &simdevice, std::function fn, bool initialNotify) -> std::unique_ptr { auto cb = std::make_unique(fn, HALSIM_CancelSimDeviceCreatedCallback); auto uid = HALSIM_RegisterSimValueCreatedCallback(simdevice, cb.get(), [](const char* name, void* param, @@ -47,7 +47,7 @@ functions: param: ignore: true cpp_code: | - [](hal::SimValue &simvalue, std::function fn, bool initialNotify) -> std::unique_ptr { + [](wpi::hal::SimValue &simvalue, std::function fn, bool initialNotify) -> std::unique_ptr { auto cb = std::make_unique(fn, HALSIM_CancelSimValueChangedCallback); auto uid = HALSIM_RegisterSimValueChangedCallback(simvalue, cb.get(), [](const char* name, void* param, @@ -68,7 +68,7 @@ functions: param: ignore: true cpp_code: | - [](hal::SimValue &simvalue, std::function fn, bool initialNotify) -> std::unique_ptr { + [](wpi::hal::SimValue &simvalue, std::function fn, bool initialNotify) -> std::unique_ptr { auto cb = std::make_unique(fn, HALSIM_CancelSimValueResetCallback); auto uid = HALSIM_RegisterSimValueChangedCallback(simvalue, cb.get(), [](const char* name, void* param, diff --git a/subprojects/robotpy-native-apriltag/pyproject.toml b/subprojects/robotpy-native-apriltag/pyproject.toml index 967c986f2..ba1bded93 100644 --- a/subprojects/robotpy-native-apriltag/pyproject.toml +++ b/subprojects/robotpy-native-apriltag/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpimath==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpimath==0.0.0", ] [project] name = "robotpy-native-apriltag" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib AprilTag Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpimath==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpimath==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -26,7 +26,7 @@ packages = ["src/native"] artifact_id = "apriltag-cpp" group_id = "edu.wpi.first.apriltag" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/apriltag" libs = ["apriltag"] diff --git a/subprojects/robotpy-native-datalog/pyproject.toml b/subprojects/robotpy-native-datalog/pyproject.toml index 7888fb99f..c9c1e733a 100644 --- a/subprojects/robotpy-native-datalog/pyproject.toml +++ b/subprojects/robotpy-native-datalog/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-datalog" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Utility Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -25,7 +25,7 @@ packages = ["src/native"] artifact_id = "datalog-cpp" group_id = "edu.wpi.first.datalog" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/datalog" libs = ["datalog"] diff --git a/subprojects/robotpy-native-ntcore/pyproject.toml b/subprojects/robotpy-native-ntcore/pyproject.toml index ddf1420da..29d4792de 100644 --- a/subprojects/robotpy-native-ntcore/pyproject.toml +++ b/subprojects/robotpy-native-ntcore/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-native-datalog==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-datalog==0.0.0", ] [project] name = "robotpy-native-ntcore" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib NetworkTables Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-native-datalog==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-datalog==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -28,7 +28,7 @@ packages = ["src/native"] artifact_id = "ntcore-cpp" group_id = "edu.wpi.first.ntcore" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/ntcore" libs = ["ntcore"] diff --git a/subprojects/robotpy-native-romi/pyproject.toml b/subprojects/robotpy-native-romi/pyproject.toml index bc872821a..c3ef9dc83 100644 --- a/subprojects/robotpy-native-romi/pyproject.toml +++ b/subprojects/robotpy-native-romi/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", ] [project] name = "robotpy-native-romi" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Romi support library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "romiVendordep-cpp" group_id = "edu.wpi.first.romiVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/romi" libs = ["romiVendordep"] diff --git a/subprojects/robotpy-native-wpihal/pyproject.toml b/subprojects/robotpy-native-wpihal/pyproject.toml index 50c941534..1d8be210b 100644 --- a/subprojects/robotpy-native-wpihal/pyproject.toml +++ b/subprojects/robotpy-native-wpihal/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-ntcore==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-ntcore==0.0.0", ] [project] name = "robotpy-native-wpihal" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib HAL implementation" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-ntcore==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-ntcore==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -26,7 +26,7 @@ packages = ["src/native"] artifact_id = "hal-cpp" group_id = "edu.wpi.first.hal" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/wpihal" libs = ["wpiHal"] diff --git a/subprojects/robotpy-native-wpilib/pyproject.toml b/subprojects/robotpy-native-wpilib/pyproject.toml index 8a26deca7..852e1c70a 100644 --- a/subprojects/robotpy-native-wpilib/pyproject.toml +++ b/subprojects/robotpy-native-wpilib/pyproject.toml @@ -4,25 +4,25 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-native-ntcore==2027.0.0a3", - "robotpy-native-wpimath==2027.0.0a3", - "robotpy-native-wpihal==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpihal==0.0.0", ] [project] name = "robotpy-native-wpilib" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Robotics Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-native-ntcore==2027.0.0a3", - "robotpy-native-wpimath==2027.0.0a3", - "robotpy-native-wpihal==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpihal==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -32,7 +32,7 @@ packages = ["src/native"] artifact_id = "wpilibc-cpp" group_id = "edu.wpi.first.wpilibc" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/wpilib" libs = ["wpilibc"] diff --git a/subprojects/robotpy-native-wpimath/pyproject.toml b/subprojects/robotpy-native-wpimath/pyproject.toml index 1f8f073a8..eb5b45b66 100644 --- a/subprojects/robotpy-native-wpimath/pyproject.toml +++ b/subprojects/robotpy-native-wpimath/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-wpimath" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Math Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "wpimath-cpp" group_id = "edu.wpi.first.wpimath" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/wpimath" libs = ["wpimath"] diff --git a/subprojects/robotpy-native-wpinet/pyproject.toml b/subprojects/robotpy-native-wpinet/pyproject.toml index b6c7311aa..0c771c4fd 100644 --- a/subprojects/robotpy-native-wpinet/pyproject.toml +++ b/subprojects/robotpy-native-wpinet/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-wpinet" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Networking Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "wpinet-cpp" group_id = "edu.wpi.first.wpinet" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/wpinet" libs = ["wpinet"] diff --git a/subprojects/robotpy-native-wpiutil/pyproject.toml b/subprojects/robotpy-native-wpiutil/pyproject.toml index bc556453d..9459ef83a 100644 --- a/subprojects/robotpy-native-wpiutil/pyproject.toml +++ b/subprojects/robotpy-native-wpiutil/pyproject.toml @@ -8,7 +8,7 @@ requires = [ [project] name = "robotpy-native-wpiutil" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib Utility Library" license = "BSD-3-Clause" @@ -23,7 +23,7 @@ packages = ["src/native"] artifact_id = "wpiutil-cpp" group_id = "edu.wpi.first.wpiutil" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/wpiutil" libs = ["wpiutil"] diff --git a/subprojects/robotpy-native-xrp/pyproject.toml b/subprojects/robotpy-native-xrp/pyproject.toml index 35c9eaefb..c073a9e8a 100644 --- a/subprojects/robotpy-native-xrp/pyproject.toml +++ b/subprojects/robotpy-native-xrp/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", ] [project] name = "robotpy-native-xrp" -version = "2027.0.0a3" +version = "0.0.0" description = "WPILib XRP vendor library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "xrpVendordep-cpp" group_id = "edu.wpi.first.xrpVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" extract_to = "src/native/xrp" libs = ["xrpVendordep"] diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index aff7014dd..3ebd3cce3 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-romi==2027.0.0a3", - "wpilib==2027.0.0a3", + "robotpy-native-romi==0.0.0", + "wpilib==0.0.0", ] [project] name = "robotpy-romi" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for WPILib Romi Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-romi==2027.0.0a3", - "wpilib==2027.0.0a3" + "robotpy-native-romi==0.0.0", + "wpilib==0.0.0" ] [project.urls] @@ -50,6 +50,6 @@ depends = [ [tool.semiwrap.extension_modules."romi._romi".headers] # frc/romi -OnBoardIO = "frc/romi/OnBoardIO.h" -RomiGyro = "frc/romi/RomiGyro.h" -RomiMotor = "frc/romi/RomiMotor.h" +OnBoardIO = "wpi/romi/OnBoardIO.hpp" +RomiGyro = "wpi/romi/RomiGyro.hpp" +RomiMotor = "wpi/romi/RomiMotor.hpp" diff --git a/subprojects/robotpy-romi/semiwrap/OnBoardIO.yml b/subprojects/robotpy-romi/semiwrap/OnBoardIO.yml index 53fea27ab..12c28b571 100644 --- a/subprojects/robotpy-romi/semiwrap/OnBoardIO.yml +++ b/subprojects/robotpy-romi/semiwrap/OnBoardIO.yml @@ -1,5 +1,5 @@ classes: - frc::OnBoardIO: + wpi::romi::OnBoardIO: attributes: kMessageInterval: m_nextMessageTime: diff --git a/subprojects/robotpy-romi/semiwrap/RomiGyro.yml b/subprojects/robotpy-romi/semiwrap/RomiGyro.yml index 4544bd5fd..54092d557 100644 --- a/subprojects/robotpy-romi/semiwrap/RomiGyro.yml +++ b/subprojects/robotpy-romi/semiwrap/RomiGyro.yml @@ -1,5 +1,5 @@ classes: - frc::RomiGyro: + wpi::romi::RomiGyro: methods: RomiGyro: GetAngle: diff --git a/subprojects/robotpy-romi/semiwrap/RomiMotor.yml b/subprojects/robotpy-romi/semiwrap/RomiMotor.yml index b75fa2c5a..22af2f09a 100644 --- a/subprojects/robotpy-romi/semiwrap/RomiMotor.yml +++ b/subprojects/robotpy-romi/semiwrap/RomiMotor.yml @@ -1,4 +1,4 @@ classes: - frc::RomiMotor: + wpi::romi::RomiMotor: methods: RomiMotor: diff --git a/subprojects/robotpy-wpilib/README.md b/subprojects/robotpy-wpilib/README.md index 60d7ec679..22a8387ea 100644 --- a/subprojects/robotpy-wpilib/README.md +++ b/subprojects/robotpy-wpilib/README.md @@ -2,11 +2,11 @@ RobotPy WPILib ============== This repository contain a python implementation of wrappers for WPILib, -the library used to interface with hardware for the FIRST Robotics Competition. +the library used to interface with hardware for the FIRST Robotics Competition. Teams can use this library to write their robot code in Python, a powerful dynamic programming language. -**Note**: RobotPy is officially supported by FIRST. Please see the +**Note**: RobotPy is officially supported by FIRST. Please see the [FAQ](https://robotpy.github.io/faq/) for more information. Documentation diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 0294c77d7..99afb6cb8 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -5,27 +5,27 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpilib==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpimath==2027.0.0a3", - "robotpy-hal==2027.0.0a3", - "pyntcore==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", + "robotpy-hal==0.0.0", + "pyntcore==0.0.0", ] [project] name = "wpilib" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC WPILib" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", - "robotpy-wpimath==2027.0.0a3", - "robotpy-hal==2027.0.0a3", - "pyntcore==2027.0.0a3", + "robotpy-native-wpilib==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", + "robotpy-hal==0.0.0", + "pyntcore==0.0.0", "robotpy-cli~=2027.0.0a1" ] @@ -58,19 +58,16 @@ update_init = [ "wpilib.sysid wpilib._wpilib.sysid", ] scan_headers_ignore = [ - "WPILibVersion.h", + "wpi/system/WPILibVersion.hpp", - # needs a python wrapper - "frc/AsynchronousInterrupt.h", + "wpi/system/Filesystem.hpp", + "wpi/system/Notifier.hpp", # wrapped separately + "wpi/system/Resource.hpp", + "wpi/system/ScopedTracer.hpp", # not useful for python - "frc/Filesystem.h", - "frc/Notifier.h", # wrapped separately - "frc/Resource.h", - "frc/ScopedTracer.h", # not useful for python + "wpi/hardware/motor/MotorControllerGroup.hpp", # wrapped separately - "frc/motorcontrol/MotorControllerGroup.h", # wrapped separately - - "frc/smartdashboard/ListenerExecutor.h", # internal detail + "wpi/smartdashboard/ListenerExecutor.hpp", # internal detail # Internals "rpy/ControlWord.h", @@ -91,107 +88,132 @@ includes = ["wpilib/src"] DYNAMIC_CAMERA_SERVER = 1 [tool.semiwrap.extension_modules."wpilib._wpilib".headers] -# frc -ADXL345_I2C = "frc/ADXL345_I2C.h" -AddressableLED = "frc/AddressableLED.h" -Alert = "frc/Alert.h" -AnalogAccelerometer = "frc/AnalogAccelerometer.h" -AnalogEncoder = "frc/AnalogEncoder.h" -AnalogInput = "frc/AnalogInput.h" -AnalogPotentiometer = "frc/AnalogPotentiometer.h" -CAN = "frc/CAN.h" -Compressor = "frc/Compressor.h" -CompressorConfigType = "frc/CompressorConfigType.h" -DataLogManager = "frc/DataLogManager.h" -DSControlWord = "frc/DSControlWord.h" -DigitalInput = "frc/DigitalInput.h" -DigitalOutput = "frc/DigitalOutput.h" -DoubleSolenoid = "frc/DoubleSolenoid.h" -DriverStation = "frc/DriverStation.h" -DutyCycle = "frc/DutyCycle.h" -DutyCycleEncoder = "frc/DutyCycleEncoder.h" -Encoder = "frc/Encoder.h" -Errors = "frc/Errors.h" +# rpy Filesystem = "rpy/Filesystem.h" -I2C = "frc/I2C.h" -IterativeRobotBase = "frc/IterativeRobotBase.h" -Joystick = "frc/Joystick.h" -LEDPattern = "frc/LEDPattern.h" -MotorSafety = "frc/MotorSafety.h" -Notifier = "rpy/Notifier.h" -OnboardIMU = "frc/OnboardIMU.h" -PS4Controller = "frc/PS4Controller.h" -PS5Controller = "frc/PS5Controller.h" -PWM = "frc/PWM.h" -PneumaticHub = "frc/PneumaticHub.h" -PneumaticsBase = "frc/PneumaticsBase.h" -PneumaticsControlModule = "frc/PneumaticsControlModule.h" -PneumaticsModuleType = "frc/PneumaticsModuleType.h" -PowerDistribution = "frc/PowerDistribution.h" -Preferences = "frc/Preferences.h" -RobotBase = "frc/RobotBase.h" -RobotController = "frc/RobotController.h" -RobotState = "frc/RobotState.h" -RuntimeType = "frc/RuntimeType.h" -SensorUtil = "frc/SensorUtil.h" -SerialPort = "frc/SerialPort.h" -SharpIR = "frc/SharpIR.h" -Solenoid = "frc/Solenoid.h" -StadiaController = "frc/StadiaController.h" -SystemServer = "frc/SystemServer.h" -Threads = "frc/Threads.h" -TimedRobot = "frc/TimedRobot.h" -Timer = "frc/Timer.h" -TimesliceRobot = "frc/TimesliceRobot.h" -Tracer = "frc/Tracer.h" -Watchdog = "frc/Watchdog.h" -XboxController = "frc/XboxController.h" - -# frc (interfaces) -CounterBase = "frc/CounterBase.h" -GenericHID = "frc/GenericHID.h" -MotorController = "frc/motorcontrol/MotorController.h" - -# frc/internal -DriverStationModeThread = "frc/internal/DriverStationModeThread.h" - -# frc/motorcontrol -DMC60 = "frc/motorcontrol/DMC60.h" -Jaguar = "frc/motorcontrol/Jaguar.h" -Koors40 = "frc/motorcontrol/Koors40.h" MotorControllerGroup = "rpy/MotorControllerGroup.h" -PWMMotorController = "frc/motorcontrol/PWMMotorController.h" -PWMSparkFlex = "frc/motorcontrol/PWMSparkFlex.h" -PWMSparkMax = "frc/motorcontrol/PWMSparkMax.h" -PWMTalonFX = "frc/motorcontrol/PWMTalonFX.h" -PWMTalonSRX = "frc/motorcontrol/PWMTalonSRX.h" -PWMVenom = "frc/motorcontrol/PWMVenom.h" -PWMVictorSPX = "frc/motorcontrol/PWMVictorSPX.h" -SD540 = "frc/motorcontrol/SD540.h" -Spark = "frc/motorcontrol/Spark.h" -SparkMini = "frc/motorcontrol/SparkMini.h" -Talon = "frc/motorcontrol/Talon.h" -Victor = "frc/motorcontrol/Victor.h" -VictorSP = "frc/motorcontrol/VictorSP.h" - -# frc/smartdashboard -Field2d = "frc/smartdashboard/Field2d.h" -FieldObject2d = "frc/smartdashboard/FieldObject2d.h" -Mechanism2d = "frc/smartdashboard/Mechanism2d.h" -MechanismLigament2d = "frc/smartdashboard/MechanismLigament2d.h" -MechanismObject2d = "frc/smartdashboard/MechanismObject2d.h" -MechanismRoot2d = "frc/smartdashboard/MechanismRoot2d.h" -SendableBuilderImpl = "frc/smartdashboard/SendableBuilderImpl.h" -SendableChooser = "frc/smartdashboard/SendableChooser.h" -SendableChooserBase = "frc/smartdashboard/SendableChooserBase.h" -SmartDashboard = "frc/smartdashboard/SmartDashboard.h" - -# frc/sysid -SysIdRoutineLog = "frc/sysid/SysIdRoutineLog.h" - -# frc/util -Color = "frc/util/Color.h" -Color8Bit = "frc/util/Color8Bit.h" +Notifier = "rpy/Notifier.h" + +# wpi +ExpansionHub = "wpi/ExpansionHub.hpp" +ExpansionHubMotor = "wpi/ExpansionHubMotor.hpp" +ExpansionHubPidConstants = "wpi/ExpansionHubPidConstants.hpp" +ExpansionHubServo = "wpi/ExpansionHubServo.hpp" + +# wpi/driverstation +DSControlWord = "wpi/driverstation/DSControlWord.hpp" +DriverStation = "wpi/driverstation/DriverStation.hpp" +Gamepad = "wpi/driverstation/Gamepad.hpp" +GenericHID = "wpi/driverstation/GenericHID.hpp" +Joystick = "wpi/driverstation/Joystick.hpp" +PS4Controller = "wpi/driverstation/PS4Controller.hpp" +PS5Controller = "wpi/driverstation/PS5Controller.hpp" +StadiaController = "wpi/driverstation/StadiaController.hpp" +XboxController = "wpi/driverstation/XboxController.hpp" + +# wpi/framework +IterativeRobotBase = "wpi/framework/IterativeRobotBase.hpp" +RobotBase = "wpi/framework/RobotBase.hpp" +RobotState = "wpi/framework/RobotState.hpp" +TimedRobot = "wpi/framework/TimedRobot.hpp" +TimesliceRobot = "wpi/framework/TimesliceRobot.hpp" + +# wpi/hardware/accelerometer +ADXL345_I2C = "wpi/hardware/accelerometer/ADXL345_I2C.hpp" +AnalogAccelerometer = "wpi/hardware/accelerometer/AnalogAccelerometer.hpp" + +# wpi/hardware/bus +CAN = "wpi/hardware/bus/CAN.hpp" +I2C = "wpi/hardware/bus/I2C.hpp" +SerialPort = "wpi/hardware/bus/SerialPort.hpp" + +# wpi/hardware/discrete +AnalogInput = "wpi/hardware/discrete/AnalogInput.hpp" +CounterBase = "wpi/hardware/discrete/CounterBase.hpp" +DigitalInput = "wpi/hardware/discrete/DigitalInput.hpp" +DigitalOutput = "wpi/hardware/discrete/DigitalOutput.hpp" +PWM = "wpi/hardware/discrete/PWM.hpp" + +# wpi/hardware/imu +OnboardIMU = "wpi/hardware/imu/OnboardIMU.hpp" + +# wpi/hardware/led +AddressableLED = "wpi/hardware/led/AddressableLED.hpp" +LEDPattern = "wpi/hardware/led/LEDPattern.hpp" + +# wpi/hardware/motor +Koors40 = "wpi/hardware/motor/Koors40.hpp" +MotorController = "wpi/hardware/motor/MotorController.hpp" +MotorSafety = "wpi/hardware/motor/MotorSafety.hpp" +PWMMotorController = "wpi/hardware/motor/PWMMotorController.hpp" +PWMSparkFlex = "wpi/hardware/motor/PWMSparkFlex.hpp" +PWMSparkMax = "wpi/hardware/motor/PWMSparkMax.hpp" +PWMTalonFX = "wpi/hardware/motor/PWMTalonFX.hpp" +PWMTalonSRX = "wpi/hardware/motor/PWMTalonSRX.hpp" +PWMVenom = "wpi/hardware/motor/PWMVenom.hpp" +PWMVictorSPX = "wpi/hardware/motor/PWMVictorSPX.hpp" +Spark = "wpi/hardware/motor/Spark.hpp" +SparkMini = "wpi/hardware/motor/SparkMini.hpp" +Talon = "wpi/hardware/motor/Talon.hpp" +VictorSP = "wpi/hardware/motor/VictorSP.hpp" + +# wpi/hardware/pneumatic +Compressor = "wpi/hardware/pneumatic/Compressor.hpp" +CompressorConfigType = "wpi/hardware/pneumatic/CompressorConfigType.hpp" +DoubleSolenoid = "wpi/hardware/pneumatic/DoubleSolenoid.hpp" +PneumaticHub = "wpi/hardware/pneumatic/PneumaticHub.hpp" +PneumaticsBase = "wpi/hardware/pneumatic/PneumaticsBase.hpp" +PneumaticsControlModule = "wpi/hardware/pneumatic/PneumaticsControlModule.hpp" +PneumaticsModuleType = "wpi/hardware/pneumatic/PneumaticsModuleType.hpp" +Solenoid = "wpi/hardware/pneumatic/Solenoid.hpp" + +# wpi/hardware/power +PowerDistribution = "wpi/hardware/power/PowerDistribution.hpp" + +# wpi/hardware/range +SharpIR = "wpi/hardware/range/SharpIR.hpp" + +# wpi/hardware/rotation +AnalogEncoder = "wpi/hardware/rotation/AnalogEncoder.hpp" +AnalogPotentiometer = "wpi/hardware/rotation/AnalogPotentiometer.hpp" +DutyCycle = "wpi/hardware/rotation/DutyCycle.hpp" +DutyCycleEncoder = "wpi/hardware/rotation/DutyCycleEncoder.hpp" +Encoder = "wpi/hardware/rotation/Encoder.hpp" + +# wpi/internal +DriverStationModeThread = "wpi/internal/DriverStationModeThread.hpp" + +# wpi/smartdashboard +Field2d = "wpi/smartdashboard/Field2d.hpp" +FieldObject2d = "wpi/smartdashboard/FieldObject2d.hpp" +Mechanism2d = "wpi/smartdashboard/Mechanism2d.hpp" +MechanismLigament2d = "wpi/smartdashboard/MechanismLigament2d.hpp" +MechanismObject2d = "wpi/smartdashboard/MechanismObject2d.hpp" +MechanismRoot2d = "wpi/smartdashboard/MechanismRoot2d.hpp" +SendableBuilderImpl = "wpi/smartdashboard/SendableBuilderImpl.hpp" +SendableChooser = "wpi/smartdashboard/SendableChooser.hpp" +SendableChooserBase = "wpi/smartdashboard/SendableChooserBase.hpp" +SmartDashboard = "wpi/smartdashboard/SmartDashboard.hpp" + +# wpi/sysid +SysIdRoutineLog = "wpi/sysid/SysIdRoutineLog.hpp" + +# wpi/system +DataLogManager = "wpi/system/DataLogManager.hpp" +Errors = "wpi/system/Errors.hpp" +RobotController = "wpi/system/RobotController.hpp" +RuntimeType = "wpi/system/RuntimeType.hpp" +SystemServer = "wpi/system/SystemServer.hpp" +Threads = "wpi/system/Threads.hpp" +Timer = "wpi/system/Timer.hpp" +Tracer = "wpi/system/Tracer.hpp" +Watchdog = "wpi/system/Watchdog.hpp" + +# wpi/util +Alert = "wpi/util/Alert.hpp" +Color = "wpi/util/Color.hpp" +Color8Bit = "wpi/util/Color8Bit.hpp" +Preferences = "wpi/util/Preferences.hpp" +SensorUtil = "wpi/util/SensorUtil.hpp" [tool.semiwrap.extension_modules."wpilib.counter._counter"] @@ -201,10 +223,10 @@ depends = ["wpilib"] yaml_path = "semiwrap/counter" [tool.semiwrap.extension_modules."wpilib.counter._counter".headers] -# frc/counter -EdgeConfiguration = "frc/counter/EdgeConfiguration.h" -Tachometer = "frc/counter/Tachometer.h" -UpDownCounter = "frc/counter/UpDownCounter.h" +# wpi/counter +EdgeConfiguration = "wpi/counter/EdgeConfiguration.hpp" +Tachometer = "wpi/counter/Tachometer.hpp" +UpDownCounter = "wpi/counter/UpDownCounter.hpp" [tool.semiwrap.extension_modules."wpilib.drive._drive"] @@ -214,10 +236,10 @@ depends = ["wpilib"] yaml_path = "semiwrap/drive" [tool.semiwrap.extension_modules."wpilib.drive._drive".headers] -# frc/drive -DifferentialDrive = "frc/drive/DifferentialDrive.h" -MecanumDrive = "frc/drive/MecanumDrive.h" -RobotDriveBase = "frc/drive/RobotDriveBase.h" +# wpi/drive +DifferentialDrive = "wpi/drive/DifferentialDrive.hpp" +MecanumDrive = "wpi/drive/MecanumDrive.hpp" +RobotDriveBase = "wpi/drive/RobotDriveBase.hpp" [tool.semiwrap.extension_modules."wpilib.event._event"] @@ -228,10 +250,10 @@ depends = ["wpimath_filter"] yaml_path = "semiwrap/event" [tool.semiwrap.extension_modules."wpilib.event._event".headers] -# frc/event -BooleanEvent = "frc/event/BooleanEvent.h" -EventLoop = "frc/event/EventLoop.h" -NetworkBooleanEvent = "frc/event/NetworkBooleanEvent.h" +# wpi/event +BooleanEvent = "wpi/event/BooleanEvent.hpp" +EventLoop = "wpi/event/EventLoop.hpp" +NetworkBooleanEvent = "wpi/event/NetworkBooleanEvent.hpp" [tool.semiwrap.extension_modules."wpilib.simulation._simulation"] @@ -241,41 +263,42 @@ depends = ["wpilib", "wpimath_controls", "wpimath_geometry", "wpimath_kinematics yaml_path = "semiwrap/simulation" [tool.semiwrap.extension_modules."wpilib.simulation._simulation".headers] -# frc/simulation -ADXL345Sim = "frc/simulation/ADXL345Sim.h" -AddressableLEDSim = "frc/simulation/AddressableLEDSim.h" -AnalogEncoderSim = "frc/simulation/AnalogEncoderSim.h" -AnalogInputSim = "frc/simulation/AnalogInputSim.h" -BatterySim = "frc/simulation/BatterySim.h" -CTREPCMSim = "frc/simulation/CTREPCMSim.h" -CallbackStore = "frc/simulation/CallbackStore.h" -DCMotorSim = "frc/simulation/DCMotorSim.h" -DIOSim = "frc/simulation/DIOSim.h" -DifferentialDrivetrainSim = "frc/simulation/DifferentialDrivetrainSim.h" -DigitalPWMSim = "frc/simulation/DigitalPWMSim.h" -DoubleSolenoidSim = "frc/simulation/DoubleSolenoidSim.h" -DriverStationSim = "frc/simulation/DriverStationSim.h" -DutyCycleEncoderSim = "frc/simulation/DutyCycleEncoderSim.h" -DutyCycleSim = "frc/simulation/DutyCycleSim.h" -ElevatorSim = "frc/simulation/ElevatorSim.h" -EncoderSim = "frc/simulation/EncoderSim.h" -FlywheelSim = "frc/simulation/FlywheelSim.h" -GenericHIDSim = "frc/simulation/GenericHIDSim.h" -JoystickSim = "frc/simulation/JoystickSim.h" -LinearSystemSim = "frc/simulation/LinearSystemSim.h" -PS4ControllerSim = "frc/simulation/PS4ControllerSim.h" -PS5ControllerSim = "frc/simulation/PS5ControllerSim.h" -PWMSim = "frc/simulation/PWMSim.h" -PneumaticsBaseSim = "frc/simulation/PneumaticsBaseSim.h" -PowerDistributionSim = "frc/simulation/PowerDistributionSim.h" -PWMMotorControllerSim = "frc/simulation/PWMMotorControllerSim.h" -REVPHSim = "frc/simulation/REVPHSim.h" -RoboRioSim = "frc/simulation/RoboRioSim.h" -SendableChooserSim = "frc/simulation/SendableChooserSim.h" -SharpIRSim = "frc/simulation/SharpIRSim.h" -SimDeviceSim = "frc/simulation/SimDeviceSim.h" -SimHooks = "frc/simulation/SimHooks.h" -SingleJointedArmSim = "frc/simulation/SingleJointedArmSim.h" -SolenoidSim = "frc/simulation/SolenoidSim.h" -StadiaControllerSim = "frc/simulation/StadiaControllerSim.h" -XboxControllerSim = "frc/simulation/XboxControllerSim.h" +# wpi/simulation +ADXL345Sim = "wpi/simulation/ADXL345Sim.hpp" +AddressableLEDSim = "wpi/simulation/AddressableLEDSim.hpp" +AnalogEncoderSim = "wpi/simulation/AnalogEncoderSim.hpp" +AnalogInputSim = "wpi/simulation/AnalogInputSim.hpp" +BatterySim = "wpi/simulation/BatterySim.hpp" +CTREPCMSim = "wpi/simulation/CTREPCMSim.hpp" +CallbackStore = "wpi/simulation/CallbackStore.hpp" +DCMotorSim = "wpi/simulation/DCMotorSim.hpp" +DIOSim = "wpi/simulation/DIOSim.hpp" +DifferentialDrivetrainSim = "wpi/simulation/DifferentialDrivetrainSim.hpp" +DigitalPWMSim = "wpi/simulation/DigitalPWMSim.hpp" +DoubleSolenoidSim = "wpi/simulation/DoubleSolenoidSim.hpp" +DriverStationSim = "wpi/simulation/DriverStationSim.hpp" +DutyCycleEncoderSim = "wpi/simulation/DutyCycleEncoderSim.hpp" +DutyCycleSim = "wpi/simulation/DutyCycleSim.hpp" +ElevatorSim = "wpi/simulation/ElevatorSim.hpp" +EncoderSim = "wpi/simulation/EncoderSim.hpp" +FlywheelSim = "wpi/simulation/FlywheelSim.hpp" +GamepadSim = "wpi/simulation/GamepadSim.hpp" +GenericHIDSim = "wpi/simulation/GenericHIDSim.hpp" +JoystickSim = "wpi/simulation/JoystickSim.hpp" +LinearSystemSim = "wpi/simulation/LinearSystemSim.hpp" +PS4ControllerSim = "wpi/simulation/PS4ControllerSim.hpp" +PS5ControllerSim = "wpi/simulation/PS5ControllerSim.hpp" +PWMSim = "wpi/simulation/PWMSim.hpp" +PneumaticsBaseSim = "wpi/simulation/PneumaticsBaseSim.hpp" +PowerDistributionSim = "wpi/simulation/PowerDistributionSim.hpp" +PWMMotorControllerSim = "wpi/simulation/PWMMotorControllerSim.hpp" +REVPHSim = "wpi/simulation/REVPHSim.hpp" +RoboRioSim = "wpi/simulation/RoboRioSim.hpp" +SendableChooserSim = "wpi/simulation/SendableChooserSim.hpp" +SharpIRSim = "wpi/simulation/SharpIRSim.hpp" +SimDeviceSim = "wpi/simulation/SimDeviceSim.hpp" +SimHooks = "wpi/simulation/SimHooks.hpp" +SingleJointedArmSim = "wpi/simulation/SingleJointedArmSim.hpp" +SolenoidSim = "wpi/simulation/SolenoidSim.hpp" +StadiaControllerSim = "wpi/simulation/StadiaControllerSim.hpp" +XboxControllerSim = "wpi/simulation/XboxControllerSim.hpp" diff --git a/subprojects/robotpy-wpilib/semiwrap/ADXL345_I2C.yml b/subprojects/robotpy-wpilib/semiwrap/ADXL345_I2C.yml index b15ef94b4..bbbb9d80c 100644 --- a/subprojects/robotpy-wpilib/semiwrap/ADXL345_I2C.yml +++ b/subprojects/robotpy-wpilib/semiwrap/ADXL345_I2C.yml @@ -1,12 +1,12 @@ extra_includes: -- networktables/NTSendableBuilder.h +- wpi/nt/NTSendableBuilder.hpp classes: - frc::ADXL345_I2C: + wpi::ADXL345_I2C: constants: - - frc::ADXL345_I2C::Range::kRange_2G + - wpi::ADXL345_I2C::Range::kRange_2G ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper enums: Axes: Range: @@ -23,7 +23,7 @@ classes: GetAcceleration: GetAccelerations: InitSendable: - frc::ADXL345_I2C::AllAxes: + wpi::ADXL345_I2C::AllAxes: attributes: XAxis: YAxis: diff --git a/subprojects/robotpy-wpilib/semiwrap/AddressableLED.yml b/subprojects/robotpy-wpilib/semiwrap/AddressableLED.yml index 9e9d79809..7c77d2c1e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AddressableLED.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AddressableLED.yml @@ -3,7 +3,7 @@ functions: ignore: true classes: - frc::AddressableLED: + wpi::AddressableLED: methods: AddressableLED: SetLength: @@ -19,7 +19,7 @@ classes: SetGlobalData: enums: ColorOrder: - frc::AddressableLED::LEDData: + wpi::AddressableLED::LEDData: force_no_trampoline: true base_qualnames: HAL_AddressableLEDData: ::HAL_AddressableLEDData diff --git a/subprojects/robotpy-wpilib/semiwrap/Alert.yml b/subprojects/robotpy-wpilib/semiwrap/Alert.yml index c37f3ca12..f98b7e12b 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Alert.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Alert.yml @@ -3,7 +3,7 @@ functions: ignore: true classes: - frc::Alert: + wpi::Alert: enums: AlertType: methods: @@ -17,14 +17,14 @@ classes: GetText: GetType: inline_code: | - .def("close", [](frc::Alert &self) { + .def("close", [](wpi::Alert &self) { py::gil_scoped_release release; self.Set(false); }, py::doc("Disables the alert")) - .def("__enter__", [](frc::Alert &self) -> frc::Alert& { + .def("__enter__", [](wpi::Alert &self) -> wpi::Alert& { return self; }) - .def("__exit__", [](frc::Alert &self, py::args args) { + .def("__exit__", [](wpi::Alert &self, py::args args) { py::gil_scoped_release release; self.Set(false); }) diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogAccelerometer.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogAccelerometer.yml index 880c3d981..e3542e086 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogAccelerometer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AnalogAccelerometer.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::AnalogAccelerometer: + wpi::AnalogAccelerometer: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: AnalogAccelerometer: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogEncoder.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogEncoder.yml index c232227c4..ac16eb133 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogEncoder.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AnalogEncoder.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/AnalogInput.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/discrete/AnalogInput.hpp classes: - frc::AnalogEncoder: + wpi::AnalogEncoder: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: AnalogEncoder: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml index fe5a4112a..043bede9a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::AnalogInput: + wpi::AnalogInput: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: AnalogInput: GetValue: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogPotentiometer.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogPotentiometer.yml index 620d21047..d77aac548 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogPotentiometer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AnalogPotentiometer.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::AnalogPotentiometer: + wpi::AnalogPotentiometer: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: AnalogPotentiometer: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/CAN.yml b/subprojects/robotpy-wpilib/semiwrap/CAN.yml index da8247de3..d6e25a6b7 100644 --- a/subprojects/robotpy-wpilib/semiwrap/CAN.yml +++ b/subprojects/robotpy-wpilib/semiwrap/CAN.yml @@ -1,5 +1,5 @@ classes: - frc::CAN: + wpi::CAN: attributes: kTeamManufacturer: kTeamDeviceType: diff --git a/subprojects/robotpy-wpilib/semiwrap/Color.yml b/subprojects/robotpy-wpilib/semiwrap/Color.yml index 450a6016f..f21d8d412 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Color.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Color.yml @@ -2,9 +2,9 @@ extra_includes: - pybind11/operators.h classes: - frc::Color: + wpi::Color: force_type_casters: - - wpi::ct_string + - wpi::util::ct_string attributes: kDenim: kFirstBlue: diff --git a/subprojects/robotpy-wpilib/semiwrap/Color8Bit.yml b/subprojects/robotpy-wpilib/semiwrap/Color8Bit.yml index 1c29743cb..bebd9c3a0 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Color8Bit.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Color8Bit.yml @@ -2,9 +2,9 @@ extra_includes: - pybind11/operators.h classes: - frc::Color8Bit: + wpi::Color8Bit: force_type_casters: - - wpi::ct_string + - wpi::util::ct_string attributes: red: access: readonly @@ -32,7 +32,7 @@ classes: inline_code: | cls_Color8Bit - .def("toColor", [](const Color8Bit &self) -> frc::Color { + .def("toColor", [](const Color8Bit &self) -> wpi::Color { return self; }) .def("__hash__", [](Color8Bit *self) -> size_t { diff --git a/subprojects/robotpy-wpilib/semiwrap/Compressor.yml b/subprojects/robotpy-wpilib/semiwrap/Compressor.yml index 5a2fab0e6..c5faad234 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Compressor.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Compressor.yml @@ -1,13 +1,13 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/Compressor.h -- frc/Solenoid.h -- frc/DoubleSolenoid.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/pneumatic/Compressor.hpp +- wpi/hardware/pneumatic/Solenoid.hpp +- wpi/hardware/pneumatic/DoubleSolenoid.hpp classes: - frc::Compressor: + wpi::Compressor: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: Compressor: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml b/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml index 94929e183..bb857f6b2 100644 --- a/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/CounterBase.yml @@ -2,7 +2,7 @@ defaults: subpackage: interfaces classes: - frc::CounterBase: + wpi::CounterBase: enums: EncodingType: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/DMC60.yml b/subprojects/robotpy-wpilib/semiwrap/DMC60.yml deleted file mode 100644 index 4adbfcadc..000000000 --- a/subprojects/robotpy-wpilib/semiwrap/DMC60.yml +++ /dev/null @@ -1,7 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::DMC60: - methods: - DMC60: diff --git a/subprojects/robotpy-wpilib/semiwrap/DSControlWord.yml b/subprojects/robotpy-wpilib/semiwrap/DSControlWord.yml index 2b34b2abe..39b5343d5 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DSControlWord.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DSControlWord.yml @@ -1,5 +1,5 @@ classes: - frc::DSControlWord: + wpi::DSControlWord: methods: DSControlWord: IsEnabled: diff --git a/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml b/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml index 3987d7fc8..930f6cbc3 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml @@ -1,8 +1,8 @@ extra_includes: -- wpi/datalog/DataLog.h +- wpi/datalog/DataLog.hpp classes: - frc::DataLogManager: + wpi::DataLogManager: methods: Start: Stop: diff --git a/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml b/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml index 9d789fc40..be9158ca8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::DigitalInput: + wpi::DigitalInput: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: DigitalInput: Get: diff --git a/subprojects/robotpy-wpilib/semiwrap/DigitalOutput.yml b/subprojects/robotpy-wpilib/semiwrap/DigitalOutput.yml index 4a69d8ff5..448e7c972 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DigitalOutput.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DigitalOutput.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::DigitalOutput: + wpi::DigitalOutput: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: DigitalOutput: Set: diff --git a/subprojects/robotpy-wpilib/semiwrap/DoubleSolenoid.yml b/subprojects/robotpy-wpilib/semiwrap/DoubleSolenoid.yml index 07a2b608a..e36d1054e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DoubleSolenoid.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DoubleSolenoid.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::DoubleSolenoid: + wpi::DoubleSolenoid: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper enums: Value: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml b/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml index 27a909108..8020d6a5d 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml @@ -1,9 +1,9 @@ extra_includes: - rpy/ControlWord.h -- wpi/datalog/DataLog.h +- wpi/datalog/DataLog.hpp classes: - frc::DriverStation: + wpi::DriverStation: attributes: kJoystickPorts: enums: @@ -17,12 +17,8 @@ classes: GetStickAxis: GetStickPOV: GetStickButtons: - GetStickAxisCount: - GetStickPOVCount: - GetStickButtonCount: GetJoystickType: GetJoystickName: - GetJoystickAxisType: IsJoystickConnected: IsEnabled: IsDisabled: @@ -52,6 +48,14 @@ classes: StartDataLog: GetAngle: GetJoystickIsGamepad: + GetStickButtonIfAvailable: + GetStickAxisIfAvailable: + GetStickAxesMaximumIndex: + GetStickAxesAvailable: + GetStickPOVsMaximumIndex: + GetStickPOVsAvailable: + GetStickButtonsMaximumIndex: + GetStickButtonsAvailable: inline_code: | .def("getControlState", [](DriverStation *self) -> std::tuple { diff --git a/subprojects/robotpy-wpilib/semiwrap/DriverStationModeThread.yml b/subprojects/robotpy-wpilib/semiwrap/DriverStationModeThread.yml index 3fc8e6823..7ec1c6704 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DriverStationModeThread.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DriverStationModeThread.yml @@ -1,5 +1,5 @@ classes: - frc::internal::DriverStationModeThread: + wpi::internal::DriverStationModeThread: rename: _DriverStationModeThread methods: DriverStationModeThread: diff --git a/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml b/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml index 7150d4fdc..96d4ec4da 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::DutyCycle: + wpi::DutyCycle: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: DutyCycle: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml b/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml index 149985d8d..fba4b09e8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/DutyCycle.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/rotation/DutyCycle.hpp classes: - frc::DutyCycleEncoder: + wpi::DutyCycleEncoder: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: DutyCycleEncoder: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/Encoder.yml b/subprojects/robotpy-wpilib/semiwrap/Encoder.yml index efce99290..905a2b841 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Encoder.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Encoder.yml @@ -1,19 +1,19 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::Encoder: + wpi::Encoder: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper typealias: - - frc::Encoder::EncodingType + - wpi::Encoder::EncodingType methods: Encoder: overloads: int, int, bool, EncodingType: param_override: encodingType: - default: frc::Encoder::EncodingType::k4X + default: wpi::Encoder::EncodingType::k4X DigitalSource*, DigitalSource*, bool, EncodingType: ignore: true DigitalSource&, DigitalSource&, bool, EncodingType: @@ -21,7 +21,7 @@ classes: std::shared_ptr, std::shared_ptr, bool, EncodingType: param_override: encodingType: - default: frc::Encoder::EncodingType::k4X + default: wpi::Encoder::EncodingType::k4X Get: Reset: GetPeriod: diff --git a/subprojects/robotpy-wpilib/semiwrap/Errors.yml b/subprojects/robotpy-wpilib/semiwrap/Errors.yml index d5750d537..46b847958 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Errors.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Errors.yml @@ -9,5 +9,5 @@ functions: MakeError: ignore: true classes: - frc::RuntimeError: + wpi::RuntimeError: ignore: true diff --git a/subprojects/robotpy-wpilib/semiwrap/ExpansionHub.yml b/subprojects/robotpy-wpilib/semiwrap/ExpansionHub.yml new file mode 100644 index 000000000..cdd055f3c --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/ExpansionHub.yml @@ -0,0 +1,16 @@ +extra_includes: +- wpi/ExpansionHubMotor.hpp +- wpi/ExpansionHubServo.hpp + +classes: + wpi::ExpansionHub: + attributes: + NumUsbPorts: + NumServoPorts: + NumMotorPorts: + methods: + ExpansionHub: + MakeServo: + MakeMotor: + IsHubConnected: + GetUsbId: diff --git a/subprojects/robotpy-wpilib/semiwrap/ExpansionHubMotor.yml b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubMotor.yml new file mode 100644 index 000000000..baade5f06 --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubMotor.yml @@ -0,0 +1,20 @@ +classes: + wpi::ExpansionHubMotor: + methods: + ExpansionHubMotor: + SetPercentagePower: + SetVoltage: + SetPositionSetpoint: + SetVelocitySetpoint: + SetEnabled: + SetFloatOn0: + GetCurrent: + SetDistancePerCount: + GetEncoderVelocity: + GetEncoderPosition: + SetReversed: + ResetEncoder: + GetVelocityPidConstants: + GetPositionPidConstants: + IsHubConnected: + Follow: diff --git a/subprojects/robotpy-wpilib/semiwrap/ExpansionHubPidConstants.yml b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubPidConstants.yml new file mode 100644 index 000000000..e98ed02be --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubPidConstants.yml @@ -0,0 +1,7 @@ +classes: + wpi::ExpansionHubPidConstants: + methods: + SetPID: + SetFF: + EnableContinousInput: + DisableContinousInput: diff --git a/subprojects/robotpy-wpilib/semiwrap/ExpansionHubServo.yml b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubServo.yml new file mode 100644 index 000000000..206ea545c --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/ExpansionHubServo.yml @@ -0,0 +1,14 @@ +classes: + wpi::ExpansionHubServo: + methods: + ExpansionHubServo: + Set: + SetAngle: + SetPulseWidth: + SetEnabled: + SetFramePeriod: + IsHubConnected: + SetAngleRange: + SetPWMRange: + SetReversed: + SetContinousRotationMode: diff --git a/subprojects/robotpy-wpilib/semiwrap/Field2d.yml b/subprojects/robotpy-wpilib/semiwrap/Field2d.yml index 51ef19b86..d246d9132 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Field2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Field2d.yml @@ -1,16 +1,16 @@ extra_includes: -- networktables/NTSendableBuilder.h +- wpi/nt/NTSendableBuilder.hpp classes: - frc::Field2d: + wpi::Field2d: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: Field2d: SetRobotPose: overloads: - const Pose2d&: - units::meter_t, units::meter_t, Rotation2d: + const wpi::math::Pose2d&: + wpi::units::meter_t, wpi::units::meter_t, wpi::math::Rotation2d: GetRobotPose: GetObject: return_value_policy: reference_internal diff --git a/subprojects/robotpy-wpilib/semiwrap/FieldObject2d.yml b/subprojects/robotpy-wpilib/semiwrap/FieldObject2d.yml index 1bf734ef9..364771859 100644 --- a/subprojects/robotpy-wpilib/semiwrap/FieldObject2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/FieldObject2d.yml @@ -1,25 +1,25 @@ extra_includes: -- frc/trajectory/Trajectory.h +- wpi/math/trajectory/Trajectory.hpp classes: - frc::FieldObject2d: + wpi::FieldObject2d: nodelete: true methods: FieldObject2d: ignore: true SetPose: overloads: - const Pose2d&: - units::meter_t, units::meter_t, Rotation2d: + const wpi::math::Pose2d&: + wpi::units::meter_t, wpi::units::meter_t, wpi::math::Rotation2d: GetPose: SetPoses: overloads: - std::span: - std::initializer_list: + std::span: + std::initializer_list: ignore: true SetTrajectory: GetPoses: overloads: '[const]': - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: ignore: true diff --git a/subprojects/robotpy-wpilib/semiwrap/Gamepad.yml b/subprojects/robotpy-wpilib/semiwrap/Gamepad.yml new file mode 100644 index 000000000..a70d6464c --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/Gamepad.yml @@ -0,0 +1,161 @@ +classes: + wpi::Gamepad: + ignored_bases: + - wpi::util::SendableHelper + methods: + Gamepad: + GetLeftX: + GetLeftY: + GetRightX: + GetRightY: + GetLeftTriggerAxis: + LeftTrigger: + overloads: + double, EventLoop* [const]: + EventLoop* [const]: + GetRightTriggerAxis: + RightTrigger: + overloads: + double, EventLoop* [const]: + EventLoop* [const]: + GetSouthFaceButton: + GetSouthFaceButtonPressed: + GetSouthFaceButtonReleased: + SouthFace: + GetEastFaceButton: + GetEastFaceButtonPressed: + GetEastFaceButtonReleased: + EastFace: + GetWestFaceButton: + GetWestFaceButtonPressed: + GetWestFaceButtonReleased: + WestFace: + GetNorthFaceButton: + GetNorthFaceButtonPressed: + GetNorthFaceButtonReleased: + NorthFace: + GetBackButton: + GetBackButtonPressed: + GetBackButtonReleased: + Back: + GetGuideButton: + GetGuideButtonPressed: + GetGuideButtonReleased: + Guide: + GetStartButton: + GetStartButtonPressed: + GetStartButtonReleased: + Start: + GetLeftStickButton: + GetLeftStickButtonPressed: + GetLeftStickButtonReleased: + LeftStick: + GetRightStickButton: + GetRightStickButtonPressed: + GetRightStickButtonReleased: + RightStick: + GetLeftShoulderButton: + GetLeftShoulderButtonPressed: + GetLeftShoulderButtonReleased: + LeftShoulder: + GetRightShoulderButton: + GetRightShoulderButtonPressed: + GetRightShoulderButtonReleased: + RightShoulder: + GetDpadUpButton: + GetDpadUpButtonPressed: + GetDpadUpButtonReleased: + DpadUp: + GetDpadDownButton: + GetDpadDownButtonPressed: + GetDpadDownButtonReleased: + DpadDown: + GetDpadLeftButton: + GetDpadLeftButtonPressed: + GetDpadLeftButtonReleased: + DpadLeft: + GetDpadRightButton: + GetDpadRightButtonPressed: + GetDpadRightButtonReleased: + DpadRight: + GetMisc1Button: + GetMisc1ButtonPressed: + GetMisc1ButtonReleased: + Misc1: + GetRightPaddle1Button: + GetRightPaddle1ButtonPressed: + GetRightPaddle1ButtonReleased: + RightPaddle1: + GetLeftPaddle1Button: + GetLeftPaddle1ButtonPressed: + GetLeftPaddle1ButtonReleased: + LeftPaddle1: + GetRightPaddle2Button: + GetRightPaddle2ButtonPressed: + GetRightPaddle2ButtonReleased: + RightPaddle2: + GetLeftPaddle2Button: + GetLeftPaddle2ButtonPressed: + GetLeftPaddle2ButtonReleased: + LeftPaddle2: + GetTouchpadButton: + GetTouchpadButtonPressed: + GetTouchpadButtonReleased: + Touchpad: + GetMisc2Button: + GetMisc2ButtonPressed: + GetMisc2ButtonReleased: + Misc2: + GetMisc3Button: + GetMisc3ButtonPressed: + GetMisc3ButtonReleased: + Misc3: + GetMisc4Button: + GetMisc4ButtonPressed: + GetMisc4ButtonReleased: + Misc4: + GetMisc5Button: + GetMisc5ButtonPressed: + GetMisc5ButtonReleased: + Misc5: + GetMisc6Button: + GetMisc6ButtonPressed: + GetMisc6ButtonReleased: + Misc6: + InitSendable: + wpi::Gamepad::Button: + attributes: + kSouthFace: + kEastFace: + kWestFace: + kNorthFace: + kBack: + kGuide: + kStart: + kLeftStick: + kRightStick: + kLeftShoulder: + kRightShoulder: + kDpadUp: + kDpadDown: + kDpadLeft: + kDpadRight: + kMisc1: + kRightPaddle1: + kLeftPaddle1: + kRightPaddle2: + kLeftPaddle2: + kTouchpad: + kMisc2: + kMisc3: + kMisc4: + kMisc5: + kMisc6: + wpi::Gamepad::Axis: + attributes: + kLeftX: + kLeftY: + kRightX: + kRightY: + kLeftTrigger: + kRightTrigger: diff --git a/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml b/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml index a5dd69669..2494435ed 100644 --- a/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml +++ b/subprojects/robotpy-wpilib/semiwrap/GenericHID.yml @@ -2,11 +2,11 @@ defaults: subpackage: interfaces extra_includes: -- frc/DriverStation.h -- frc/event/BooleanEvent.h +- wpi/driverstation/DriverStation.hpp +- wpi/event/BooleanEvent.hpp classes: - frc::GenericHID: + wpi::GenericHID: enums: RumbleType: HIDType: @@ -33,17 +33,19 @@ classes: POVCenter: AxisLessThan: AxisGreaterThan: - GetAxisCount: - GetPOVCount: - GetButtonCount: IsConnected: GetType: GetName: - GetAxisType: GetPort: SetOutput: SetOutputs: SetRumble: + GetAxesMaximumIndex: + GetAxesAvailable: + GetPOVsMaximumIndex: + GetPOVsAvailable: + GetButtonsMaximumIndex: + GetButtonsAvailable: inline_code: | cls_GenericHID diff --git a/subprojects/robotpy-wpilib/semiwrap/I2C.yml b/subprojects/robotpy-wpilib/semiwrap/I2C.yml index 5ac39cbf5..05fcf32df 100644 --- a/subprojects/robotpy-wpilib/semiwrap/I2C.yml +++ b/subprojects/robotpy-wpilib/semiwrap/I2C.yml @@ -1,5 +1,5 @@ classes: - frc::I2C: + wpi::I2C: enums: Port: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/IterativeRobotBase.yml b/subprojects/robotpy-wpilib/semiwrap/IterativeRobotBase.yml index d13d6941c..035506a7a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/IterativeRobotBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/IterativeRobotBase.yml @@ -1,5 +1,5 @@ classes: - frc::IterativeRobotBase: + wpi::IterativeRobotBase: methods: DriverStationConnected: DisabledInit: @@ -15,7 +15,7 @@ classes: overloads: double: ignore: true - units::second_t: + wpi::units::second_t: LoopFunc: SimulationInit: internal: true diff --git a/subprojects/robotpy-wpilib/semiwrap/Jaguar.yml b/subprojects/robotpy-wpilib/semiwrap/Jaguar.yml deleted file mode 100644 index 20503e66c..000000000 --- a/subprojects/robotpy-wpilib/semiwrap/Jaguar.yml +++ /dev/null @@ -1,7 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::Jaguar: - methods: - Jaguar: diff --git a/subprojects/robotpy-wpilib/semiwrap/Joystick.yml b/subprojects/robotpy-wpilib/semiwrap/Joystick.yml index f4d586d49..70c992127 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Joystick.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Joystick.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/DriverStation.h +- wpi/driverstation/DriverStation.hpp classes: - frc::Joystick: + wpi::Joystick: attributes: kDefaultXChannel: kDefaultYChannel: @@ -41,6 +41,6 @@ classes: GetDirection: rename: getDirectionRadians inline_code: | - .def("getDirectionDegrees", [](const Joystick &self) -> units::degree_t { + .def("getDirectionDegrees", [](const Joystick &self) -> wpi::units::degree_t { return self.GetDirection(); }) diff --git a/subprojects/robotpy-wpilib/semiwrap/Koors40.yml b/subprojects/robotpy-wpilib/semiwrap/Koors40.yml index edfff8c78..0332f2c0d 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Koors40.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Koors40.yml @@ -1,4 +1,4 @@ classes: - frc::Koors40: + wpi::Koors40: methods: Koors40: diff --git a/subprojects/robotpy-wpilib/semiwrap/LEDPattern.yml b/subprojects/robotpy-wpilib/semiwrap/LEDPattern.yml index 0cff3e7d6..5b7d0c5bf 100644 --- a/subprojects/robotpy-wpilib/semiwrap/LEDPattern.yml +++ b/subprojects/robotpy-wpilib/semiwrap/LEDPattern.yml @@ -1,5 +1,5 @@ classes: - frc::LEDPattern: + wpi::LEDPattern: enums: GradientType: methods: @@ -7,17 +7,17 @@ classes: LEDPattern: ApplyTo: overloads: - std::span [const]: - LEDReader, std::function [const]: - std::span, std::function [const]: + std::span [const]: + LEDReader, std::function [const]: + std::span, std::function [const]: Reversed: OffsetBy: ScrollAtRelativeSpeed: ScrollAtAbsoluteSpeed: Blink: overloads: - units::second_t, units::second_t: - units::second_t: + wpi::units::second_t, wpi::units::second_t: + wpi::units::second_t: SynchronizedBlink: Breathe: OverlayOn: @@ -38,7 +38,7 @@ classes: ignore: true Rainbow: MapIndex: - frc::LEDPattern::LEDReader: + wpi::LEDPattern::LEDReader: methods: LEDReader: size: diff --git a/subprojects/robotpy-wpilib/semiwrap/Mechanism2d.yml b/subprojects/robotpy-wpilib/semiwrap/Mechanism2d.yml index fc6268e17..7b4abb6ce 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Mechanism2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Mechanism2d.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::Mechanism2d: + wpi::Mechanism2d: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: Mechanism2d: GetRoot: diff --git a/subprojects/robotpy-wpilib/semiwrap/MechanismLigament2d.yml b/subprojects/robotpy-wpilib/semiwrap/MechanismLigament2d.yml index 6b63a5886..742dfc0ec 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MechanismLigament2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MechanismLigament2d.yml @@ -1,5 +1,5 @@ classes: - frc::MechanismLigament2d: + wpi::MechanismLigament2d: methods: MechanismLigament2d: ignore: true diff --git a/subprojects/robotpy-wpilib/semiwrap/MechanismObject2d.yml b/subprojects/robotpy-wpilib/semiwrap/MechanismObject2d.yml index a6b01a0ee..bdd8cf2ef 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MechanismObject2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MechanismObject2d.yml @@ -1,10 +1,10 @@ extra_includes: -- frc/smartdashboard/MechanismLigament2d.h +- wpi/smartdashboard/MechanismLigament2d.hpp classes: - frc::MechanismObject2d: + wpi::MechanismObject2d: force_type_casters: - - units::degree_t + - wpi::units::degree_t attributes: m_mutex: ignore: true @@ -20,12 +20,12 @@ classes: inline_code: |- cls_MechanismObject2d .def("appendLigament", [](MechanismObject2d *self, - std::string_view name, double length, units::degree_t angle, - double lineWidth, const frc::Color8Bit& color) { + std::string_view name, double length, wpi::units::degree_t angle, + double lineWidth, const wpi::Color8Bit& color) { return self->Append(name, length, angle, lineWidth, color); }, py::arg("name"), py::arg("length"), py::arg("angle"), - py::arg("lineWidth") = 6, py::arg("color") = frc::Color8Bit{235, 137, 52}, + py::arg("lineWidth") = 6, py::arg("color") = wpi::Color8Bit{235, 137, 52}, "Append a ligament node", py::return_value_policy::reference_internal) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/MechanismRoot2d.yml b/subprojects/robotpy-wpilib/semiwrap/MechanismRoot2d.yml index 29c5f6899..d4f8215d0 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MechanismRoot2d.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MechanismRoot2d.yml @@ -1,10 +1,10 @@ extra_includes: -- frc/smartdashboard/MechanismLigament2d.h +- wpi/smartdashboard/MechanismLigament2d.hpp classes: - frc::MechanismRoot2d: + wpi::MechanismRoot2d: force_type_casters: - - units::degree_t + - wpi::units::degree_t methods: MechanismRoot2d: ignore: true @@ -19,12 +19,12 @@ inline_code: |- cls_MechanismRoot2d .def("getName", [](MechanismRoot2d *self) { return self->GetName(); }, release_gil()) .def("appendLigament", [](MechanismRoot2d *self, - std::string_view name, double length, units::degree_t angle, - double lineWidth, const frc::Color8Bit& color) { + std::string_view name, double length, wpi::units::degree_t angle, + double lineWidth, const wpi::Color8Bit& color) { return self->Append(name, length, angle, lineWidth, color); }, py::arg("name"), py::arg("length"), py::arg("angle"), - py::arg("lineWidth") = 6, py::arg("color") = frc::Color8Bit{235, 137, 52}, + py::arg("lineWidth") = 6, py::arg("color") = wpi::Color8Bit{235, 137, 52}, release_gil(), "Append a ligament node", py::return_value_policy::reference_internal) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/MotorController.yml b/subprojects/robotpy-wpilib/semiwrap/MotorController.yml index 8249a2b37..94764b64e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MotorController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MotorController.yml @@ -2,7 +2,7 @@ defaults: subpackage: interfaces classes: - frc::MotorController: + wpi::MotorController: methods: Set: SetVoltage: diff --git a/subprojects/robotpy-wpilib/semiwrap/MotorControllerGroup.yml b/subprojects/robotpy-wpilib/semiwrap/MotorControllerGroup.yml index 5bf1971c5..44baa068e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MotorControllerGroup.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MotorControllerGroup.yml @@ -1,12 +1,12 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp - pybind11/stl.h classes: - frc::PyMotorControllerGroup: + wpi::PyMotorControllerGroup: rename: MotorControllerGroup ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: PyMotorControllerGroup: cpp_code: | diff --git a/subprojects/robotpy-wpilib/semiwrap/MotorSafety.yml b/subprojects/robotpy-wpilib/semiwrap/MotorSafety.yml index 4b4ec84d5..bdffafd12 100644 --- a/subprojects/robotpy-wpilib/semiwrap/MotorSafety.yml +++ b/subprojects/robotpy-wpilib/semiwrap/MotorSafety.yml @@ -1,8 +1,8 @@ extra_includes: -- wpi/SmallString.h +- wpi/util/SmallString.hpp classes: - frc::MotorSafety: + wpi::MotorSafety: methods: MotorSafety: Feed: diff --git a/subprojects/robotpy-wpilib/semiwrap/Notifier.yml b/subprojects/robotpy-wpilib/semiwrap/Notifier.yml index cfa1876b0..6e167ebba 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Notifier.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Notifier.yml @@ -1,5 +1,5 @@ classes: - frc::PyNotifier: + wpi::PyNotifier: rename: Notifier methods: PyNotifier: @@ -11,11 +11,11 @@ classes: overloads: double: ignore: true - units::second_t: + wpi::units::second_t: StartPeriodic: overloads: double: ignore: true - units::second_t: + wpi::units::second_t: Stop: SetHALThreadPriority: diff --git a/subprojects/robotpy-wpilib/semiwrap/OnboardIMU.yml b/subprojects/robotpy-wpilib/semiwrap/OnboardIMU.yml index 97f70ec98..45d208b4b 100644 --- a/subprojects/robotpy-wpilib/semiwrap/OnboardIMU.yml +++ b/subprojects/robotpy-wpilib/semiwrap/OnboardIMU.yml @@ -1,5 +1,5 @@ classes: - frc::OnboardIMU: + wpi::OnboardIMU: enums: MountOrientation: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/PS4Controller.yml b/subprojects/robotpy-wpilib/semiwrap/PS4Controller.yml index c116a26af..6864efd15 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PS4Controller.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PS4Controller.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/event/BooleanEvent.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/event/BooleanEvent.hpp classes: - frc::PS4Controller: + wpi::PS4Controller: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: PS4Controller: GetLeftX: @@ -74,7 +74,7 @@ classes: GetTouchpadButtonPressed: GetTouchpadButtonReleased: InitSendable: - frc::PS4Controller::Button: + wpi::PS4Controller::Button: attributes: kSquare: kCross: @@ -90,7 +90,7 @@ classes: kR3: kPS: kTouchpad: - frc::PS4Controller::Axis: + wpi::PS4Controller::Axis: attributes: kLeftX: kLeftY: diff --git a/subprojects/robotpy-wpilib/semiwrap/PS5Controller.yml b/subprojects/robotpy-wpilib/semiwrap/PS5Controller.yml index 1ae505b01..afe1a1cc9 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PS5Controller.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PS5Controller.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PS5Controller: + wpi::PS5Controller: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: PS5Controller: GetLeftX: @@ -73,7 +73,7 @@ classes: GetTouchpadButtonPressed: GetTouchpadButtonReleased: InitSendable: - frc::PS5Controller::Button: + wpi::PS5Controller::Button: attributes: kSquare: kCross: @@ -89,7 +89,7 @@ classes: kR3: kPS: kTouchpad: - frc::PS5Controller::Axis: + wpi::PS5Controller::Axis: attributes: kLeftX: kLeftY: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWM.yml b/subprojects/robotpy-wpilib/semiwrap/PWM.yml index f176b6677..1ce7cff46 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWM.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWM.yml @@ -1,12 +1,12 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/AddressableLED.h -- wpi/SmallString.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/led/AddressableLED.hpp +- wpi/util/SmallString.hpp classes: - frc::PWM: + wpi::PWM: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper enums: OutputPeriod: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml b/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml index 47b0f9e6f..9a847a5f2 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMMotorController: + wpi::PWMMotorController: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper attributes: m_pwm: methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMSparkFlex.yml b/subprojects/robotpy-wpilib/semiwrap/PWMSparkFlex.yml index 631385f36..a5664c657 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMSparkFlex.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMSparkFlex.yml @@ -1,4 +1,4 @@ classes: - frc::PWMSparkFlex: + wpi::PWMSparkFlex: methods: PWMSparkFlex: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMSparkMax.yml b/subprojects/robotpy-wpilib/semiwrap/PWMSparkMax.yml index 3c13a9d36..0f1d56587 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMSparkMax.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMSparkMax.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMSparkMax: + wpi::PWMSparkMax: methods: PWMSparkMax: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMTalonFX.yml b/subprojects/robotpy-wpilib/semiwrap/PWMTalonFX.yml index 3c05e86f8..a64fdd6c8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMTalonFX.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMTalonFX.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMTalonFX: + wpi::PWMTalonFX: methods: PWMTalonFX: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMTalonSRX.yml b/subprojects/robotpy-wpilib/semiwrap/PWMTalonSRX.yml index 6e979fd27..02145178b 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMTalonSRX.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMTalonSRX.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMTalonSRX: + wpi::PWMTalonSRX: methods: PWMTalonSRX: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMVenom.yml b/subprojects/robotpy-wpilib/semiwrap/PWMVenom.yml index 522f24456..89e4bec59 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMVenom.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMVenom.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMVenom: + wpi::PWMVenom: methods: PWMVenom: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMVictorSPX.yml b/subprojects/robotpy-wpilib/semiwrap/PWMVictorSPX.yml index f7bcedd1d..4f071fbe0 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMVictorSPX.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMVictorSPX.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PWMVictorSPX: + wpi::PWMVictorSPX: methods: PWMVictorSPX: diff --git a/subprojects/robotpy-wpilib/semiwrap/PneumaticHub.yml b/subprojects/robotpy-wpilib/semiwrap/PneumaticHub.yml index 00c7848f7..b6f7576fc 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PneumaticHub.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PneumaticHub.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/Compressor.h -- frc/Solenoid.h -- frc/DoubleSolenoid.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/pneumatic/Compressor.hpp +- wpi/hardware/pneumatic/Solenoid.hpp +- wpi/hardware/pneumatic/DoubleSolenoid.hpp classes: - frc::PneumaticHub: + wpi::PneumaticHub: methods: PneumaticHub: overloads: @@ -44,7 +44,7 @@ classes: GetAnalogVoltage: GetPressure: ReportUsage: - frc::PneumaticHub::Version: + wpi::PneumaticHub::Version: attributes: FirmwareMajor: FirmwareMinor: @@ -52,7 +52,7 @@ classes: HardwareMinor: HardwareMajor: UniqueId: - frc::PneumaticHub::Faults: + wpi::PneumaticHub::Faults: attributes: Channel0Fault: Channel1Fault: @@ -78,7 +78,7 @@ classes: HardwareFault: methods: GetChannelFault: - frc::PneumaticHub::StickyFaults: + wpi::PneumaticHub::StickyFaults: attributes: CompressorOverCurrent: CompressorOpen: diff --git a/subprojects/robotpy-wpilib/semiwrap/PneumaticsBase.yml b/subprojects/robotpy-wpilib/semiwrap/PneumaticsBase.yml index 747ab959f..0adeac150 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PneumaticsBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PneumaticsBase.yml @@ -1,12 +1,12 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/Compressor.h -- frc/Solenoid.h -- frc/DoubleSolenoid.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/pneumatic/Compressor.hpp +- wpi/hardware/pneumatic/Solenoid.hpp +- wpi/hardware/pneumatic/DoubleSolenoid.hpp classes: - frc::PneumaticsBase: + wpi::PneumaticsBase: methods: GetCompressor: GetPressureSwitch: diff --git a/subprojects/robotpy-wpilib/semiwrap/PneumaticsControlModule.yml b/subprojects/robotpy-wpilib/semiwrap/PneumaticsControlModule.yml index 1d4edc1d3..30c68c1e8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PneumaticsControlModule.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PneumaticsControlModule.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/Compressor.h -- frc/Solenoid.h -- frc/DoubleSolenoid.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/pneumatic/Compressor.hpp +- wpi/hardware/pneumatic/Solenoid.hpp +- wpi/hardware/pneumatic/DoubleSolenoid.hpp classes: - frc::PneumaticsControlModule: + wpi::PneumaticsControlModule: methods: PneumaticsControlModule: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/PowerDistribution.yml b/subprojects/robotpy-wpilib/semiwrap/PowerDistribution.yml index e4773df8e..66109fc03 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PowerDistribution.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PowerDistribution.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::PowerDistribution: + wpi::PowerDistribution: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper attributes: kDefaultModule: enums: @@ -32,7 +32,7 @@ classes: GetNumChannels: GetAllCurrents: InitSendable: - frc::PowerDistribution::Version: + wpi::PowerDistribution::Version: attributes: FirmwareMajor: FirmwareMinor: @@ -40,7 +40,7 @@ classes: HardwareMinor: HardwareMajor: UniqueId: - frc::PowerDistribution::Faults: + wpi::PowerDistribution::Faults: attributes: Channel0BreakerFault: Channel1BreakerFault: @@ -71,7 +71,7 @@ classes: HardwareFault: methods: GetBreakerFault: - frc::PowerDistribution::StickyFaults: + wpi::PowerDistribution::StickyFaults: attributes: Channel0BreakerFault: Channel1BreakerFault: diff --git a/subprojects/robotpy-wpilib/semiwrap/Preferences.yml b/subprojects/robotpy-wpilib/semiwrap/Preferences.yml index 7d8bd6057..ae2f0320a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Preferences.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Preferences.yml @@ -1,5 +1,5 @@ classes: - frc::Preferences: + wpi::Preferences: methods: GetKeys: GetString: diff --git a/subprojects/robotpy-wpilib/semiwrap/RobotBase.yml b/subprojects/robotpy-wpilib/semiwrap/RobotBase.yml index 07c547054..7fa1f770a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/RobotBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/RobotBase.yml @@ -1,5 +1,5 @@ extra_includes: -- frc/DriverStation.h +- wpi/driverstation/DriverStation.hpp - rpy/ControlWord.h functions: @@ -13,7 +13,7 @@ functions: ResetMotorSafety: ignore: true classes: - frc::RobotBase: + wpi::RobotBase: attributes: m_threadId: ignore: true diff --git a/subprojects/robotpy-wpilib/semiwrap/RobotController.yml b/subprojects/robotpy-wpilib/semiwrap/RobotController.yml index eeaa85e4e..422ba4cda 100644 --- a/subprojects/robotpy-wpilib/semiwrap/RobotController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/RobotController.yml @@ -1,12 +1,12 @@ classes: - frc::CANStatus: + wpi::CANStatus: attributes: percentBusUtilization: busOffCount: txFullCount: receiveErrorCount: transmitErrorCount: - frc::RobotController: + wpi::RobotController: nodelete: true methods: GetSerialNumber: diff --git a/subprojects/robotpy-wpilib/semiwrap/RobotState.yml b/subprojects/robotpy-wpilib/semiwrap/RobotState.yml index 63c29f64e..2ccb2d0e8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/RobotState.yml +++ b/subprojects/robotpy-wpilib/semiwrap/RobotState.yml @@ -1,5 +1,5 @@ classes: - frc::RobotState: + wpi::RobotState: nodelete: true methods: IsDisabled: diff --git a/subprojects/robotpy-wpilib/semiwrap/SD540.yml b/subprojects/robotpy-wpilib/semiwrap/SD540.yml deleted file mode 100644 index 756428a73..000000000 --- a/subprojects/robotpy-wpilib/semiwrap/SD540.yml +++ /dev/null @@ -1,7 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::SD540: - methods: - SD540: diff --git a/subprojects/robotpy-wpilib/semiwrap/SendableBuilderImpl.yml b/subprojects/robotpy-wpilib/semiwrap/SendableBuilderImpl.yml index c4cee26d9..ee320df3a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SendableBuilderImpl.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SendableBuilderImpl.yml @@ -1,5 +1,5 @@ classes: - frc::SendableBuilderImpl: + wpi::SendableBuilderImpl: methods: SendableBuilderImpl: SetTable: diff --git a/subprojects/robotpy-wpilib/semiwrap/SendableChooser.yml b/subprojects/robotpy-wpilib/semiwrap/SendableChooser.yml index 68947a3c3..1cb5fc1dc 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SendableChooser.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SendableChooser.yml @@ -2,7 +2,7 @@ extra_includes: - gilsafe_object.h classes: - frc::SendableChooser: + wpi::SendableChooser: template_params: - T methods: @@ -12,7 +12,7 @@ classes: GetSelected: # weirdness because return type cpp_code: | - [](frc::SendableChooser * __that) -> py::object { + [](wpi::SendableChooser * __that) -> py::object { auto v = __that->GetSelected(); if (!v) { return py::none(); @@ -22,7 +22,7 @@ classes: OnChange: # more weirdness cpp_code: | - [](frc::SendableChooser *self, std::function fn) { + [](wpi::SendableChooser *self, std::function fn) { self->OnChange([fn](T v) { py::gil_scoped_acquire lock; if (v) { @@ -37,6 +37,6 @@ classes: templates: SendableChooser: - qualname: frc::SendableChooser + qualname: wpi::SendableChooser params: - semiwrap::gilsafe_object diff --git a/subprojects/robotpy-wpilib/semiwrap/SendableChooserBase.yml b/subprojects/robotpy-wpilib/semiwrap/SendableChooserBase.yml index e02ba1659..4ac230e5d 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SendableChooserBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SendableChooserBase.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::SendableChooserBase: + wpi::SendableChooserBase: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper attributes: kDefault: kOptions: diff --git a/subprojects/robotpy-wpilib/semiwrap/SensorUtil.yml b/subprojects/robotpy-wpilib/semiwrap/SensorUtil.yml index 1de1a6eb0..4c2f284a7 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SensorUtil.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SensorUtil.yml @@ -1,5 +1,5 @@ classes: - frc::SensorUtil: + wpi::SensorUtil: nodelete: true methods: CheckDigitalChannel: diff --git a/subprojects/robotpy-wpilib/semiwrap/SerialPort.yml b/subprojects/robotpy-wpilib/semiwrap/SerialPort.yml index 0bb859adb..878858401 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SerialPort.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SerialPort.yml @@ -1,5 +1,5 @@ classes: - frc::SerialPort: + wpi::SerialPort: enums: Parity: StopBits: @@ -12,19 +12,19 @@ classes: int, Port, int, Parity, StopBits: param_override: port: - default: frc::SerialPort::Port::kOnboard + default: wpi::SerialPort::Port::kOnboard parity: - default: frc::SerialPort::Parity::kParity_None + default: wpi::SerialPort::Parity::kParity_None stopBits: - default: frc::SerialPort::StopBits::kStopBits_One + default: wpi::SerialPort::StopBits::kStopBits_One int, std::string_view, Port, int, Parity, StopBits: param_override: port: - default: frc::SerialPort::Port::kOnboard + default: wpi::SerialPort::Port::kOnboard parity: - default: frc::SerialPort::Parity::kParity_None + default: wpi::SerialPort::Parity::kParity_None stopBits: - default: frc::SerialPort::StopBits::kStopBits_One + default: wpi::SerialPort::StopBits::kStopBits_One SetFlowControl: EnableTermination: param_override: diff --git a/subprojects/robotpy-wpilib/semiwrap/SharpIR.yml b/subprojects/robotpy-wpilib/semiwrap/SharpIR.yml index 68c799077..ec1e4805f 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SharpIR.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SharpIR.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::SharpIR: + wpi::SharpIR: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: GP2Y0A02YK0F: GP2Y0A21YK0F: diff --git a/subprojects/robotpy-wpilib/semiwrap/SmartDashboard.yml b/subprojects/robotpy-wpilib/semiwrap/SmartDashboard.yml index 568d4df1a..b72e3ce98 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SmartDashboard.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SmartDashboard.yml @@ -1,10 +1,10 @@ extra_includes: - src/rpy/SmartDashboardData.h -- frc/Errors.h -- wpi/sendable/SendableRegistry.h +- wpi/system/Errors.hpp +- wpi/util/sendable/SendableRegistry.hpp classes: - frc::SmartDashboard: + wpi::SmartDashboard: methods: init: ContainsKey: @@ -16,11 +16,11 @@ classes: PutData: # overrides ensure data doesn't die if this is the only reference overloads: - std::string_view, wpi::Sendable*: + std::string_view, wpi::util::Sendable*: cpp_code: | - [](py::str &key, std::shared_ptr data) { + [](py::str &key, std::shared_ptr data) { if (!data) { - throw FRC_MakeError(err::NullParameter, "{}", "value"); + throw WPILIB_MakeError(err::NullParameter, "{}", "value"); } // convert key to a raw string so that we can create a StringRef @@ -31,19 +31,19 @@ classes: } std::string_view keyRef(raw_str, raw_size); - frc::SmartDashboard::PutData(keyRef, data.get()); + wpi::SmartDashboard::PutData(keyRef, data.get()); // this comes after the PutData to ensure that the original object doesn't die // while PutData is called rpy::addSmartDashboardData(key, data); } - wpi::Sendable*: + wpi::util::Sendable*: cpp_code: | - [](std::shared_ptr value) { - frc::SmartDashboard::PutData(value.get()); + [](std::shared_ptr value) { + wpi::SmartDashboard::PutData(value.get()); // this comes after the PutData to ensure that the original object doesn't die // while PutData is called - auto name = wpi::SendableRegistry::GetName(value.get()); + auto name = wpi::util::SendableRegistry::GetName(value.get()); if (!name.empty()) { py::str key(name); rpy::addSmartDashboardData(key, value); @@ -55,11 +55,11 @@ classes: GetBoolean: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_BOOLEAN) return defaultValue; return py::cast(value.GetBoolean()); @@ -69,11 +69,11 @@ classes: GetNumber: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_DOUBLE) return defaultValue; return py::cast(value.GetDouble()); @@ -83,11 +83,11 @@ classes: GetString: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_STRING) return defaultValue; return py::cast(value.GetString()); @@ -97,11 +97,11 @@ classes: GetBooleanArray: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_BOOLEAN_ARRAY) return defaultValue; // ntcore will return bit vector by default. Convert to List[bool] @@ -118,11 +118,11 @@ classes: GetNumberArray: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_DOUBLE_ARRAY) return defaultValue; return py::cast(value.GetDoubleArray()); @@ -132,11 +132,11 @@ classes: GetStringArray: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_STRING_ARRAY) return defaultValue; return py::cast(value.GetStringArray()); @@ -146,11 +146,11 @@ classes: GetRaw: cpp_code: | [](std::string_view key, py::object defaultValue) -> py::object { - nt::Value value; + wpi::nt::Value value; { py::gil_scoped_release release; - auto entry = frc::SmartDashboard::GetEntry(key); - value = nt::GetEntryValue(entry.GetHandle()); + auto entry = wpi::SmartDashboard::GetEntry(key); + value = wpi::nt::GetEntryValue(entry.GetHandle()); } if (!value || value.type() != NT_STRING) return defaultValue; return py::cast(value.GetString()); diff --git a/subprojects/robotpy-wpilib/semiwrap/Solenoid.yml b/subprojects/robotpy-wpilib/semiwrap/Solenoid.yml index 8155ba4d9..717eb2d31 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Solenoid.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Solenoid.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::Solenoid: + wpi::Solenoid: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: Solenoid: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/Spark.yml b/subprojects/robotpy-wpilib/semiwrap/Spark.yml index 6e8dd2d5b..5094bb748 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Spark.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Spark.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::Spark: + wpi::Spark: methods: Spark: diff --git a/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml b/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml index fa2f38043..964f852f6 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml @@ -1,4 +1,4 @@ classes: - frc::SparkMini: + wpi::SparkMini: methods: SparkMini: diff --git a/subprojects/robotpy-wpilib/semiwrap/StadiaController.yml b/subprojects/robotpy-wpilib/semiwrap/StadiaController.yml index 00222d78e..ec4ba0445 100644 --- a/subprojects/robotpy-wpilib/semiwrap/StadiaController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/StadiaController.yml @@ -1,10 +1,10 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::StadiaController: + wpi::StadiaController: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: StadiaController: GetLeftX: @@ -78,7 +78,7 @@ classes: GetRightBumperButtonPressed: GetRightBumperButtonReleased: InitSendable: - frc::StadiaController::Button: + wpi::StadiaController::Button: attributes: kA: kB: @@ -95,7 +95,7 @@ classes: kLeftTrigger: kGoogle: kFrame: - frc::StadiaController::Axis: + wpi::StadiaController::Axis: attributes: kLeftX: kRightX: diff --git a/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml b/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml index f8e020e5c..45d79c327 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SysIdRoutineLog.yml @@ -7,29 +7,29 @@ enums: .def("__str__", &SysIdRoutineLog::StateEnumToString) classes: - frc::sysid::SysIdRoutineLog: + wpi::sysid::SysIdRoutineLog: methods: SysIdRoutineLog: RecordState: Motor: StateEnumToString: - frc::sysid::SysIdRoutineLog::MotorLog: + wpi::sysid::SysIdRoutineLog::MotorLog: methods: value: voltage: position: overloads: - units::meter_t: - units::turn_t: + wpi::units::meter_t: + wpi::units::turn_t: rename: angularPosition velocity: overloads: - units::meters_per_second_t: - units::turns_per_second_t: + wpi::units::meters_per_second_t: + wpi::units::turns_per_second_t: rename: angularVelocity acceleration: overloads: - units::meters_per_second_squared_t: - units::turns_per_second_squared_t: + wpi::units::meters_per_second_squared_t: + wpi::units::turns_per_second_squared_t: rename: angularAcceleration current: diff --git a/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml b/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml index 21bfd10ca..16aa56d14 100644 --- a/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml @@ -1,4 +1,4 @@ classes: - frc::SystemServer: + wpi::SystemServer: methods: GetSystemServer: diff --git a/subprojects/robotpy-wpilib/semiwrap/Talon.yml b/subprojects/robotpy-wpilib/semiwrap/Talon.yml index 85558634e..3b06fe904 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Talon.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Talon.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::Talon: + wpi::Talon: methods: Talon: diff --git a/subprojects/robotpy-wpilib/semiwrap/TimedRobot.yml b/subprojects/robotpy-wpilib/semiwrap/TimedRobot.yml index c787bb715..0f5739783 100644 --- a/subprojects/robotpy-wpilib/semiwrap/TimedRobot.yml +++ b/subprojects/robotpy-wpilib/semiwrap/TimedRobot.yml @@ -1,5 +1,5 @@ classes: - frc::TimedRobot: + wpi::TimedRobot: attributes: kDefaultPeriod: methods: @@ -12,6 +12,5 @@ classes: default: 0_s TimedRobot: overloads: - double: - ignore: true - units::second_t: + wpi::units::second_t: + wpi::units::hertz_t: diff --git a/subprojects/robotpy-wpilib/semiwrap/Timer.yml b/subprojects/robotpy-wpilib/semiwrap/Timer.yml index 5b50a3f2f..869d27d11 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Timer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Timer.yml @@ -2,7 +2,7 @@ functions: Wait: GetTime: classes: - frc::Timer: + wpi::Timer: methods: Timer: Get: diff --git a/subprojects/robotpy-wpilib/semiwrap/TimesliceRobot.yml b/subprojects/robotpy-wpilib/semiwrap/TimesliceRobot.yml index 1e507942d..298e31ced 100644 --- a/subprojects/robotpy-wpilib/semiwrap/TimesliceRobot.yml +++ b/subprojects/robotpy-wpilib/semiwrap/TimesliceRobot.yml @@ -1,5 +1,5 @@ classes: - frc::TimesliceRobot: + wpi::TimesliceRobot: methods: TimesliceRobot: Schedule: diff --git a/subprojects/robotpy-wpilib/semiwrap/Tracer.yml b/subprojects/robotpy-wpilib/semiwrap/Tracer.yml index e3c60eff8..95767e438 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Tracer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Tracer.yml @@ -1,9 +1,9 @@ extra_includes: -- wpi/SmallString.h -- wpi/raw_ostream.h +- wpi/util/SmallString.hpp +- wpi/util/raw_ostream.hpp classes: - frc::Tracer: + wpi::Tracer: methods: Tracer: ResetTimer: @@ -12,15 +12,15 @@ classes: PrintEpochs: overloads: '': - wpi::raw_ostream&: + wpi::util::raw_ostream&: ignore: true inline_code: |- cls_Tracer .def("getEpochs", [](Tracer * self) -> py::str { - wpi::SmallString<128> buf; - wpi::raw_svector_ostream s(buf); + wpi::util::SmallString<128> buf; + wpi::util::raw_svector_ostream s(buf); self->PrintEpochs(s); return py::cast(s.str()); }, diff --git a/subprojects/robotpy-wpilib/semiwrap/Victor.yml b/subprojects/robotpy-wpilib/semiwrap/Victor.yml deleted file mode 100644 index b55c81f1c..000000000 --- a/subprojects/robotpy-wpilib/semiwrap/Victor.yml +++ /dev/null @@ -1,7 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::Victor: - methods: - Victor: diff --git a/subprojects/robotpy-wpilib/semiwrap/VictorSP.yml b/subprojects/robotpy-wpilib/semiwrap/VictorSP.yml index 19a8129cf..d81438eaa 100644 --- a/subprojects/robotpy-wpilib/semiwrap/VictorSP.yml +++ b/subprojects/robotpy-wpilib/semiwrap/VictorSP.yml @@ -1,7 +1,7 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - frc::VictorSP: + wpi::VictorSP: methods: VictorSP: diff --git a/subprojects/robotpy-wpilib/semiwrap/Watchdog.yml b/subprojects/robotpy-wpilib/semiwrap/Watchdog.yml index cd00aca4b..e00b98c48 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Watchdog.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Watchdog.yml @@ -1,17 +1,17 @@ classes: - frc::Watchdog: + wpi::Watchdog: methods: Watchdog: overloads: - units::second_t, std::function: - units::second_t, Callable&&, Arg&&, Args&&...: + wpi::units::second_t, std::function: + wpi::units::second_t, Callable&&, Arg&&, Args&&...: ignore: true GetTime: SetTimeout: overloads: double: ignore: true - units::second_t: + wpi::units::second_t: GetTimeout: IsExpired: AddEpoch: diff --git a/subprojects/robotpy-wpilib/semiwrap/XboxController.yml b/subprojects/robotpy-wpilib/semiwrap/XboxController.yml index 389d70398..05d1301b4 100644 --- a/subprojects/robotpy-wpilib/semiwrap/XboxController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/XboxController.yml @@ -1,12 +1,12 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/DriverStation.h -- frc/event/BooleanEvent.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/driverstation/DriverStation.hpp +- wpi/event/BooleanEvent.hpp classes: - frc::XboxController: + wpi::XboxController: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: XboxController: GetLeftX: @@ -70,7 +70,7 @@ classes: GetRightBumperButtonPressed: GetRightBumperButtonReleased: InitSendable: - frc::XboxController::Button: + wpi::XboxController::Button: attributes: kLeftBumper: kRightBumper: @@ -82,7 +82,7 @@ classes: kY: kBack: kStart: - frc::XboxController::Axis: + wpi::XboxController::Axis: attributes: kLeftX: kRightX: diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml b/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml index 21a59af95..4c3a692d0 100644 --- a/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml @@ -1,7 +1,7 @@ classes: - frc::Tachometer: + wpi::Tachometer: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: Tachometer: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml b/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml index 9941ef0c3..512eff831 100644 --- a/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml +++ b/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml @@ -1,7 +1,7 @@ classes: - frc::UpDownCounter: + wpi::UpDownCounter: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: UpDownCounter: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml b/subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml index 62dab560b..2d0f02997 100644 --- a/subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml +++ b/subprojects/robotpy-wpilib/semiwrap/drive/DifferentialDrive.yml @@ -1,11 +1,11 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/motorcontrol/MotorController.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/motor/MotorController.hpp classes: - frc::DifferentialDrive: + wpi::DifferentialDrive: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: DifferentialDrive: overloads: @@ -103,7 +103,7 @@ classes: * :meth:`curvatureDrive` is similar in concept to ``RobotDrive.drive`` with the addition of a quick turn mode. However, it is not designed to give exactly the same response. - frc::DifferentialDrive::WheelSpeeds: + wpi::DifferentialDrive::WheelSpeeds: attributes: left: right: diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml b/subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml index 5396d11f5..d713db882 100644 --- a/subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml +++ b/subprojects/robotpy-wpilib/semiwrap/drive/MecanumDrive.yml @@ -1,13 +1,13 @@ extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/motorcontrol/MotorController.h +- wpi/util/sendable/SendableBuilder.hpp +- wpi/hardware/motor/MotorController.hpp classes: - frc::MecanumDrive: + wpi::MecanumDrive: force_type_casters: - - units::radian_t + - wpi::units::radian_t ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: MecanumDrive: overloads: @@ -21,16 +21,16 @@ classes: DriveCartesian: param_override: gyroAngle: - default: frc::Rotation2d(0_rad) + default: wpi::math::Rotation2d(0_rad) DrivePolar: DriveCartesianIK: param_override: gyroAngle: - default: frc::Rotation2d(0_rad) + default: wpi::math::Rotation2d(0_rad) StopMotor: GetDescription: InitSendable: - frc::MecanumDrive::WheelSpeeds: + wpi::MecanumDrive::WheelSpeeds: attributes: frontLeft: frontRight: diff --git a/subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml b/subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml index 83ce25c6e..a146ef0fa 100644 --- a/subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml +++ b/subprojects/robotpy-wpilib/semiwrap/drive/RobotDriveBase.yml @@ -1,9 +1,9 @@ extra_includes: -- frc/motorcontrol/MotorController.h -- wpi/SmallString.h +- wpi/hardware/motor/MotorController.hpp +- wpi/util/SmallString.hpp classes: - frc::RobotDriveBase: + wpi::RobotDriveBase: attributes: m_deadband: m_maxOutput: diff --git a/subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml b/subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml index 7de3bc73f..69dc7fd6f 100644 --- a/subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml +++ b/subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml @@ -1,5 +1,5 @@ classes: - frc::BooleanEvent: + wpi::BooleanEvent: methods: BooleanEvent: GetAsBoolean: diff --git a/subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml b/subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml index eab98c2db..0f678cfd9 100644 --- a/subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml +++ b/subprojects/robotpy-wpilib/semiwrap/event/EventLoop.yml @@ -1,5 +1,5 @@ classes: - frc::EventLoop: + wpi::EventLoop: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml b/subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml index 2fbbcdce9..f6521d509 100644 --- a/subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml +++ b/subprojects/robotpy-wpilib/semiwrap/event/NetworkBooleanEvent.yml @@ -1,24 +1,24 @@ extra_includes: -- networktables/BooleanTopic.h -- networktables/NetworkTable.h -- networktables/NetworkTableInstance.h +- wpi/nt/BooleanTopic.hpp +- wpi/nt/NetworkTable.hpp +- wpi/nt/NetworkTableInstance.hpp classes: - frc::NetworkBooleanEvent: + wpi::NetworkBooleanEvent: force_no_trampoline: true methods: NetworkBooleanEvent: overloads: - EventLoop*, nt::BooleanTopic: + EventLoop*, wpi::nt::BooleanTopic: cpp_code: | - [](EventLoop *loop, nt::BooleanTopic &topic) { + [](EventLoop *loop, wpi::nt::BooleanTopic &topic) { return std::make_unique(loop, std::move(topic)); } - EventLoop*, nt::BooleanSubscriber: + EventLoop*, wpi::nt::BooleanSubscriber: cpp_code: | - [](EventLoop *loop, nt::BooleanSubscriber &sub) { + [](EventLoop *loop, wpi::nt::BooleanSubscriber &sub) { return std::make_unique(loop, std::move(sub)); } - EventLoop*, std::shared_ptr, std::string_view: + EventLoop*, std::shared_ptr, std::string_view: EventLoop*, std::string_view, std::string_view: - EventLoop*, nt::NetworkTableInstance, std::string_view, std::string_view: + EventLoop*, wpi::nt::NetworkTableInstance, std::string_view, std::string_view: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml index aa232e08d..8f8080585 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/ADXL345_I2C.h +- wpi/hardware/accelerometer/ADXL345_I2C.hpp classes: - frc::sim::ADXL345Sim: + wpi::sim::ADXL345Sim: methods: ADXL345Sim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/AddressableLEDSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/AddressableLEDSim.yml index b4a71044e..ac48cce4f 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/AddressableLEDSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/AddressableLEDSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/AddressableLED.h +- wpi/hardware/led/AddressableLED.hpp classes: - frc::sim::AddressableLEDSim: + wpi::sim::AddressableLEDSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogEncoderSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogEncoderSim.yml index e5f63fcb4..01e06327b 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogEncoderSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogEncoderSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/AnalogEncoder.h +- wpi/hardware/rotation/AnalogEncoder.hpp classes: - frc::sim::AnalogEncoderSim: + wpi::sim::AnalogEncoderSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogInputSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogInputSim.yml index 7996713c2..f13e7c0ae 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogInputSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/AnalogInputSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/AnalogInput.h +- wpi/hardware/discrete/AnalogInput.hpp classes: - frc::sim::AnalogInputSim: + wpi::sim::AnalogInputSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/BatterySim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/BatterySim.yml index e840ddf7f..ef2ad412d 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/BatterySim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/BatterySim.yml @@ -1,13 +1,13 @@ classes: - frc::sim::BatterySim: + wpi::sim::BatterySim: force_type_casters: - - units::ampere_t + - wpi::units::ampere_t methods: Calculate: overloads: - units::volt_t, units::ohm_t, std::span: - units::volt_t, units::ohm_t, std::initializer_list: + wpi::units::volt_t, wpi::units::ohm_t, std::span: + wpi::units::volt_t, wpi::units::ohm_t, std::initializer_list: ignore: true - std::span: - std::initializer_list: + std::span: + std::initializer_list: ignore: true diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/CTREPCMSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/CTREPCMSim.yml index 43a511218..463ded844 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/CTREPCMSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/CTREPCMSim.yml @@ -1,10 +1,10 @@ extra_includes: -- frc/Compressor.h +- wpi/hardware/pneumatic/Compressor.hpp classes: - frc::sim::CTREPCMSim: + wpi::sim::CTREPCMSim: typealias: - - frc::PneumaticsBase + - wpi::PneumaticsBase force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/CallbackStore.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/CallbackStore.yml index 5254c98d4..eb974c231 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/CallbackStore.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/CallbackStore.yml @@ -4,7 +4,7 @@ functions: ConstBufferCallbackStoreThunk: ignore: true classes: - frc::sim::CallbackStore: + wpi::sim::CallbackStore: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DCMotorSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DCMotorSim.yml index 19ba35105..79b9b4c34 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DCMotorSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DCMotorSim.yml @@ -1,14 +1,14 @@ classes: - frc::sim::DCMotorSim: + wpi::sim::DCMotorSim: typealias: - - frc::DCMotor + - wpi::math::DCMotor methods: DCMotorSim: overloads: - const LinearSystem<2, 1, 2>&, const DCMotor&, const std::array&: + const wpi::math::LinearSystem<2, 1, 2>&, const wpi::math::DCMotor&, const std::array&: param_override: plant: - x_type: frc::LinearSystem<2,1,2> + x_type: wpi::math::LinearSystem<2,1,2> SetState: GetAngularPosition: GetAngularVelocity: @@ -27,9 +27,9 @@ inline_code: | cls_DCMotorSim // java API compatibility .def("getAngularPositionRotations", [](const DCMotorSim &self) { - return units::turn_t{self.GetAngularPosition()}; + return wpi::units::turn_t{self.GetAngularPosition()}; }, py::doc("Returns the DC motor position in rotations")) .def("getAngularVelocityRPM", [](const DCMotorSim &self) { - return units::revolutions_per_minute_t{self.GetAngularVelocity()}; + return wpi::units::revolutions_per_minute_t{self.GetAngularVelocity()}; }, py::doc("Returns the DC motor velocity in revolutions per minute")) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DIOSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DIOSim.yml index 12fd33aa6..1643f6cdb 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DIOSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DIOSim.yml @@ -1,9 +1,9 @@ extra_includes: -- frc/DigitalInput.h -- frc/DigitalOutput.h +- wpi/hardware/discrete/DigitalInput.hpp +- wpi/hardware/discrete/DigitalOutput.hpp classes: - frc::sim::DIOSim: + wpi::sim::DIOSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DifferentialDrivetrainSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DifferentialDrivetrainSim.yml index 045bfe767..5ca862b02 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DifferentialDrivetrainSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DifferentialDrivetrainSim.yml @@ -1,16 +1,16 @@ classes: - frc::sim::DifferentialDrivetrainSim: + wpi::sim::DifferentialDrivetrainSim: typealias: - - frc::DCMotor - - template using LinearSystem = frc::LinearSystem + - wpi::math::DCMotor + - template using LinearSystem = wpi::math::LinearSystem methods: DifferentialDrivetrainSim: overloads: - LinearSystem<2, 2, 2>, units::meter_t, DCMotor, double, units::meter_t, const std::array&: - param_override: + ? wpi::math::LinearSystem<2, 2, 2>, wpi::units::meter_t, wpi::math::DCMotor, double, wpi::units::meter_t, const std::array& + : param_override: measurementStdDevs: default: std::array{} - ? frc::DCMotor, double, units::kilogram_square_meter_t, units::kilogram_t, units::meter_t, units::meter_t, const std::array& + ? wpi::math::DCMotor, double, wpi::units::kilogram_square_meter_t, wpi::units::kilogram_t, wpi::units::meter_t, wpi::units::meter_t, const std::array& : param_override: measurementStdDevs: default: std::array{} @@ -33,15 +33,15 @@ classes: Dynamics: CreateKitbotSim: overloads: - frc::DCMotor, double, units::meter_t, const std::array&: + wpi::math::DCMotor, double, wpi::units::meter_t, const std::array&: param_override: measurementStdDevs: default: std::array{} - frc::DCMotor, double, units::meter_t, units::kilogram_square_meter_t, const std::array&: + wpi::math::DCMotor, double, wpi::units::meter_t, wpi::units::kilogram_square_meter_t, const std::array&: param_override: measurementStdDevs: default: std::array{} - frc::sim::DifferentialDrivetrainSim::State: + wpi::sim::DifferentialDrivetrainSim::State: attributes: kX: kY: @@ -50,14 +50,14 @@ classes: kRightVelocity: kLeftPosition: kRightPosition: - frc::sim::DifferentialDrivetrainSim::KitbotGearing: + wpi::sim::DifferentialDrivetrainSim::KitbotGearing: attributes: k12p75: k10p71: k8p45: k7p31: k5p95: - frc::sim::DifferentialDrivetrainSim::KitbotMotor: + wpi::sim::DifferentialDrivetrainSim::KitbotMotor: attributes: SingleCIMPerSide: DualCIMPerSide: @@ -67,7 +67,7 @@ classes: DualFalcon500PerSide: SingleNEOPerSide: DualNEOPerSide: - frc::sim::DifferentialDrivetrainSim::KitbotWheelSize: + wpi::sim::DifferentialDrivetrainSim::KitbotWheelSize: attributes: kSixInch: kEightInch: @@ -75,22 +75,22 @@ classes: inline_code: |- cls_DifferentialDrivetrainSim - .def("getLeftPositionFeet", [](DifferentialDrivetrainSim * self) -> units::foot_t { + .def("getLeftPositionFeet", [](DifferentialDrivetrainSim * self) -> wpi::units::foot_t { return self->GetLeftPosition(); }) - .def("getLeftPositionInches", [](DifferentialDrivetrainSim * self) -> units::inch_t { + .def("getLeftPositionInches", [](DifferentialDrivetrainSim * self) -> wpi::units::inch_t { return self->GetLeftPosition(); }) - .def("getLeftVelocityFps", [](DifferentialDrivetrainSim * self) -> units::feet_per_second_t { + .def("getLeftVelocityFps", [](DifferentialDrivetrainSim * self) -> wpi::units::feet_per_second_t { return self->GetLeftVelocity(); }) - .def("getRightPositionFeet", [](DifferentialDrivetrainSim * self) -> units::foot_t { + .def("getRightPositionFeet", [](DifferentialDrivetrainSim * self) -> wpi::units::foot_t { return self->GetRightPosition(); }) - .def("getRightPositionInches", [](DifferentialDrivetrainSim * self) -> units::inch_t { + .def("getRightPositionInches", [](DifferentialDrivetrainSim * self) -> wpi::units::inch_t { return self->GetRightPosition(); }) - .def("getRightVelocityFps", [](DifferentialDrivetrainSim * self) -> units::feet_per_second_t { + .def("getRightVelocityFps", [](DifferentialDrivetrainSim * self) -> wpi::units::feet_per_second_t { return self->GetRightVelocity(); }) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DigitalPWMSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DigitalPWMSim.yml index e770d5c51..e53721486 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DigitalPWMSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DigitalPWMSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/DigitalOutput.h +- wpi/hardware/discrete/DigitalOutput.hpp classes: - frc::sim::DigitalPWMSim: + wpi::sim::DigitalPWMSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DoubleSolenoidSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DoubleSolenoidSim.yml index 4b44c6450..4678e03a8 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DoubleSolenoidSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DoubleSolenoidSim.yml @@ -1,7 +1,7 @@ classes: - frc::sim::DoubleSolenoidSim: + wpi::sim::DoubleSolenoidSim: typealias: - - frc::PneumaticsModuleType + - wpi::PneumaticsModuleType methods: DoubleSolenoidSim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DriverStationSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DriverStationSim.yml index c58c6663b..273c2584f 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DriverStationSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DriverStationSim.yml @@ -1,5 +1,5 @@ classes: - frc::sim::DriverStationSim: + wpi::sim::DriverStationSim: force_type_casters: - std::function methods: @@ -35,13 +35,8 @@ classes: SetJoystickButton: SetJoystickAxis: SetJoystickPOV: - SetJoystickButtons: - SetJoystickAxisCount: - SetJoystickPOVCount: - SetJoystickButtonCount: SetJoystickType: SetJoystickName: - SetJoystickAxisType: SetGameSpecificMessage: SetEventName: SetMatchType: @@ -49,3 +44,9 @@ classes: SetReplayNumber: ResetData: SetJoystickIsGamepad: + SetJoystickAxesMaximumIndex: + SetJoystickAxesAvailable: + SetJoystickPOVsMaximumIndex: + SetJoystickPOVsAvailable: + SetJoystickButtonsMaximumIndex: + SetJoystickButtonsAvailable: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleEncoderSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleEncoderSim.yml index e2a74fd9f..174e96fdd 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleEncoderSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleEncoderSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/DutyCycleEncoder.h +- wpi/hardware/rotation/DutyCycleEncoder.hpp classes: - frc::sim::DutyCycleEncoderSim: + wpi::sim::DutyCycleEncoderSim: methods: DutyCycleEncoderSim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleSim.yml index ca5f62a71..a15d245dc 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/DutyCycleSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/DutyCycle.h +- wpi/hardware/rotation/DutyCycle.hpp classes: - frc::sim::DutyCycleSim: + wpi::sim::DutyCycleSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/ElevatorSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/ElevatorSim.yml index 8301854df..2170e0413 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/ElevatorSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/ElevatorSim.yml @@ -1,21 +1,21 @@ classes: - frc::sim::ElevatorSim: + wpi::sim::ElevatorSim: typealias: - - frc::DCMotor - - template using LinearSystem = frc::LinearSystem - - template using Vectord = frc::Vectord + - wpi::math::DCMotor + - template using LinearSystem = wpi::math::LinearSystem + - template using Vectord = wpi::math::Vectord methods: ElevatorSim: overloads: - ? const LinearSystem<2, 1, 2>&, const DCMotor&, units::meter_t, units::meter_t, bool, units::meter_t, const std::array& + ? const wpi::math::LinearSystem<2, 1, 2>&, const wpi::math::DCMotor&, wpi::units::meter_t, wpi::units::meter_t, bool, wpi::units::meter_t, const std::array& : param_override: measurementStdDevs: default: std::array{0.0, 0.0} - ? const DCMotor&, double, units::kilogram_t, units::meter_t, units::meter_t, units::meter_t, bool, units::meter_t, const std::array& + ? const wpi::math::DCMotor&, double, wpi::units::kilogram_t, wpi::units::meter_t, wpi::units::meter_t, wpi::units::meter_t, bool, wpi::units::meter_t, const std::array& : param_override: measurementStdDevs: default: std::array{0.0} - ? decltype(1_V/Velocity_t (1)), decltype(1_V/Acceleration_t (1)), const DCMotor&, units::meter_t, units::meter_t, bool, units::meter_t, const std::array& + ? decltype(1_V/Velocity_t (1)), decltype(1_V/Acceleration_t (1)), const wpi::math::DCMotor&, wpi::units::meter_t, wpi::units::meter_t, bool, wpi::units::meter_t, const std::array& : ignore: true SetState: WouldHitLowerLimit: @@ -30,13 +30,13 @@ classes: inline_code: |- cls_ElevatorSim - .def("getPositionFeet", [](ElevatorSim * self) -> units::foot_t { + .def("getPositionFeet", [](ElevatorSim * self) -> wpi::units::foot_t { return self->GetPosition(); }) - .def("getPositionInches", [](ElevatorSim * self) -> units::inch_t { + .def("getPositionInches", [](ElevatorSim * self) -> wpi::units::inch_t { return self->GetPosition(); }) - .def("getVelocityFps", [](ElevatorSim * self) -> units::feet_per_second_t { + .def("getVelocityFps", [](ElevatorSim * self) -> wpi::units::feet_per_second_t { return self->GetVelocity(); }) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/EncoderSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/EncoderSim.yml index 1bc697ff5..9b4288ba4 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/EncoderSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/EncoderSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/Encoder.h +- wpi/hardware/rotation/Encoder.hpp classes: - frc::sim::EncoderSim: + wpi::sim::EncoderSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/FlywheelSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/FlywheelSim.yml index 4e80360f8..931b684c4 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/FlywheelSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/FlywheelSim.yml @@ -1,16 +1,16 @@ classes: - frc::sim::FlywheelSim: + wpi::sim::FlywheelSim: typealias: - - frc::DCMotor - - template using LinearSystem = frc::LinearSystem + - wpi::math::DCMotor + - template using LinearSystem = wpi::math::LinearSystem methods: FlywheelSim: overloads: - const LinearSystem<1, 1, 1>&, const DCMotor&, double, const std::array&: + const wpi::math::LinearSystem<1, 1, 1>&, const wpi::math::DCMotor&, double, const std::array&: param_override: measurementStdDevs: default: std::array{0.0} - const DCMotor&, double, units::kilogram_square_meter_t, const std::array&: + const wpi::math::DCMotor&, double, wpi::units::kilogram_square_meter_t, const std::array&: param_override: measurementStdDevs: default: std::array{0.0} diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/GamepadSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/GamepadSim.yml new file mode 100644 index 000000000..a9572823a --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/GamepadSim.yml @@ -0,0 +1,43 @@ +extra_includes: +- wpi/driverstation/Gamepad.hpp + +classes: + wpi::sim::GamepadSim: + force_no_trampoline: true + methods: + GamepadSim: + overloads: + const Gamepad&: + int: + SetLeftX: + SetLeftY: + SetRightX: + SetRightY: + SetLeftTriggerAxis: + SetRightTriggerAxis: + SetSouthFaceButton: + SetEastFaceButton: + SetWestFaceButton: + SetNorthFaceButton: + SetBackButton: + SetGuideButton: + SetStartButton: + SetLeftStickButton: + SetRightStickButton: + SetLeftShoulderButton: + SetRightShoulderButton: + SetDpadUpButton: + SetDpadDownButton: + SetDpadLeftButton: + SetDpadRightButton: + SetMisc1Button: + SetRightPaddle1Button: + SetLeftPaddle1Button: + SetRightPaddle2Button: + SetLeftPaddle2Button: + SetTouchpadButton: + SetMisc2Button: + SetMisc3Button: + SetMisc4Button: + SetMisc5Button: + SetMisc6Button: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/GenericHIDSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/GenericHIDSim.yml index 176317c98..f001bd92c 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/GenericHIDSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/GenericHIDSim.yml @@ -1,5 +1,5 @@ classes: - frc::sim::GenericHIDSim: + wpi::sim::GenericHIDSim: methods: GenericHIDSim: overloads: @@ -12,12 +12,14 @@ classes: overloads: int, DriverStation::POVDirection: DriverStation::POVDirection: - SetAxisCount: - SetPOVCount: - SetButtonCount: SetType: SetName: - SetAxisType: GetOutput: GetOutputs: GetRumble: + SetAxesMaximumIndex: + SetAxesAvailable: + SetPOVsMaximumIndex: + SetPOVsAvailable: + SetButtonsMaximumIndex: + SetButtonsAvailable: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/JoystickSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/JoystickSim.yml index a4b9680b5..2b080ac82 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/JoystickSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/JoystickSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/Joystick.h +- wpi/driverstation/Joystick.hpp classes: - frc::sim::JoystickSim: + wpi::sim::JoystickSim: force_no_trampoline: true methods: JoystickSim: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/LinearSystemSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/LinearSystemSim.yml index 9261649ed..040e2a342 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/LinearSystemSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/LinearSystemSim.yml @@ -1,8 +1,8 @@ classes: - frc::sim::LinearSystemSim: + wpi::sim::LinearSystemSim: typealias: - - template using LinearSystem = frc::LinearSystem - - template using Vectord = frc::Vectord + - template using LinearSystem = wpi::math::LinearSystem + - template using Vectord = wpi::math::Vectord template_params: - int States - int Inputs @@ -25,7 +25,7 @@ classes: int [const]: SetInput: overloads: - const Vectord&: + const wpi::math::Vectord&: int, double: GetInput: overloads: @@ -38,37 +38,37 @@ classes: templates: LinearSystemSim_1_1_1: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 1 - 1 - 1 LinearSystemSim_1_1_2: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 1 - 1 - 2 LinearSystemSim_2_1_1: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 2 - 1 - 1 LinearSystemSim_2_1_2: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 2 - 1 - 2 LinearSystemSim_2_2_1: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 2 - 2 - 1 LinearSystemSim_2_2_2: - qualname: frc::sim::LinearSystemSim + qualname: wpi::sim::LinearSystemSim params: - 2 - 2 diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PS4ControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PS4ControllerSim.yml index 1bfe801e5..cc19ca496 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PS4ControllerSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PS4ControllerSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/PS4Controller.h +- wpi/driverstation/PS4Controller.hpp classes: - frc::sim::PS4ControllerSim: + wpi::sim::PS4ControllerSim: force_no_trampoline: true methods: PS4ControllerSim: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PS5ControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PS5ControllerSim.yml index 7b9314359..36cb9c57c 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PS5ControllerSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PS5ControllerSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/PS5Controller.h +- wpi/driverstation/PS5Controller.hpp classes: - frc::sim::PS5ControllerSim: + wpi::sim::PS5ControllerSim: force_no_trampoline: true methods: PS5ControllerSim: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml index 2b1e8e7d3..8f65140ba 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml @@ -1,5 +1,5 @@ classes: - frc::sim::PWMMotorControllerSim: + wpi::sim::PWMMotorControllerSim: methods: PWMMotorControllerSim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PWMSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMSim.yml index e1d05a1f7..dd58ff550 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PWMSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMSim.yml @@ -1,9 +1,9 @@ extra_includes: -- frc/PWM.h -- frc/motorcontrol/PWMMotorController.h +- wpi/hardware/discrete/PWM.hpp +- wpi/hardware/motor/PWMMotorController.hpp classes: - frc::sim::PWMSim: + wpi::sim::PWMSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PneumaticsBaseSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PneumaticsBaseSim.yml index 4dc83550b..6e62b5769 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PneumaticsBaseSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PneumaticsBaseSim.yml @@ -1,7 +1,7 @@ classes: - frc::sim::PneumaticsBaseSim: + wpi::sim::PneumaticsBaseSim: typealias: - - frc::PneumaticsBase + - wpi::PneumaticsBase attributes: m_index: force_type_casters: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PowerDistributionSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PowerDistributionSim.yml index 7a1a1bc40..ca6707474 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/PowerDistributionSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PowerDistributionSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/PowerDistribution.h +- wpi/hardware/power/PowerDistribution.hpp classes: - frc::sim::PowerDistributionSim: + wpi::sim::PowerDistributionSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/REVPHSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/REVPHSim.yml index e7f148d53..16e23cb77 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/REVPHSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/REVPHSim.yml @@ -1,10 +1,10 @@ extra_includes: -- frc/Compressor.h +- wpi/hardware/pneumatic/Compressor.hpp classes: - frc::sim::REVPHSim: + wpi::sim::REVPHSim: typealias: - - frc::PneumaticsBase + - wpi::PneumaticsBase force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/RoboRioSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/RoboRioSim.yml index 75a6cdb25..3cdb3fff7 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/RoboRioSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/RoboRioSim.yml @@ -1,5 +1,5 @@ classes: - frc::sim::RoboRioSim: + wpi::sim::RoboRioSim: force_type_casters: - std::function methods: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/SendableChooserSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/SendableChooserSim.yml index 8fde3ba61..778bc3c9d 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/SendableChooserSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/SendableChooserSim.yml @@ -1,8 +1,8 @@ classes: - frc::sim::SendableChooserSim: + wpi::sim::SendableChooserSim: methods: SendableChooserSim: overloads: std::string_view: - nt::NetworkTableInstance, std::string_view: + wpi::nt::NetworkTableInstance, std::string_view: SetSelected: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/SharpIRSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/SharpIRSim.yml index 5b9659ae7..3f75e476a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/SharpIRSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/SharpIRSim.yml @@ -1,5 +1,5 @@ classes: - frc::SharpIRSim: + wpi::SharpIRSim: methods: SharpIRSim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/SimDeviceSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/SimDeviceSim.yml index 8be1e5942..4eac4dc70 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/SimDeviceSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/SimDeviceSim.yml @@ -2,7 +2,7 @@ extra_includes: - pybind11/stl.h classes: - frc::sim::SimDeviceSim: + wpi::sim::SimDeviceSim: doc: | Interact with a generic simulated device @@ -65,7 +65,7 @@ classes: inline_code: | cls_SimDeviceSim - .def("enumerateValues", [](frc::sim::SimDeviceSim * that) { + .def("enumerateValues", [](wpi::sim::SimDeviceSim * that) { std::vector> values; that->EnumerateValues([&values](const char * name, HAL_SimValueHandle handle, HAL_Bool readonly, const struct HAL_Value * value){ @@ -76,7 +76,7 @@ inline_code: | "Returns a list of (name, readonly) tuples of available values for this device") .def_static("enumerateDevices", [](const char * prefix) { std::vector devices; - frc::sim::SimDeviceSim::EnumerateDevices(prefix, [&devices](const char * name, HAL_SimDeviceHandle handle) { + wpi::sim::SimDeviceSim::EnumerateDevices(prefix, [&devices](const char * name, HAL_SimDeviceHandle handle) { devices.push_back(std::string(name)); }); return devices; diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/SingleJointedArmSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/SingleJointedArmSim.yml index 732158034..51bc81431 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/SingleJointedArmSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/SingleJointedArmSim.yml @@ -1,17 +1,17 @@ classes: - frc::sim::SingleJointedArmSim: + wpi::sim::SingleJointedArmSim: typealias: - - frc::DCMotor - - template using LinearSystem = frc::LinearSystem - - template using Vectord = frc::Vectord + - wpi::math::DCMotor + - template using LinearSystem = wpi::math::LinearSystem + - template using Vectord = wpi::math::Vectord methods: SingleJointedArmSim: overloads: - ? const LinearSystem<2, 1, 2>&, const DCMotor&, double, units::meter_t, units::radian_t, units::radian_t, bool, units::radian_t, const std::array& + ? const wpi::math::LinearSystem<2, 1, 2>&, const wpi::math::DCMotor&, double, wpi::units::meter_t, wpi::units::radian_t, wpi::units::radian_t, bool, wpi::units::radian_t, const std::array& : param_override: measurementStdDevs: default: std::array{0.0, 0.0} - ? const DCMotor&, double, units::kilogram_square_meter_t, units::meter_t, units::radian_t, units::radian_t, bool, units::radian_t, const std::array& + ? const wpi::math::DCMotor&, double, wpi::units::kilogram_square_meter_t, wpi::units::meter_t, wpi::units::radian_t, wpi::units::radian_t, bool, wpi::units::radian_t, const std::array& : param_override: measurementStdDevs: default: std::array{0.0, 0.0} @@ -29,10 +29,10 @@ classes: inline_code: |- cls_SingleJointedArmSim - .def("getAngleDegrees", [](SingleJointedArmSim * self) -> units::degree_t { + .def("getAngleDegrees", [](SingleJointedArmSim * self) -> wpi::units::degree_t { return self->GetAngle(); }) - .def("getVelocityDps", [](SingleJointedArmSim * self) -> units::degrees_per_second_t { + .def("getVelocityDps", [](SingleJointedArmSim * self) -> wpi::units::degrees_per_second_t { return self->GetVelocity(); }) ; diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/SolenoidSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/SolenoidSim.yml index 8cee1025a..bd495d980 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/SolenoidSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/SolenoidSim.yml @@ -1,9 +1,9 @@ classes: - frc::sim::SolenoidSim: + wpi::sim::SolenoidSim: force_type_casters: - std::function typealias: - - frc::PneumaticsModuleType + - wpi::PneumaticsModuleType methods: SolenoidSim: overloads: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/StadiaControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/StadiaControllerSim.yml index 41acf5b15..171bbec1a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/StadiaControllerSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/StadiaControllerSim.yml @@ -1,8 +1,8 @@ extra_includes: -- frc/StadiaController.h +- wpi/driverstation/StadiaController.hpp classes: - frc::sim::StadiaControllerSim: + wpi::sim::StadiaControllerSim: force_no_trampoline: true methods: StadiaControllerSim: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/XboxControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/XboxControllerSim.yml index 815c61c1c..9f1eb5813 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/XboxControllerSim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/XboxControllerSim.yml @@ -1,11 +1,11 @@ extra_includes: -- frc/XboxController.h +- wpi/driverstation/XboxController.hpp classes: - frc::sim::XboxControllerSim: + wpi::sim::XboxControllerSim: force_no_trampoline: true typealias: - - frc::XboxController + - wpi::XboxController methods: XboxControllerSim: overloads: diff --git a/subprojects/robotpy-wpilib/wpilib/__init__.py b/subprojects/robotpy-wpilib/wpilib/__init__.py index 878ae63ff..527a166a1 100644 --- a/subprojects/robotpy-wpilib/wpilib/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/__init__.py @@ -18,7 +18,6 @@ Color8Bit, Compressor, CompressorConfigType, - DMC60, DSControlWord, DataLogManager, DigitalInput, @@ -28,11 +27,15 @@ DutyCycle, DutyCycleEncoder, Encoder, + ExpansionHub, + ExpansionHubMotor, + ExpansionHubPidConstants, + ExpansionHubServo, Field2d, FieldObject2d, + Gamepad, I2C, IterativeRobotBase, - Jaguar, Joystick, Koors40, LEDPattern, @@ -64,7 +67,6 @@ RobotController, RobotState, RuntimeType, - SD540, SendableBuilderImpl, SendableChooser, SendableChooserBase, @@ -82,7 +84,6 @@ Timer, TimesliceRobot, Tracer, - Victor, VictorSP, Watchdog, XboxController, @@ -109,7 +110,6 @@ "Color8Bit", "Compressor", "CompressorConfigType", - "DMC60", "DSControlWord", "DataLogManager", "DigitalInput", @@ -119,11 +119,15 @@ "DutyCycle", "DutyCycleEncoder", "Encoder", + "ExpansionHub", + "ExpansionHubMotor", + "ExpansionHubPidConstants", + "ExpansionHubServo", "Field2d", "FieldObject2d", + "Gamepad", "I2C", "IterativeRobotBase", - "Jaguar", "Joystick", "Koors40", "LEDPattern", @@ -155,7 +159,6 @@ "RobotController", "RobotState", "RuntimeType", - "SD540", "SendableBuilderImpl", "SendableChooser", "SendableChooserBase", @@ -173,7 +176,6 @@ "Timer", "TimesliceRobot", "Tracer", - "Victor", "VictorSP", "Watchdog", "XboxController", diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py index 3e3260b40..041923862 100644 --- a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py @@ -23,6 +23,7 @@ ElevatorSim, EncoderSim, FlywheelSim, + GamepadSim, GenericHIDSim, JoystickSim, LinearSystemSim_1_1_1, @@ -77,6 +78,7 @@ "ElevatorSim", "EncoderSim", "FlywheelSim", + "GamepadSim", "GenericHIDSim", "JoystickSim", "LinearSystemSim_1_1_1", diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp b/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp index 107d55fc5..c562e91cb 100644 --- a/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp +++ b/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp @@ -3,23 +3,23 @@ #ifndef __FRC_SYSTEMCORE__ -namespace frc::impl { +namespace wpi::impl { void ResetSmartDashboardInstance(); void ResetMotorSafety(); -} // namespace frc::impl +} // namespace wpi::impl -namespace wpi::impl { +namespace wpi::util::impl { void ResetSendableRegistry(); } // namespace wpi::impl void resetWpilibSimulationData() { - frc::impl::ResetSmartDashboardInstance(); - frc::impl::ResetMotorSafety(); - wpi::impl::ResetSendableRegistry(); + wpi::impl::ResetSmartDashboardInstance(); + wpi::impl::ResetMotorSafety(); + wpi::util::impl::ResetSendableRegistry(); } void resetMotorSafety() { - frc::impl::ResetMotorSafety(); + wpi::impl::ResetMotorSafety(); } #else diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/ControlWord.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/ControlWord.cpp index 2ca92921c..08e1fc080 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/ControlWord.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/ControlWord.cpp @@ -1,6 +1,6 @@ #include "rpy/ControlWord.h" -#include +#include "wpi/hal/DriverStation.h" namespace rpy { diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h b/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h index d26d2117d..95dc59f59 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h @@ -1,7 +1,7 @@ #pragma once -#include +#include "wpi/util/fs.hpp" namespace robotpy::filesystem { diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp index 7fe023911..9243a63bc 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp @@ -4,17 +4,17 @@ #include "MotorControllerGroup.h" -#include "wpi/sendable/SendableBuilder.h" +#include "wpi/util/sendable/SendableBuilder.hpp" -using namespace frc; +using namespace wpi; void PyMotorControllerGroup::Initialize() { for (auto motorController : m_motorControllers) { - wpi::SendableRegistry::AddChild(this, motorController.get()); + wpi::util::SendableRegistry::AddChild(this, motorController.get()); } static int instances = 0; ++instances; - wpi::SendableRegistry::Add(this, "MotorControllerGroup", instances); + wpi::util::SendableRegistry::Add(this, "MotorControllerGroup", instances); } void PyMotorControllerGroup::Set(double speed) { @@ -23,7 +23,7 @@ void PyMotorControllerGroup::Set(double speed) { } } -void PyMotorControllerGroup::SetVoltage(units::volt_t output) { +void PyMotorControllerGroup::SetVoltage(wpi::units::volt_t output) { for (auto motorController : m_motorControllers) { motorController->SetVoltage(m_isInverted ? -output : output); } @@ -54,7 +54,7 @@ void PyMotorControllerGroup::StopMotor() { } } -void PyMotorControllerGroup::InitSendable(wpi::SendableBuilder& builder) { +void PyMotorControllerGroup::InitSendable(wpi::util::SendableBuilder& builder) { builder.SetSmartDashboardType("Motor Controller"); builder.SetActuator(true); builder.AddDoubleProperty("Value", [=, this]() { return Get(); }, diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.h b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.h index a34ada944..26714d64f 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.h +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.h @@ -9,17 +9,17 @@ #include -#include "frc/motorcontrol/MotorController.h" -#include "wpi/sendable/Sendable.h" -#include "wpi/sendable/SendableHelper.h" +#include "wpi/hardware/motor/MotorController.hpp" +#include "wpi/util/sendable/Sendable.hpp" +#include "wpi/util/sendable/SendableHelper.hpp" -namespace frc { +namespace wpi { -class PyMotorControllerGroup : public wpi::Sendable, +class PyMotorControllerGroup : public wpi::util::Sendable, public MotorController, - public wpi::SendableHelper { + public wpi::util::SendableHelper { public: - PyMotorControllerGroup(std::vector> &&args) : + PyMotorControllerGroup(std::vector> &&args) : m_motorControllers(args) {} ~PyMotorControllerGroup() override = default; @@ -27,20 +27,20 @@ class PyMotorControllerGroup : public wpi::Sendable, PyMotorControllerGroup& operator=(PyMotorControllerGroup&&) = default; void Set(double speed) override; - void SetVoltage(units::volt_t output) override; + void SetVoltage(wpi::units::volt_t output) override; double Get() const override; void SetInverted(bool isInverted) override; bool GetInverted() const override; void Disable() override; void StopMotor() override; - void InitSendable(wpi::SendableBuilder& builder) override; + void InitSendable(wpi::util::SendableBuilder& builder) override; private: void Initialize(); bool m_isInverted = false; - std::vector> m_motorControllers; + std::vector> m_motorControllers; }; } // namespace rpy diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp index 2e3ced010..b84bd2ed2 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp @@ -7,16 +7,16 @@ #include #include -#include -#include +#include "wpi/hal/Notifier.h" +#include "wpi/hal/Threads.h" -#include "frc/Errors.h" -#include "frc/Timer.h" +#include "wpi/system/Errors.hpp" +#include "wpi/system/Timer.hpp" #include #include -using namespace frc; +using namespace wpi; using namespace pybind11::literals; // Hang the thread since returning to the caller is going to crash when we try @@ -33,12 +33,12 @@ static void _hang_thread_if_finalizing() { PyNotifier::PyNotifier(std::function handler) { if (!handler) { - throw FRC_MakeError(err::NullParameter, "handler"); + throw WPILIB_MakeError(err::NullParameter, "handler"); } m_handler = handler; int32_t status = 0; m_notifier = HAL_InitializeNotifier(&status); - FRC_CheckErrorStatus(status, "InitializeNotifier"); + WPILIB_CheckErrorStatus(status, "InitializeNotifier"); std::function target([this] { py::gil_scoped_release release; @@ -99,7 +99,7 @@ PyNotifier::~PyNotifier() { // atomically set handle to 0, then clean HAL_NotifierHandle handle = m_notifier.exchange(0); HAL_StopNotifier(handle, &status); - FRC_ReportError(status, "StopNotifier"); + WPILIB_ReportError(status, "StopNotifier"); // Join the thread to ensure the handler has exited. if (m_thread) { @@ -144,7 +144,7 @@ void PyNotifier::SetCallback(std::function handler) { m_handler = handler; } -void PyNotifier::StartSingle(units::second_t delay) { +void PyNotifier::StartSingle(wpi::units::second_t delay) { std::scoped_lock lock(m_processMutex); m_periodic = false; m_period = delay; @@ -152,7 +152,7 @@ void PyNotifier::StartSingle(units::second_t delay) { UpdateAlarm(); } -void PyNotifier::StartPeriodic(units::second_t period) { +void PyNotifier::StartPeriodic(wpi::units::second_t period) { std::scoped_lock lock(m_processMutex); m_periodic = true; m_period = period; @@ -165,7 +165,7 @@ void PyNotifier::Stop() { m_periodic = false; int32_t status = 0; HAL_CancelNotifierAlarm(m_notifier, &status); - FRC_CheckErrorStatus(status, "CancelNotifierAlarm"); + WPILIB_CheckErrorStatus(status, "CancelNotifierAlarm"); } void PyNotifier::UpdateAlarm(uint64_t triggerTime) { @@ -176,7 +176,7 @@ void PyNotifier::UpdateAlarm(uint64_t triggerTime) { return; } HAL_UpdateNotifierAlarm(notifier, triggerTime, &status); - FRC_CheckErrorStatus(status, "UpdateNotifierAlarm"); + WPILIB_CheckErrorStatus(status, "UpdateNotifierAlarm"); } void PyNotifier::UpdateAlarm() { diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.h b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.h index 0e48165dc..ebd39b4fc 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.h +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.h @@ -13,13 +13,13 @@ #include #include -#include -#include -#include +#include "wpi/hal/Types.h" +#include "wpi/units/time.hpp" +#include "wpi/util/mutex.hpp" #include -namespace frc { +namespace wpi { class PyNotifier { public: @@ -66,7 +66,7 @@ class PyNotifier { * * @param delay Amount of time to wait before the handler is called. */ - void StartSingle(units::second_t delay); + void StartSingle(wpi::units::second_t delay); /** * Register for periodic event notification. @@ -78,7 +78,7 @@ class PyNotifier { * @param period Period to call the handler starting one period * after the call to this method. */ - void StartPeriodic(units::second_t period); + void StartPeriodic(wpi::units::second_t period); /** * Stop timer events from occurring. @@ -125,7 +125,7 @@ class PyNotifier { py::object m_thread; // Held while updating process information - wpi::mutex m_processMutex; + wpi::util::mutex m_processMutex; // HAL handle, atomic for proper destruction std::atomic m_notifier{0}; @@ -134,13 +134,13 @@ class PyNotifier { std::function m_handler; // The absolute expiration time - units::second_t m_expirationTime = 0_s; + wpi::units::second_t m_expirationTime = 0_s; // The relative time (either periodic or single) - units::second_t m_period = 0_s; + wpi::units::second_t m_period = 0_s; // True if this is a periodic event bool m_periodic = false; }; -} // namespace frc +} // namespace wpi diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.cpp index 13cf561f2..9b8d43002 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.cpp @@ -15,7 +15,7 @@ static py::dict &getSmartDashboardData() { return data; } -void addSmartDashboardData(py::str &key, std::shared_ptr data) { +void addSmartDashboardData(py::str &key, std::shared_ptr data) { auto &sdData = getSmartDashboardData(); sdData[key] = py::cast(data); } diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.h b/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.h index 8323ebd11..6ec19f63b 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.h +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/SmartDashboardData.h @@ -1,7 +1,7 @@ #pragma once -#include +#include "wpi/util/sendable/Sendable.hpp" #include namespace rpy { @@ -10,7 +10,7 @@ namespace rpy { // These functions must be called with the GIL held // -void addSmartDashboardData(py::str &key, std::shared_ptr data); +void addSmartDashboardData(py::str &key, std::shared_ptr data); void clearSmartDashboardData(); void destroySmartDashboardData(); diff --git a/subprojects/robotpy-wpilog/pyproject.toml b/subprojects/robotpy-wpilog/pyproject.toml index 701e891aa..4bda639fd 100644 --- a/subprojects/robotpy-wpilog/pyproject.toml +++ b/subprojects/robotpy-wpilog/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-datalog==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3" + "robotpy-native-datalog==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project] name = "robotpy-wpilog" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC wpilog library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-datalog==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3" + "robotpy-native-datalog==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project.urls] @@ -43,8 +43,8 @@ update_init = [ scan_headers_ignore = [ # wpi/datalog "wpi/datalog/DataLog_c.h", - "wpi/datalog/DataLogReaderThread.h", - "wpi/datalog/FileLogger.h", + "wpi/datalog/DataLogReaderThread.hpp", + "wpi/datalog/FileLogger.hpp", ] [tool.semiwrap.extension_modules."wpilog._wpilog"] @@ -54,10 +54,10 @@ depends = ["wpiutil"] [tool.semiwrap.extension_modules."wpilog._wpilog".headers] # wpi/datalog -DataLog = "wpi/datalog/DataLog.h" -DataLogBackgroundWriter = "wpi/datalog/DataLogBackgroundWriter.h" -DataLogReader = "wpi/datalog/DataLogReader.h" -# DataLogReaderThread = "wpi/datalog/DataLogReaderThread.h" -DataLogWriter = "wpi/datalog/DataLogWriter.h" +DataLog = "wpi/datalog/DataLog.hpp" +DataLogBackgroundWriter = "wpi/datalog/DataLogBackgroundWriter.hpp" +DataLogReader = "wpi/datalog/DataLogReader.hpp" +# DataLogReaderThread = "wpi/datalog/DataLogReaderThread.hpp" +DataLogWriter = "wpi/datalog/DataLogWriter.hpp" # DataLog_c = "wpi/datalog/DataLog_c.h" -# FileLogger = "wpi/datalog/FileLogger.h" \ No newline at end of file +# FileLogger = "wpi/datalog/FileLogger.hpp" \ No newline at end of file diff --git a/subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml index 72aea6bb5..97fded96e 100644 --- a/subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml +++ b/subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml @@ -4,10 +4,10 @@ classes: DataLogBackgroundWriter: overloads: std::string_view, std::string_view, double, std::string_view: - wpi::Logger&, std::string_view, std::string_view, double, std::string_view: + wpi::util::Logger&, std::string_view, std::string_view, double, std::string_view: ignore: true std::function data)>, double, std::string_view: - wpi::Logger&, std::function data)>, double, std::string_view: + wpi::util::Logger&, std::function data)>, double, std::string_view: ignore: true SetFilename: Flush: diff --git a/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml index 558f7abc8..4a4af4153 100644 --- a/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml +++ b/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml @@ -263,7 +263,7 @@ classes: ignore: true wpi::log::DataLogReader: typealias: - - wpi::MemoryBuffer + - wpi::util::MemoryBuffer methods: DataLogReader: ignore: true @@ -294,7 +294,7 @@ inline_code: | cls_DataLogReader .def(py::init([](const std::string &filename) { - auto mbuf = wpi::MemoryBuffer::GetFile(filename); + auto mbuf = wpi::util::MemoryBuffer::GetFile(filename); if (!mbuf) { py::gil_scoped_acquire gil; #ifdef _WIN32 @@ -318,7 +318,7 @@ inline_code: | throw py::value_error("buffer must only have a single dimension"); } - auto mbuf = wpi::MemoryBuffer::GetMemBuffer(std::span((uint8_t*)req.ptr, req.size), name); + auto mbuf = wpi::util::MemoryBuffer::GetMemBuffer(std::span((uint8_t*)req.ptr, req.size), name); { py::gil_scoped_release gil; diff --git a/subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml index 716cc81df..95a9e30ac 100644 --- a/subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml +++ b/subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml @@ -16,11 +16,11 @@ classes: param_override: ec: ignore: true - wpi::Logger&, std::string_view, std::error_code&, std::string_view: + wpi::util::Logger&, std::string_view, std::error_code&, std::string_view: ignore: true - std::unique_ptr, std::string_view: + std::unique_ptr, std::string_view: ignore: true - wpi::Logger&, std::unique_ptr, std::string_view: + wpi::util::Logger&, std::unique_ptr, std::string_view: ignore: true Flush: Stop: diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 967f8f1b1..3a36a798a 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpimath==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", + "robotpy-native-wpimath==0.0.0", + "robotpy-wpiutil==0.0.0", # "numpy", # broken in raspbian CI ] [project] name = "robotpy-wpimath" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC WPIMath library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpimath==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3", + "robotpy-native-wpimath==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project.urls] @@ -57,36 +57,36 @@ update_init = [ scan_headers_ignore = [ - "frc/ct_matrix.h", - "frc/DARE.h", - "frc/EigenCore.h", - "frc/StateSpaceUtil.h", - - "frc/fmt/Eigen.h", - - "frc/estimator/AngleStatistics.h", - "frc/estimator/KalmanFilterLatencyCompensator.h", - "frc/estimator/MerweScaledSigmaPoints.h", - "frc/estimator/MerweUKF.h", - "frc/estimator/S3SigmaPoints.h", - "frc/estimator/S3UKF.h", - "frc/estimator/SigmaPoints.h", - "frc/estimator/SteadyStateKalmanFilter.h", - "frc/estimator/UnscentedKalmanFilter.h", - "frc/estimator/UnscentedTransform.h", - - "frc/geometry/detail/RotationVectorToMatrix.h", - - "frc/system/Discretization.h", - "frc/system/NumericalIntegration.h", - "frc/system/NumericalJacobian.h", - - "frc/proto/*", - "frc/*/proto/*", - - "frc/struct/*", - "frc/*/struct/*", - + "wpi/math/linalg/ct_matrix.hpp", + "wpi/math/linalg/DARE.hpp", + "wpi/math/linalg/EigenCore.hpp", + "wpi/math/util/StateSpaceUtil.hpp", + + "wpi/math/fmt/Eigen.hpp", + + "wpi/math/estimator/AngleStatistics.hpp", + "wpi/math/estimator/KalmanFilterLatencyCompensator.hpp", + "wpi/math/estimator/MerweScaledSigmaPoints.hpp", + "wpi/math/estimator/MerweUKF.hpp", + "wpi/math/estimator/S3SigmaPoints.hpp", + "wpi/math/estimator/S3UKF.hpp", + "wpi/math/estimator/SigmaPoints.hpp", + "wpi/math/estimator/SteadyStateKalmanFilter.hpp", + "wpi/math/estimator/UnscentedKalmanFilter.hpp", + "wpi/math/estimator/UnscentedTransform.hpp", + + "wpi/math/geometry/detail/RotationVectorToMatrix.hpp", + + "wpi/math/system/Discretization.hpp", + "wpi/math/system/NumericalIntegration.hpp", + "wpi/math/system/NumericalJacobian.hpp", + + "wpi/math/proto/*", + "wpi/math/*/proto/*", + + "wpi/math/struct/*", + "wpi/math/*/struct/*", + "[eE]igen/*", "gcem.hpp", @@ -95,11 +95,9 @@ scan_headers_ignore = [ "gch/*", "sleipnir/*", "type_casters/*", - "unsupported/*", - "units/*", - "wpimath/protobuf/*", + "wpi/units/*", - "wpimath/MathShared.h", + "wpi/math/util/MathShared.hpp", "rpy/geometryToString.h", "PyTrajectoryConstraint.h", @@ -115,1344 +113,1344 @@ includedir = ["wpimath/_impl/src", "wpimath/_impl/src/type_casters"] [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_acceleration_type_caster.h" types = [ - "units::feet_per_second_squared_t", - "units::meters_per_second_squared_t", - "units::standard_gravity_t", + "wpi::units::feet_per_second_squared_t", + "wpi::units::meters_per_second_squared_t", + "wpi::units::standard_gravity_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_acceleration_type_caster.h" types = [ - "units::feet_per_second_squared", - "units::feet_per_second_squared", - "units::meters_per_second_squared", - "units::meters_per_second_squared", - "units::standard_gravity", - "units::standard_gravity", + "wpi::units::feet_per_second_squared", + "wpi::units::feet_per_second_squared", + "wpi::units::meters_per_second_squared", + "wpi::units::meters_per_second_squared", + "wpi::units::standard_gravity", + "wpi::units::standard_gravity", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angle_type_caster.h" types = [ - "units::arcminute_t", - "units::arcsecond_t", - "units::degree_t", - "units::gradian_t", - "units::kiloradian_t", - "units::microradian_t", - "units::milliarcsecond_t", - "units::milliradian_t", - "units::nanoradian_t", - "units::radian_t", - "units::turn_t", + "wpi::units::arcminute_t", + "wpi::units::arcsecond_t", + "wpi::units::degree_t", + "wpi::units::gradian_t", + "wpi::units::kiloradian_t", + "wpi::units::microradian_t", + "wpi::units::milliarcsecond_t", + "wpi::units::milliradian_t", + "wpi::units::nanoradian_t", + "wpi::units::radian_t", + "wpi::units::turn_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angle_type_caster.h" types = [ - "units::arcminute", - "units::arcminutes", - "units::arcsecond", - "units::arcseconds", - "units::degree", - "units::degrees", - "units::gradian", - "units::gradians", - "units::kiloradian", - "units::kiloradians", - "units::microradian", - "units::microradians", - "units::milliarcsecond", - "units::milliarcseconds", - "units::milliradian", - "units::milliradians", - "units::nanoradian", - "units::nanoradians", - "units::radian", - "units::radians", - "units::turn", - "units::turns", + "wpi::units::arcminute", + "wpi::units::arcminutes", + "wpi::units::arcsecond", + "wpi::units::arcseconds", + "wpi::units::degree", + "wpi::units::degrees", + "wpi::units::gradian", + "wpi::units::gradians", + "wpi::units::kiloradian", + "wpi::units::kiloradians", + "wpi::units::microradian", + "wpi::units::microradians", + "wpi::units::milliarcsecond", + "wpi::units::milliarcseconds", + "wpi::units::milliradian", + "wpi::units::milliradians", + "wpi::units::nanoradian", + "wpi::units::nanoradians", + "wpi::units::radian", + "wpi::units::radians", + "wpi::units::turn", + "wpi::units::turns", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angular_acceleration_type_caster.h" types = [ - "units::radians_per_second_squared_t", - "units::degrees_per_second_squared_t", - "units::turns_per_second_squared_t", + "wpi::units::radians_per_second_squared_t", + "wpi::units::degrees_per_second_squared_t", + "wpi::units::turns_per_second_squared_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angular_acceleration_type_caster.h" types = [ - "units::radians_per_second_squared", - "units::degrees_per_second_squared", - "units::turns_per_second_squared", + "wpi::units::radians_per_second_squared", + "wpi::units::degrees_per_second_squared", + "wpi::units::turns_per_second_squared", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angular_velocity_type_caster.h" types = [ - "units::degrees_per_second_t", - "units::milliarcseconds_per_year_t", - "units::radians_per_second_t", - "units::turns_per_second_t", - "units::revolutions_per_minute_t", + "wpi::units::degrees_per_second_t", + "wpi::units::milliarcseconds_per_year_t", + "wpi::units::radians_per_second_t", + "wpi::units::turns_per_second_t", + "wpi::units::revolutions_per_minute_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_angular_velocity_type_caster.h" types = [ - "units::degrees_per_second", - "units::milliarcseconds_per_year", - "units::radians_per_second", - "units::turns_per_second", - "units::revolutions_per_minute", + "wpi::units::degrees_per_second", + "wpi::units::milliarcseconds_per_year", + "wpi::units::radians_per_second", + "wpi::units::turns_per_second", + "wpi::units::revolutions_per_minute", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_area_type_caster.h" types = [ - "units::acre_t", - "units::hectare_t", - "units::square_foot_t", - "units::square_inch_t", - "units::square_kilometer_t", - "units::square_meter_t", - "units::square_mile_t", + "wpi::units::acre_t", + "wpi::units::hectare_t", + "wpi::units::square_foot_t", + "wpi::units::square_inch_t", + "wpi::units::square_kilometer_t", + "wpi::units::square_meter_t", + "wpi::units::square_mile_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_area_type_caster.h" types = [ - "units::acre", - "units::acres", - "units::hectare", - "units::hectares", - "units::square_feet", - "units::square_foot", - "units::square_inch", - "units::square_inches", - "units::square_kilometer", - "units::square_kilometers", - "units::square_meter", - "units::square_meters", - "units::square_mile", - "units::square_miles", + "wpi::units::acre", + "wpi::units::acres", + "wpi::units::hectare", + "wpi::units::hectares", + "wpi::units::square_feet", + "wpi::units::square_foot", + "wpi::units::square_inch", + "wpi::units::square_inches", + "wpi::units::square_kilometer", + "wpi::units::square_kilometers", + "wpi::units::square_meter", + "wpi::units::square_meters", + "wpi::units::square_mile", + "wpi::units::square_miles", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_capacitance_type_caster.h" types = [ - "units::farad_t", - "units::kilofarad_t", - "units::microfarad_t", - "units::millifarad_t", - "units::nanofarad_t", + "wpi::units::farad_t", + "wpi::units::kilofarad_t", + "wpi::units::microfarad_t", + "wpi::units::millifarad_t", + "wpi::units::nanofarad_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_capacitance_type_caster.h" types = [ - "units::farad", - "units::farads", - "units::kilofarad", - "units::kilofarads", - "units::microfarad", - "units::microfarads", - "units::millifarad", - "units::millifarads", - "units::nanofarad", - "units::nanofarads", + "wpi::units::farad", + "wpi::units::farads", + "wpi::units::kilofarad", + "wpi::units::kilofarads", + "wpi::units::microfarad", + "wpi::units::microfarads", + "wpi::units::millifarad", + "wpi::units::millifarads", + "wpi::units::nanofarad", + "wpi::units::nanofarads", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_charge_type_caster.h" types = [ - "units::ampere_hour_t", - "units::coulomb_t", - "units::kiloampere_hour_t", - "units::kilocoulomb_t", - "units::microampere_hour_t", - "units::microcoulomb_t", - "units::milliampere_hour_t", - "units::millicoulomb_t", - "units::nanoampere_hour_t", - "units::nanocoulomb_t", + "wpi::units::ampere_hour_t", + "wpi::units::coulomb_t", + "wpi::units::kiloampere_hour_t", + "wpi::units::kilocoulomb_t", + "wpi::units::microampere_hour_t", + "wpi::units::microcoulomb_t", + "wpi::units::milliampere_hour_t", + "wpi::units::millicoulomb_t", + "wpi::units::nanoampere_hour_t", + "wpi::units::nanocoulomb_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_charge_type_caster.h" types = [ - "units::ampere_hour", - "units::ampere_hours", - "units::coulomb", - "units::coulombs", - "units::kiloampere_hour", - "units::kiloampere_hours", - "units::kilocoulomb", - "units::kilocoulombs", - "units::microampere_hour", - "units::microampere_hours", - "units::microcoulomb", - "units::microcoulombs", - "units::milliampere_hour", - "units::milliampere_hours", - "units::millicoulomb", - "units::millicoulombs", - "units::nanoampere_hour", - "units::nanoampere_hours", - "units::nanocoulomb", - "units::nanocoulombs", + "wpi::units::ampere_hour", + "wpi::units::ampere_hours", + "wpi::units::coulomb", + "wpi::units::coulombs", + "wpi::units::kiloampere_hour", + "wpi::units::kiloampere_hours", + "wpi::units::kilocoulomb", + "wpi::units::kilocoulombs", + "wpi::units::microampere_hour", + "wpi::units::microampere_hours", + "wpi::units::microcoulomb", + "wpi::units::microcoulombs", + "wpi::units::milliampere_hour", + "wpi::units::milliampere_hours", + "wpi::units::millicoulomb", + "wpi::units::millicoulombs", + "wpi::units::nanoampere_hour", + "wpi::units::nanoampere_hours", + "wpi::units::nanocoulomb", + "wpi::units::nanocoulombs", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_concentration_type_caster.h" types = [ - "units::percent_t", - "units::ppb_t", - "units::ppm_t", - "units::ppt_t", + "wpi::units::percent_t", + "wpi::units::ppb_t", + "wpi::units::ppm_t", + "wpi::units::ppt_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_concentration_type_caster.h" types = [ - "units::parts_per_billion", - "units::parts_per_million", - "units::parts_per_trillion", - "units::percent", - "units::percent", - "units::ppb", - "units::ppm", - "units::ppt", + "wpi::units::parts_per_billion", + "wpi::units::parts_per_million", + "wpi::units::parts_per_trillion", + "wpi::units::percent", + "wpi::units::percent", + "wpi::units::ppb", + "wpi::units::ppm", + "wpi::units::ppt", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_conductance_type_caster.h" types = [ - "units::kilosiemens_t", - "units::microsiemens_t", - "units::millisiemens_t", - "units::nanosiemens_t", - "units::siemens_t", + "wpi::units::kilosiemens_t", + "wpi::units::microsiemens_t", + "wpi::units::millisiemens_t", + "wpi::units::nanosiemens_t", + "wpi::units::siemens_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_conductance_type_caster.h" types = [ - "units::kilosiemens", - "units::kilosiemens", - "units::microsiemens", - "units::microsiemens", - "units::millisiemens", - "units::millisiemens", - "units::nanosiemens", - "units::nanosiemens", - "units::siemens", - "units::siemens", + "wpi::units::kilosiemens", + "wpi::units::kilosiemens", + "wpi::units::microsiemens", + "wpi::units::microsiemens", + "wpi::units::millisiemens", + "wpi::units::millisiemens", + "wpi::units::nanosiemens", + "wpi::units::nanosiemens", + "wpi::units::siemens", + "wpi::units::siemens", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_current_type_caster.h" types = [ - "units::ampere_t", - "units::kiloampere_t", - "units::microampere_t", - "units::milliampere_t", - "units::nanoampere_t", + "wpi::units::ampere_t", + "wpi::units::kiloampere_t", + "wpi::units::microampere_t", + "wpi::units::milliampere_t", + "wpi::units::nanoampere_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_current_type_caster.h" types = [ - "units::ampere", - "units::amperes", - "units::kiloampere", - "units::kiloamperes", - "units::microampere", - "units::microamperes", - "units::milliampere", - "units::milliamperes", - "units::nanoampere", - "units::nanoamperes", + "wpi::units::ampere", + "wpi::units::amperes", + "wpi::units::kiloampere", + "wpi::units::kiloamperes", + "wpi::units::microampere", + "wpi::units::microamperes", + "wpi::units::milliampere", + "wpi::units::milliamperes", + "wpi::units::nanoampere", + "wpi::units::nanoamperes", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_data_type_caster.h" types = [ - "units::exabit_t", - "units::exabyte_t", + "wpi::units::exabit_t", + "wpi::units::exabyte_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_data_type_caster.h" types = [ - "units::exabit", - "units::exabits", - "units::exabyte", - "units::exabytes", + "wpi::units::exabit", + "wpi::units::exabits", + "wpi::units::exabyte", + "wpi::units::exabytes", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_data_transfer_rate_type_caster.h" types = [ - "units::exabits_per_second_t", - "units::exabytes_per_second_t", + "wpi::units::exabits_per_second_t", + "wpi::units::exabytes_per_second_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_data_transfer_rate_type_caster.h" types = [ - "units::exabits_per_second", - "units::exabits_per_second", - "units::exabytes_per_second", - "units::exabytes_per_second", + "wpi::units::exabits_per_second", + "wpi::units::exabits_per_second", + "wpi::units::exabytes_per_second", + "wpi::units::exabytes_per_second", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_density_type_caster.h" types = [ - "units::grams_per_milliliter_t", - "units::kilograms_per_cubic_meter_t", - "units::kilograms_per_liter_t", - "units::ounces_per_cubic_foot_t", - "units::ounces_per_cubic_inch_t", - "units::ounces_per_gallon_t", - "units::pounds_per_cubic_foot_t", - "units::pounds_per_cubic_inch_t", - "units::pounds_per_gallon_t", - "units::slugs_per_cubic_foot_t", + "wpi::units::grams_per_milliliter_t", + "wpi::units::kilograms_per_cubic_meter_t", + "wpi::units::kilograms_per_liter_t", + "wpi::units::ounces_per_cubic_foot_t", + "wpi::units::ounces_per_cubic_inch_t", + "wpi::units::ounces_per_gallon_t", + "wpi::units::pounds_per_cubic_foot_t", + "wpi::units::pounds_per_cubic_inch_t", + "wpi::units::pounds_per_gallon_t", + "wpi::units::slugs_per_cubic_foot_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_density_type_caster.h" types = [ - "units::grams_per_milliliter", - "units::grams_per_milliliter", - "units::kilograms_per_cubic_meter", - "units::kilograms_per_cubic_meter", - "units::kilograms_per_liter", - "units::kilograms_per_liter", - "units::ounces_per_cubic_foot", - "units::ounces_per_cubic_foot", - "units::ounces_per_cubic_inch", - "units::ounces_per_cubic_inch", - "units::ounces_per_gallon", - "units::ounces_per_gallon", - "units::pounds_per_cubic_foot", - "units::pounds_per_cubic_foot", - "units::pounds_per_cubic_inch", - "units::pounds_per_cubic_inch", - "units::pounds_per_gallon", - "units::pounds_per_gallon", - "units::slugs_per_cubic_foot", - "units::slugs_per_cubic_foot", + "wpi::units::grams_per_milliliter", + "wpi::units::grams_per_milliliter", + "wpi::units::kilograms_per_cubic_meter", + "wpi::units::kilograms_per_cubic_meter", + "wpi::units::kilograms_per_liter", + "wpi::units::kilograms_per_liter", + "wpi::units::ounces_per_cubic_foot", + "wpi::units::ounces_per_cubic_foot", + "wpi::units::ounces_per_cubic_inch", + "wpi::units::ounces_per_cubic_inch", + "wpi::units::ounces_per_gallon", + "wpi::units::ounces_per_gallon", + "wpi::units::pounds_per_cubic_foot", + "wpi::units::pounds_per_cubic_foot", + "wpi::units::pounds_per_cubic_inch", + "wpi::units::pounds_per_cubic_inch", + "wpi::units::pounds_per_gallon", + "wpi::units::pounds_per_gallon", + "wpi::units::slugs_per_cubic_foot", + "wpi::units::slugs_per_cubic_foot", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_energy_type_caster.h" types = [ - "units::british_thermal_unit_59_t", - "units::british_thermal_unit_iso_t", - "units::british_thermal_unit_t", - "units::calorie_t", - "units::foot_pound_t", - "units::joule_t", - "units::kilocalorie_t", - "units::kilojoule_t", - "units::kilowatt_hour_t", - "units::microcalorie_t", - "units::microjoule_t", - "units::millicalorie_t", - "units::millijoule_t", - "units::nanocalorie_t", - "units::nanojoule_t", - "units::therm_t", - "units::watt_hour_t", + "wpi::units::british_thermal_unit_59_t", + "wpi::units::british_thermal_unit_iso_t", + "wpi::units::british_thermal_unit_t", + "wpi::units::calorie_t", + "wpi::units::foot_pound_t", + "wpi::units::joule_t", + "wpi::units::kilocalorie_t", + "wpi::units::kilojoule_t", + "wpi::units::kilowatt_hour_t", + "wpi::units::microcalorie_t", + "wpi::units::microjoule_t", + "wpi::units::millicalorie_t", + "wpi::units::millijoule_t", + "wpi::units::nanocalorie_t", + "wpi::units::nanojoule_t", + "wpi::units::therm_t", + "wpi::units::watt_hour_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_energy_type_caster.h" types = [ - "units::british_thermal_unit", - "units::british_thermal_unit_59", - "units::british_thermal_unit_iso", - "units::british_thermal_units", - "units::british_thermal_units_59", - "units::british_thermal_units_iso", - "units::calorie", - "units::calories", - "units::foot_pound", - "units::foot_pounds", - "units::joule", - "units::joules", - "units::kilocalorie", - "units::kilocalories", - "units::kilojoule", - "units::kilojoules", - "units::kilowatt_hour", - "units::kilowatt_hours", - "units::microcalorie", - "units::microcalories", - "units::microjoule", - "units::microjoules", - "units::millicalorie", - "units::millicalories", - "units::millijoule", - "units::millijoules", - "units::nanocalorie", - "units::nanocalories", - "units::nanojoule", - "units::nanojoules", - "units::therm", - "units::therms", - "units::watt_hour", - "units::watt_hours", + "wpi::units::british_thermal_unit", + "wpi::units::british_thermal_unit_59", + "wpi::units::british_thermal_unit_iso", + "wpi::units::british_thermal_units", + "wpi::units::british_thermal_units_59", + "wpi::units::british_thermal_units_iso", + "wpi::units::calorie", + "wpi::units::calories", + "wpi::units::foot_pound", + "wpi::units::foot_pounds", + "wpi::units::joule", + "wpi::units::joules", + "wpi::units::kilocalorie", + "wpi::units::kilocalories", + "wpi::units::kilojoule", + "wpi::units::kilojoules", + "wpi::units::kilowatt_hour", + "wpi::units::kilowatt_hours", + "wpi::units::microcalorie", + "wpi::units::microcalories", + "wpi::units::microjoule", + "wpi::units::microjoules", + "wpi::units::millicalorie", + "wpi::units::millicalories", + "wpi::units::millijoule", + "wpi::units::millijoules", + "wpi::units::nanocalorie", + "wpi::units::nanocalories", + "wpi::units::nanojoule", + "wpi::units::nanojoules", + "wpi::units::therm", + "wpi::units::therms", + "wpi::units::watt_hour", + "wpi::units::watt_hours", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_force_type_caster.h" types = [ - "units::dyne_t", - "units::kilonewton_t", - "units::kilopond_t", - "units::micronewton_t", - "units::millinewton_t", - "units::nanonewton_t", - "units::newton_t", - "units::pound_t", - "units::poundal_t", + "wpi::units::dyne_t", + "wpi::units::kilonewton_t", + "wpi::units::kilopond_t", + "wpi::units::micronewton_t", + "wpi::units::millinewton_t", + "wpi::units::nanonewton_t", + "wpi::units::newton_t", + "wpi::units::pound_t", + "wpi::units::poundal_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_force_type_caster.h" types = [ - "units::dyne", - "units::dynes", - "units::kilonewton", - "units::kilonewtons", - "units::kilopond", - "units::kiloponds", - "units::micronewton", - "units::micronewtons", - "units::millinewton", - "units::millinewtons", - "units::nanonewton", - "units::nanonewtons", - "units::newton", - "units::newtons", - "units::pound", - "units::poundal", - "units::poundals", - "units::pounds", + "wpi::units::dyne", + "wpi::units::dynes", + "wpi::units::kilonewton", + "wpi::units::kilonewtons", + "wpi::units::kilopond", + "wpi::units::kiloponds", + "wpi::units::micronewton", + "wpi::units::micronewtons", + "wpi::units::millinewton", + "wpi::units::millinewtons", + "wpi::units::nanonewton", + "wpi::units::nanonewtons", + "wpi::units::newton", + "wpi::units::newtons", + "wpi::units::pound", + "wpi::units::poundal", + "wpi::units::poundals", + "wpi::units::pounds", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_frequency_type_caster.h" types = [ - "units::hertz_t", - "units::kilohertz_t", - "units::microhertz_t", - "units::millihertz_t", - "units::nanohertz_t", + "wpi::units::hertz_t", + "wpi::units::kilohertz_t", + "wpi::units::microhertz_t", + "wpi::units::millihertz_t", + "wpi::units::nanohertz_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_frequency_type_caster.h" types = [ - "units::hertz", - "units::hertz", - "units::kilohertz", - "units::kilohertz", - "units::microhertz", - "units::microhertz", - "units::millihertz", - "units::millihertz", - "units::nanohertz", - "units::nanohertz", + "wpi::units::hertz", + "wpi::units::hertz", + "wpi::units::kilohertz", + "wpi::units::kilohertz", + "wpi::units::microhertz", + "wpi::units::microhertz", + "wpi::units::millihertz", + "wpi::units::millihertz", + "wpi::units::nanohertz", + "wpi::units::nanohertz", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_illuminance_type_caster.h" types = [ - "units::footcandle_t", - "units::kilolux_t", - "units::lumens_per_square_inch_t", - "units::lux_t", - "units::microlux_t", - "units::millilux_t", - "units::nanolux_t", - "units::phot_t", + "wpi::units::footcandle_t", + "wpi::units::kilolux_t", + "wpi::units::lumens_per_square_inch_t", + "wpi::units::lux_t", + "wpi::units::microlux_t", + "wpi::units::millilux_t", + "wpi::units::nanolux_t", + "wpi::units::phot_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_illuminance_type_caster.h" types = [ - "units::footcandle", - "units::footcandles", - "units::kilolux", - "units::kiloluxes", - "units::lumens_per_square_inch", - "units::lumens_per_square_inch", - "units::lux", - "units::luxes", - "units::microlux", - "units::microluxes", - "units::millilux", - "units::milliluxes", - "units::nanolux", - "units::nanoluxes", - "units::phot", - "units::phots", + "wpi::units::footcandle", + "wpi::units::footcandles", + "wpi::units::kilolux", + "wpi::units::kiloluxes", + "wpi::units::lumens_per_square_inch", + "wpi::units::lumens_per_square_inch", + "wpi::units::lux", + "wpi::units::luxes", + "wpi::units::microlux", + "wpi::units::microluxes", + "wpi::units::millilux", + "wpi::units::milliluxes", + "wpi::units::nanolux", + "wpi::units::nanoluxes", + "wpi::units::phot", + "wpi::units::phots", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_impedance_type_caster.h" types = [ - "units::kiloohm_t", - "units::microohm_t", - "units::milliohm_t", - "units::nanoohm_t", - "units::ohm_t", + "wpi::units::kiloohm_t", + "wpi::units::microohm_t", + "wpi::units::milliohm_t", + "wpi::units::nanoohm_t", + "wpi::units::ohm_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_impedance_type_caster.h" types = [ - "units::kiloohm", - "units::kiloohms", - "units::microohm", - "units::microohms", - "units::milliohm", - "units::milliohms", - "units::nanoohm", - "units::nanoohms", - "units::ohm", - "units::ohms", + "wpi::units::kiloohm", + "wpi::units::kiloohms", + "wpi::units::microohm", + "wpi::units::microohms", + "wpi::units::milliohm", + "wpi::units::milliohms", + "wpi::units::nanoohm", + "wpi::units::nanoohms", + "wpi::units::ohm", + "wpi::units::ohms", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_inductance_type_caster.h" types = [ - "units::henry_t", - "units::kilohenry_t", - "units::microhenry_t", - "units::millihenry_t", - "units::nanohenry_t", + "wpi::units::henry_t", + "wpi::units::kilohenry_t", + "wpi::units::microhenry_t", + "wpi::units::millihenry_t", + "wpi::units::nanohenry_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_inductance_type_caster.h" types = [ - "units::henries", - "units::henry", - "units::kilohenries", - "units::kilohenry", - "units::microhenries", - "units::microhenry", - "units::millihenries", - "units::millihenry", - "units::nanohenries", - "units::nanohenry", + "wpi::units::henries", + "wpi::units::henry", + "wpi::units::kilohenries", + "wpi::units::kilohenry", + "wpi::units::microhenries", + "wpi::units::microhenry", + "wpi::units::millihenries", + "wpi::units::millihenry", + "wpi::units::nanohenries", + "wpi::units::nanohenry", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_length_type_caster.h" types = [ - "units::angstrom_t", - "units::astronicalUnit_t", - "units::centimeter_t", - "units::chain_t", - "units::cubit_t", - "units::fathom_t", - "units::foot_t", - "units::furlong_t", - "units::hand_t", - "units::inch_t", - "units::kilometer_t", - "units::league_t", - "units::lightyear_t", - "units::meter_t", - "units::micrometer_t", - "units::mil_t", - "units::mile_t", - "units::millimeter_t", - "units::nanometer_t", - "units::nauticalLeague_t", - "units::nauticalMile_t", - "units::parsec_t", - "units::yard_t", + "wpi::units::angstrom_t", + "wpi::units::astronicalUnit_t", + "wpi::units::centimeter_t", + "wpi::units::chain_t", + "wpi::units::cubit_t", + "wpi::units::fathom_t", + "wpi::units::foot_t", + "wpi::units::furlong_t", + "wpi::units::hand_t", + "wpi::units::inch_t", + "wpi::units::kilometer_t", + "wpi::units::league_t", + "wpi::units::lightyear_t", + "wpi::units::meter_t", + "wpi::units::micrometer_t", + "wpi::units::mil_t", + "wpi::units::mile_t", + "wpi::units::millimeter_t", + "wpi::units::nanometer_t", + "wpi::units::nauticalLeague_t", + "wpi::units::nauticalMile_t", + "wpi::units::parsec_t", + "wpi::units::yard_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_length_type_caster.h" types = [ - "units::angstrom", - "units::angstroms", - "units::astronicalUnit", - "units::astronicalUnits", - "units::chain", - "units::chains", - "units::cubit", - "units::cubits", - "units::fathom", - "units::fathoms", - "units::feet", - "units::foot", - "units::furlong", - "units::furlongs", - "units::hand", - "units::hands", - "units::inch", - "units::inches", - "units::kilometer", - "units::kilometers", - "units::league", - "units::leagues", - "units::lightyear", - "units::lightyears", - "units::meter", - "units::meters", - "units::micrometer", - "units::micrometers", - "units::mil", - "units::mile", - "units::miles", - "units::millimeter", - "units::millimeters", - "units::mils", - "units::nanometer", - "units::nanometers", - "units::nauticalLeague", - "units::nauticalLeagues", - "units::nauticalMile", - "units::nauticalMiles", - "units::parsec", - "units::parsecs", - "units::yard", - "units::yards", + "wpi::units::angstrom", + "wpi::units::angstroms", + "wpi::units::astronicalUnit", + "wpi::units::astronicalUnits", + "wpi::units::chain", + "wpi::units::chains", + "wpi::units::cubit", + "wpi::units::cubits", + "wpi::units::fathom", + "wpi::units::fathoms", + "wpi::units::feet", + "wpi::units::foot", + "wpi::units::furlong", + "wpi::units::furlongs", + "wpi::units::hand", + "wpi::units::hands", + "wpi::units::inch", + "wpi::units::inches", + "wpi::units::kilometer", + "wpi::units::kilometers", + "wpi::units::league", + "wpi::units::leagues", + "wpi::units::lightyear", + "wpi::units::lightyears", + "wpi::units::meter", + "wpi::units::meters", + "wpi::units::micrometer", + "wpi::units::micrometers", + "wpi::units::mil", + "wpi::units::mile", + "wpi::units::miles", + "wpi::units::millimeter", + "wpi::units::millimeters", + "wpi::units::mils", + "wpi::units::nanometer", + "wpi::units::nanometers", + "wpi::units::nauticalLeague", + "wpi::units::nauticalLeagues", + "wpi::units::nauticalMile", + "wpi::units::nauticalMiles", + "wpi::units::parsec", + "wpi::units::parsecs", + "wpi::units::yard", + "wpi::units::yards", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_luminous_flux_type_caster.h" types = [ - "units::kilolumen_t", - "units::lumen_t", - "units::microlumen_t", - "units::millilumen_t", - "units::nanolumen_t", + "wpi::units::kilolumen_t", + "wpi::units::lumen_t", + "wpi::units::microlumen_t", + "wpi::units::millilumen_t", + "wpi::units::nanolumen_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_luminous_flux_type_caster.h" types = [ - "units::kilolumen", - "units::kilolumens", - "units::lumen", - "units::lumens", - "units::microlumen", - "units::microlumens", - "units::millilumen", - "units::millilumens", - "units::nanolumen", - "units::nanolumens", + "wpi::units::kilolumen", + "wpi::units::kilolumens", + "wpi::units::lumen", + "wpi::units::lumens", + "wpi::units::microlumen", + "wpi::units::microlumens", + "wpi::units::millilumen", + "wpi::units::millilumens", + "wpi::units::nanolumen", + "wpi::units::nanolumens", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_luminous_intensity_type_caster.h" types = [ - "units::candela_t", - "units::kilocandela_t", - "units::microcandela_t", - "units::millicandela_t", - "units::nanocandela_t", + "wpi::units::candela_t", + "wpi::units::kilocandela_t", + "wpi::units::microcandela_t", + "wpi::units::millicandela_t", + "wpi::units::nanocandela_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_luminous_intensity_type_caster.h" types = [ - "units::candela", - "units::candelas", - "units::kilocandela", - "units::kilocandelas", - "units::microcandela", - "units::microcandelas", - "units::millicandela", - "units::millicandelas", - "units::nanocandela", - "units::nanocandelas", + "wpi::units::candela", + "wpi::units::candelas", + "wpi::units::kilocandela", + "wpi::units::kilocandelas", + "wpi::units::microcandela", + "wpi::units::microcandelas", + "wpi::units::millicandela", + "wpi::units::millicandelas", + "wpi::units::nanocandela", + "wpi::units::nanocandelas", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_magnetic_field_strength_type_caster.h" types = [ - "units::gauss_t", - "units::kilotesla_t", - "units::microtesla_t", - "units::millitesla_t", - "units::nanotesla_t", - "units::tesla_t", + "wpi::units::gauss_t", + "wpi::units::kilotesla_t", + "wpi::units::microtesla_t", + "wpi::units::millitesla_t", + "wpi::units::nanotesla_t", + "wpi::units::tesla_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_magnetic_field_strength_type_caster.h" types = [ - "units::gauss", - "units::gauss", - "units::kilotesla", - "units::kiloteslas", - "units::microtesla", - "units::microteslas", - "units::millitesla", - "units::milliteslas", - "units::nanotesla", - "units::nanoteslas", - "units::tesla", - "units::teslas", + "wpi::units::gauss", + "wpi::units::gauss", + "wpi::units::kilotesla", + "wpi::units::kiloteslas", + "wpi::units::microtesla", + "wpi::units::microteslas", + "wpi::units::millitesla", + "wpi::units::milliteslas", + "wpi::units::nanotesla", + "wpi::units::nanoteslas", + "wpi::units::tesla", + "wpi::units::teslas", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_magnetic_flux_type_caster.h" types = [ - "units::kiloweber_t", - "units::maxwell_t", - "units::microweber_t", - "units::milliweber_t", - "units::nanoweber_t", - "units::weber_t", + "wpi::units::kiloweber_t", + "wpi::units::maxwell_t", + "wpi::units::microweber_t", + "wpi::units::milliweber_t", + "wpi::units::nanoweber_t", + "wpi::units::weber_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_magnetic_flux_type_caster.h" types = [ - "units::kiloweber", - "units::kilowebers", - "units::maxwell", - "units::maxwells", - "units::microweber", - "units::microwebers", - "units::milliweber", - "units::milliwebers", - "units::nanoweber", - "units::nanowebers", - "units::weber", - "units::webers", + "wpi::units::kiloweber", + "wpi::units::kilowebers", + "wpi::units::maxwell", + "wpi::units::maxwells", + "wpi::units::microweber", + "wpi::units::microwebers", + "wpi::units::milliweber", + "wpi::units::milliwebers", + "wpi::units::nanoweber", + "wpi::units::nanowebers", + "wpi::units::weber", + "wpi::units::webers", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_mass_type_caster.h" types = [ - "units::carat_t", - "units::gram_t", - "units::kilogram_t", - "units::long_ton_t", - "units::metric_ton_t", - "units::microgram_t", - "units::milligram_t", - "units::nanogram_t", - "units::ounce_t", - "units::pound_t", - "units::short_ton_t", - "units::slug_t", - "units::stone_t", + "wpi::units::carat_t", + "wpi::units::gram_t", + "wpi::units::kilogram_t", + "wpi::units::long_ton_t", + "wpi::units::metric_ton_t", + "wpi::units::microgram_t", + "wpi::units::milligram_t", + "wpi::units::nanogram_t", + "wpi::units::ounce_t", + "wpi::units::pound_t", + "wpi::units::short_ton_t", + "wpi::units::slug_t", + "wpi::units::stone_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_mass_type_caster.h" types = [ - "units::carat", - "units::carats", - "units::gram", - "units::grams", - "units::kilogram", - "units::kilograms", - "units::long_ton", - "units::long_tons", - "units::metric_ton", - "units::metric_tons", - "units::microgram", - "units::micrograms", - "units::milligram", - "units::milligrams", - "units::nanogram", - "units::nanograms", - "units::ounce", - "units::ounces", - "units::pound", - "units::pounds", - "units::short_ton", - "units::short_tons", - "units::slug", - "units::slugs", - "units::stone", - "units::stone", + "wpi::units::carat", + "wpi::units::carats", + "wpi::units::gram", + "wpi::units::grams", + "wpi::units::kilogram", + "wpi::units::kilograms", + "wpi::units::long_ton", + "wpi::units::long_tons", + "wpi::units::metric_ton", + "wpi::units::metric_tons", + "wpi::units::microgram", + "wpi::units::micrograms", + "wpi::units::milligram", + "wpi::units::milligrams", + "wpi::units::nanogram", + "wpi::units::nanograms", + "wpi::units::ounce", + "wpi::units::ounces", + "wpi::units::pound", + "wpi::units::pounds", + "wpi::units::short_ton", + "wpi::units::short_tons", + "wpi::units::slug", + "wpi::units::slugs", + "wpi::units::stone", + "wpi::units::stone", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_moment_of_inertia_type_caster.h" types = [ - "units::kilogram_square_meter_t", + "wpi::units::kilogram_square_meter_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_moment_of_inertia_type_caster.h" types = [ - "units::kilogram_square_meter", - "units::kilogram_square_meters", + "wpi::units::kilogram_square_meter", + "wpi::units::kilogram_square_meters", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_power_type_caster.h" types = [ - "units::horsepower_t", - "units::kilowatt_t", - "units::microwatt_t", - "units::milliwatt_t", - "units::nanowatt_t", - "units::watt_t", + "wpi::units::horsepower_t", + "wpi::units::kilowatt_t", + "wpi::units::microwatt_t", + "wpi::units::milliwatt_t", + "wpi::units::nanowatt_t", + "wpi::units::watt_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_power_type_caster.h" types = [ - "units::horsepower", - "units::horsepower", - "units::kilowatt", - "units::kilowatts", - "units::microwatt", - "units::microwatts", - "units::milliwatt", - "units::milliwatts", - "units::nanowatt", - "units::nanowatts", - "units::watt", - "units::watts", + "wpi::units::horsepower", + "wpi::units::horsepower", + "wpi::units::kilowatt", + "wpi::units::kilowatts", + "wpi::units::microwatt", + "wpi::units::microwatts", + "wpi::units::milliwatt", + "wpi::units::milliwatts", + "wpi::units::nanowatt", + "wpi::units::nanowatts", + "wpi::units::watt", + "wpi::units::watts", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_pressure_type_caster.h" types = [ - "units::atmosphere_t", - "units::bar_t", - "units::kilopascal_t", - "units::mbar_t", - "units::micropascal_t", - "units::millipascal_t", - "units::nanopascal_t", - "units::pascal_t", - "units::pounds_per_square_inch_t", - "units::torr_t", + "wpi::units::atmosphere_t", + "wpi::units::bar_t", + "wpi::units::kilopascal_t", + "wpi::units::mbar_t", + "wpi::units::micropascal_t", + "wpi::units::millipascal_t", + "wpi::units::nanopascal_t", + "wpi::units::pascal_t", + "wpi::units::pounds_per_square_inch_t", + "wpi::units::torr_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_pressure_type_caster.h" types = [ - "units::atmosphere", - "units::atmospheres", - "units::bar", - "units::bars", - "units::kilopascal", - "units::kilopascals", - "units::mbar", - "units::mbars", - "units::micropascal", - "units::micropascals", - "units::millipascal", - "units::millipascals", - "units::nanopascal", - "units::nanopascals", - "units::pascal", - "units::pascals", - "units::pounds_per_square_inch", - "units::pounds_per_square_inch", - "units::torr", - "units::torrs", + "wpi::units::atmosphere", + "wpi::units::atmospheres", + "wpi::units::bar", + "wpi::units::bars", + "wpi::units::kilopascal", + "wpi::units::kilopascals", + "wpi::units::mbar", + "wpi::units::mbars", + "wpi::units::micropascal", + "wpi::units::micropascals", + "wpi::units::millipascal", + "wpi::units::millipascals", + "wpi::units::nanopascal", + "wpi::units::nanopascals", + "wpi::units::pascal", + "wpi::units::pascals", + "wpi::units::pounds_per_square_inch", + "wpi::units::pounds_per_square_inch", + "wpi::units::torr", + "wpi::units::torrs", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_radiation_type_caster.h" types = [ - "units::becquerel_t", - "units::curie_t", - "units::gray_t", - "units::kilobecquerel_t", - "units::kilogray_t", - "units::kilosievert_t", - "units::microbecquerel_t", - "units::microgray_t", - "units::microsievert_t", - "units::millibecquerel_t", - "units::milligray_t", - "units::millisievert_t", - "units::nanobecquerel_t", - "units::nanogray_t", - "units::nanosievert_t", - "units::rad_t", - "units::rutherford_t", - "units::sievert_t", + "wpi::units::becquerel_t", + "wpi::units::curie_t", + "wpi::units::gray_t", + "wpi::units::kilobecquerel_t", + "wpi::units::kilogray_t", + "wpi::units::kilosievert_t", + "wpi::units::microbecquerel_t", + "wpi::units::microgray_t", + "wpi::units::microsievert_t", + "wpi::units::millibecquerel_t", + "wpi::units::milligray_t", + "wpi::units::millisievert_t", + "wpi::units::nanobecquerel_t", + "wpi::units::nanogray_t", + "wpi::units::nanosievert_t", + "wpi::units::rad_t", + "wpi::units::rutherford_t", + "wpi::units::sievert_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_radiation_type_caster.h" types = [ - "units::becquerel", - "units::becquerels", - "units::curie", - "units::curies", - "units::gray", - "units::grays", - "units::kilobecquerel", - "units::kilobecquerels", - "units::kilogray", - "units::kilograys", - "units::kilosievert", - "units::kilosieverts", - "units::microbecquerel", - "units::microbecquerels", - "units::microgray", - "units::micrograys", - "units::microsievert", - "units::microsieverts", - "units::millibecquerel", - "units::millibecquerels", - "units::milligray", - "units::milligrays", - "units::millisievert", - "units::millisieverts", - "units::nanobecquerel", - "units::nanobecquerels", - "units::nanogray", - "units::nanograys", - "units::nanosievert", - "units::nanosieverts", - "units::rad", - "units::rads", - "units::rutherford", - "units::rutherfords", - "units::sievert", - "units::sieverts", + "wpi::units::becquerel", + "wpi::units::becquerels", + "wpi::units::curie", + "wpi::units::curies", + "wpi::units::gray", + "wpi::units::grays", + "wpi::units::kilobecquerel", + "wpi::units::kilobecquerels", + "wpi::units::kilogray", + "wpi::units::kilograys", + "wpi::units::kilosievert", + "wpi::units::kilosieverts", + "wpi::units::microbecquerel", + "wpi::units::microbecquerels", + "wpi::units::microgray", + "wpi::units::micrograys", + "wpi::units::microsievert", + "wpi::units::microsieverts", + "wpi::units::millibecquerel", + "wpi::units::millibecquerels", + "wpi::units::milligray", + "wpi::units::milligrays", + "wpi::units::millisievert", + "wpi::units::millisieverts", + "wpi::units::nanobecquerel", + "wpi::units::nanobecquerels", + "wpi::units::nanogray", + "wpi::units::nanograys", + "wpi::units::nanosievert", + "wpi::units::nanosieverts", + "wpi::units::rad", + "wpi::units::rads", + "wpi::units::rutherford", + "wpi::units::rutherfords", + "wpi::units::sievert", + "wpi::units::sieverts", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_solid_angle_type_caster.h" types = [ - "units::degree_squared_t", - "units::kilosteradian_t", - "units::microsteradian_t", - "units::millisteradian_t", - "units::nanosteradian_t", - "units::spat_t", - "units::steradian_t", + "wpi::units::degree_squared_t", + "wpi::units::kilosteradian_t", + "wpi::units::microsteradian_t", + "wpi::units::millisteradian_t", + "wpi::units::nanosteradian_t", + "wpi::units::spat_t", + "wpi::units::steradian_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_solid_angle_type_caster.h" types = [ - "units::degree_squared", - "units::degrees_squared", - "units::kilosteradian", - "units::kilosteradians", - "units::microsteradian", - "units::microsteradians", - "units::millisteradian", - "units::millisteradians", - "units::nanosteradian", - "units::nanosteradians", - "units::spat", - "units::spats", - "units::steradian", - "units::steradians", + "wpi::units::degree_squared", + "wpi::units::degrees_squared", + "wpi::units::kilosteradian", + "wpi::units::kilosteradians", + "wpi::units::microsteradian", + "wpi::units::microsteradians", + "wpi::units::millisteradian", + "wpi::units::millisteradians", + "wpi::units::nanosteradian", + "wpi::units::nanosteradians", + "wpi::units::spat", + "wpi::units::spats", + "wpi::units::steradian", + "wpi::units::steradians", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_substance_type_caster.h" types = [ - "units::mole_t", + "wpi::units::mole_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_substance_type_caster.h" types = [ - "units::mole", - "units::moles", + "wpi::units::mole", + "wpi::units::moles", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_temperature_type_caster.h" types = [ - "units::celsius_t", - "units::fahrenheit_t", - "units::kelvin_t", - "units::rankine_t", - "units::reaumur_t", + "wpi::units::celsius_t", + "wpi::units::fahrenheit_t", + "wpi::units::kelvin_t", + "wpi::units::rankine_t", + "wpi::units::reaumur_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_temperature_type_caster.h" types = [ - "units::celsius", - "units::celsius", - "units::fahrenheit", - "units::fahrenheit", - "units::kelvin", - "units::kelvin", - "units::rankine", - "units::rankine", - "units::reaumur", - "units::reaumur", + "wpi::units::celsius", + "wpi::units::celsius", + "wpi::units::fahrenheit", + "wpi::units::fahrenheit", + "wpi::units::kelvin", + "wpi::units::kelvin", + "wpi::units::rankine", + "wpi::units::rankine", + "wpi::units::reaumur", + "wpi::units::reaumur", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_time_type_caster.h" types = [ - "units::day_t", - "units::gregorian_year_t", - "units::hour_t", - "units::julian_year_t", - "units::kilosecond_t", - "units::microsecond_t", - "units::millisecond_t", - "units::minute_t", - "units::nanosecond_t", - "units::second_t", - "units::week_t", - "units::year_t", + "wpi::units::day_t", + "wpi::units::gregorian_year_t", + "wpi::units::hour_t", + "wpi::units::julian_year_t", + "wpi::units::kilosecond_t", + "wpi::units::microsecond_t", + "wpi::units::millisecond_t", + "wpi::units::minute_t", + "wpi::units::nanosecond_t", + "wpi::units::second_t", + "wpi::units::week_t", + "wpi::units::year_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_time_type_caster.h" types = [ - "units::day", - "units::days", - "units::gregorian_year", - "units::gregorian_years", - "units::hour", - "units::hours", - "units::julian_year", - "units::julian_years", - "units::kilosecond", - "units::kiloseconds", - "units::microsecond", - "units::microseconds", - "units::millisecond", - "units::milliseconds", - "units::minute", - "units::minutes", - "units::nanosecond", - "units::nanoseconds", - "units::second", - "units::seconds", - "units::week", - "units::weeks", - "units::year", - "units::years", + "wpi::units::day", + "wpi::units::days", + "wpi::units::gregorian_year", + "wpi::units::gregorian_years", + "wpi::units::hour", + "wpi::units::hours", + "wpi::units::julian_year", + "wpi::units::julian_years", + "wpi::units::kilosecond", + "wpi::units::kiloseconds", + "wpi::units::microsecond", + "wpi::units::microseconds", + "wpi::units::millisecond", + "wpi::units::milliseconds", + "wpi::units::minute", + "wpi::units::minutes", + "wpi::units::nanosecond", + "wpi::units::nanoseconds", + "wpi::units::second", + "wpi::units::seconds", + "wpi::units::week", + "wpi::units::weeks", + "wpi::units::year", + "wpi::units::years", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_torque_type_caster.h" types = [ - "units::foot_pound_t", - "units::foot_poundal_t", - "units::inch_pound_t", - "units::meter_kilogram_t", - "units::newton_meter_t", + "wpi::units::foot_pound_t", + "wpi::units::foot_poundal_t", + "wpi::units::inch_pound_t", + "wpi::units::meter_kilogram_t", + "wpi::units::newton_meter_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_torque_type_caster.h" types = [ - "units::foot_pound", - "units::foot_poundal", - "units::foot_poundals", - "units::foot_pounds", - "units::inch_pound", - "units::inch_pounds", - "units::meter_kilogram", - "units::meter_kilograms", - "units::newton_meter", - "units::newton_meters", + "wpi::units::foot_pound", + "wpi::units::foot_poundal", + "wpi::units::foot_poundals", + "wpi::units::foot_pounds", + "wpi::units::inch_pound", + "wpi::units::inch_pounds", + "wpi::units::meter_kilogram", + "wpi::units::meter_kilograms", + "wpi::units::newton_meter", + "wpi::units::newton_meters", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_velocity_type_caster.h" types = [ - "units::feet_per_second_t", - "units::kilometers_per_hour_t", - "units::knot_t", - "units::meters_per_second_t", - "units::miles_per_hour_t", + "wpi::units::feet_per_second_t", + "wpi::units::kilometers_per_hour_t", + "wpi::units::knot_t", + "wpi::units::meters_per_second_t", + "wpi::units::miles_per_hour_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_velocity_type_caster.h" types = [ - "units::feet_per_second", - "units::feet_per_second", - "units::kilometers_per_hour", - "units::kilometers_per_hour", - "units::knot", - "units::knots", - "units::meters_per_second", - "units::meters_per_second", - "units::miles_per_hour", - "units::miles_per_hour", + "wpi::units::feet_per_second", + "wpi::units::feet_per_second", + "wpi::units::kilometers_per_hour", + "wpi::units::kilometers_per_hour", + "wpi::units::knot", + "wpi::units::knots", + "wpi::units::meters_per_second", + "wpi::units::meters_per_second", + "wpi::units::miles_per_hour", + "wpi::units::miles_per_hour", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_voltage_type_caster.h" types = [ - "units::abvolt_t", - "units::kilovolt_t", - "units::microvolt_t", - "units::millivolt_t", - "units::nanovolt_t", - "units::statvolt_t", - "units::volt_t", + "wpi::units::abvolt_t", + "wpi::units::kilovolt_t", + "wpi::units::microvolt_t", + "wpi::units::millivolt_t", + "wpi::units::nanovolt_t", + "wpi::units::statvolt_t", + "wpi::units::volt_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_voltage_type_caster.h" types = [ - "units::abvolt", - "units::abvolts", - "units::kilovolt", - "units::kilovolts", - "units::microvolt", - "units::microvolts", - "units::millivolt", - "units::millivolts", - "units::nanovolt", - "units::nanovolts", - "units::statvolt", - "units::statvolts", - "units::volt", - "units::volts", + "wpi::units::abvolt", + "wpi::units::abvolts", + "wpi::units::kilovolt", + "wpi::units::kilovolts", + "wpi::units::microvolt", + "wpi::units::microvolts", + "wpi::units::millivolt", + "wpi::units::millivolts", + "wpi::units::nanovolt", + "wpi::units::nanovolts", + "wpi::units::statvolt", + "wpi::units::statvolts", + "wpi::units::volt", + "wpi::units::volts", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_volume_type_caster.h" types = [ - "units::barrel_t", - "units::bushel_t", - "units::cord_t", - "units::cubic_fathom_t", - "units::cubic_foot_t", - "units::cubic_inch_t", - "units::cubic_kilometer_t", - "units::cubic_meter_t", - "units::cubic_mile_t", - "units::cubic_millimeter_t", - "units::cubic_yard_t", - "units::cup_t", - "units::dash_t", - "units::dram_t", - "units::drop_t", - "units::fifth_t", - "units::fluid_ounce_t", - "units::gallon_t", - "units::gill_t", - "units::kiloliter_t", - "units::liter_t", - "units::microliter_t", - "units::milliliter_t", - "units::nanoliter_t", - "units::peck_t", - "units::pinch_t", - "units::pint_t", - "units::quart_t", - "units::sack_t", - "units::shot_t", - "units::strike_t", - "units::tablespoon_t", - "units::teaspoon_t", + "wpi::units::barrel_t", + "wpi::units::bushel_t", + "wpi::units::cord_t", + "wpi::units::cubic_fathom_t", + "wpi::units::cubic_foot_t", + "wpi::units::cubic_inch_t", + "wpi::units::cubic_kilometer_t", + "wpi::units::cubic_meter_t", + "wpi::units::cubic_mile_t", + "wpi::units::cubic_millimeter_t", + "wpi::units::cubic_yard_t", + "wpi::units::cup_t", + "wpi::units::dash_t", + "wpi::units::dram_t", + "wpi::units::drop_t", + "wpi::units::fifth_t", + "wpi::units::fluid_ounce_t", + "wpi::units::gallon_t", + "wpi::units::gill_t", + "wpi::units::kiloliter_t", + "wpi::units::liter_t", + "wpi::units::microliter_t", + "wpi::units::milliliter_t", + "wpi::units::nanoliter_t", + "wpi::units::peck_t", + "wpi::units::pinch_t", + "wpi::units::pint_t", + "wpi::units::quart_t", + "wpi::units::sack_t", + "wpi::units::shot_t", + "wpi::units::strike_t", + "wpi::units::tablespoon_t", + "wpi::units::teaspoon_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_volume_type_caster.h" types = [ - "units::barrel", - "units::barrels", - "units::bushel", - "units::bushels", - "units::cord", - "units::cords", - "units::cubic_fathom", - "units::cubic_fathoms", - "units::cubic_feet", - "units::cubic_foot", - "units::cubic_inch", - "units::cubic_inches", - "units::cubic_kilometer", - "units::cubic_kilometers", - "units::cubic_meter", - "units::cubic_meters", - "units::cubic_mile", - "units::cubic_miles", - "units::cubic_millimeter", - "units::cubic_millimeters", - "units::cubic_yard", - "units::cubic_yards", - "units::cup", - "units::cups", - "units::dash", - "units::dashes", - "units::dram", - "units::drams", - "units::drop", - "units::drops", - "units::fifth", - "units::fifths", - "units::fluid_ounce", - "units::fluid_ounces", - "units::gallon", - "units::gallons", - "units::gill", - "units::gills", - "units::kiloliter", - "units::kiloliters", - "units::liter", - "units::liters", - "units::microliter", - "units::microliters", - "units::milliliter", - "units::milliliters", - "units::nanoliter", - "units::nanoliters", - "units::peck", - "units::pecks", - "units::pinch", - "units::pinches", - "units::pint", - "units::pints", - "units::quart", - "units::quarts", - "units::sack", - "units::sacks", - "units::shot", - "units::shots", - "units::strike", - "units::strikes", - "units::tablespoon", - "units::tablespoons", - "units::teaspoon", - "units::teaspoons", + "wpi::units::barrel", + "wpi::units::barrels", + "wpi::units::bushel", + "wpi::units::bushels", + "wpi::units::cord", + "wpi::units::cords", + "wpi::units::cubic_fathom", + "wpi::units::cubic_fathoms", + "wpi::units::cubic_feet", + "wpi::units::cubic_foot", + "wpi::units::cubic_inch", + "wpi::units::cubic_inches", + "wpi::units::cubic_kilometer", + "wpi::units::cubic_kilometers", + "wpi::units::cubic_meter", + "wpi::units::cubic_meters", + "wpi::units::cubic_mile", + "wpi::units::cubic_miles", + "wpi::units::cubic_millimeter", + "wpi::units::cubic_millimeters", + "wpi::units::cubic_yard", + "wpi::units::cubic_yards", + "wpi::units::cup", + "wpi::units::cups", + "wpi::units::dash", + "wpi::units::dashes", + "wpi::units::dram", + "wpi::units::drams", + "wpi::units::drop", + "wpi::units::drops", + "wpi::units::fifth", + "wpi::units::fifths", + "wpi::units::fluid_ounce", + "wpi::units::fluid_ounces", + "wpi::units::gallon", + "wpi::units::gallons", + "wpi::units::gill", + "wpi::units::gills", + "wpi::units::kiloliter", + "wpi::units::kiloliters", + "wpi::units::liter", + "wpi::units::liters", + "wpi::units::microliter", + "wpi::units::microliters", + "wpi::units::milliliter", + "wpi::units::milliliters", + "wpi::units::nanoliter", + "wpi::units::nanoliters", + "wpi::units::peck", + "wpi::units::pecks", + "wpi::units::pinch", + "wpi::units::pinches", + "wpi::units::pint", + "wpi::units::pints", + "wpi::units::quart", + "wpi::units::quarts", + "wpi::units::sack", + "wpi::units::sacks", + "wpi::units::shot", + "wpi::units::shots", + "wpi::units::strike", + "wpi::units::strikes", + "wpi::units::tablespoon", + "wpi::units::tablespoons", + "wpi::units::teaspoon", + "wpi::units::teaspoons", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_compound_type_caster.h" types = [ - "units::curvature_t", + "wpi::units::curvature_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_compound_type_caster.h" types = [ - "units::compound_unit", - "units::inverse", + "wpi::units::compound_unit", + "wpi::units::inverse", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_misc_type_caster.h" types = [ - "units::dimensionless_t", - "units::dimensionless::dimensionless_t", - "units::scalar_t", - "units::dimensionless::scalar_t", + "wpi::units::dimensionless_t", + "wpi::units::dimensionless::dimensionless_t", + "wpi::units::scalar_t", + "wpi::units::dimensionless::scalar_t", ] default_arg_cast = true [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "units_misc_type_caster.h" types = [ - "units::dimensionless", - "units::dimensionless::dimensionless", - "units::scalar", - "units::dimensionless::scalar", + "wpi::units::dimensionless", + "wpi::units::dimensionless::dimensionless", + "wpi::units::scalar", + "wpi::units::dimensionless::scalar", ] default_arg_cast = false [[tool.semiwrap.export_type_casters.wpimath-casters.headers]] header = "frc_eigen.h" types = [ - "frc::Vectord", - "frc::Matrixd", + "wpi::math::Vectord", + "wpi::math::Matrixd", ] [tool.semiwrap.extension_modules."wpimath._wpimath"] @@ -1463,11 +1461,11 @@ depends = ["wpiutil", "wpimath-casters"] [tool.semiwrap.extension_modules."wpimath._wpimath".headers] # frc -ComputerVisionUtil = "frc/ComputerVisionUtil.h" -# DARE = "frc/DARE.h" -# EigenCore = "frc/EigenCore.h" -MathUtil = "frc/MathUtil.h" -# StateSpaceUtil = "frc/StateSpaceUtil.h" +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" [tool.semiwrap.extension_modules."wpimath.filter._filter"] @@ -1477,10 +1475,10 @@ depends = ["wpimath"] yaml_path = "semiwrap/filter" [tool.semiwrap.extension_modules."wpimath.filter._filter".headers] -Debouncer = "frc/filter/Debouncer.h" -LinearFilter = "frc/filter/LinearFilter.h" -MedianFilter = "frc/filter/MedianFilter.h" -SlewRateLimiter = "frc/filter/SlewRateLimiter.h" +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"] @@ -1491,22 +1489,22 @@ includes = ["wpimath/geometry/include"] yaml_path = "semiwrap/geometry" [tool.semiwrap.extension_modules."wpimath.geometry._geometry".headers] -# frc/geometry -CoordinateAxis = "frc/geometry/CoordinateAxis.h" -CoordinateSystem = "frc/geometry/CoordinateSystem.h" -Ellipse2d = "frc/geometry/Ellipse2d.h" -Pose2d = "frc/geometry/Pose2d.h" -Pose3d = "frc/geometry/Pose3d.h" -Quaternion = "frc/geometry/Quaternion.h" -Rectangle2d = "frc/geometry/Rectangle2d.h" -Rotation2d = "frc/geometry/Rotation2d.h" -Rotation3d = "frc/geometry/Rotation3d.h" -Transform2d = "frc/geometry/Transform2d.h" -Transform3d = "frc/geometry/Transform3d.h" -Translation2d = "frc/geometry/Translation2d.h" -Translation3d = "frc/geometry/Translation3d.h" -Twist2d = "frc/geometry/Twist2d.h" -Twist3d = "frc/geometry/Twist3d.h" +# wpi/math/geometry +CoordinateAxis = "wpi/math/geometry/CoordinateAxis.hpp" +CoordinateSystem = "wpi/math/geometry/CoordinateSystem.hpp" +Ellipse2d = "wpi/math/geometry/Ellipse2d.hpp" +Pose2d = "wpi/math/geometry/Pose2d.hpp" +Pose3d = "wpi/math/geometry/Pose3d.hpp" +Quaternion = "wpi/math/geometry/Quaternion.hpp" +Rectangle2d = "wpi/math/geometry/Rectangle2d.hpp" +Rotation2d = "wpi/math/geometry/Rotation2d.hpp" +Rotation3d = "wpi/math/geometry/Rotation3d.hpp" +Transform2d = "wpi/math/geometry/Transform2d.hpp" +Transform3d = "wpi/math/geometry/Transform3d.hpp" +Translation2d = "wpi/math/geometry/Translation2d.hpp" +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" @@ -1515,8 +1513,8 @@ depends = ["wpimath_geometry"] yaml_path = "semiwrap/interpolation" [tool.semiwrap.extension_modules."wpimath.interpolation._interpolation".headers] -# frc/interpolation -TimeInterpolatableBuffer = "frc/interpolation/TimeInterpolatableBuffer.h" +# wpi/math/interpolation +TimeInterpolatableBuffer = "wpi/math/interpolation/TimeInterpolatableBuffer.hpp" [tool.semiwrap.extension_modules."wpimath.kinematics._kinematics"] @@ -1526,26 +1524,26 @@ depends = ["wpimath_geometry"] yaml_path = "semiwrap/kinematics" [tool.semiwrap.extension_modules."wpimath.kinematics._kinematics".headers] -# frc/kinematics -ChassisSpeeds = "frc/kinematics/ChassisSpeeds.h" -DifferentialDriveKinematics = "frc/kinematics/DifferentialDriveKinematics.h" -DifferentialDriveOdometry3d = "frc/kinematics/DifferentialDriveOdometry3d.h" -DifferentialDriveOdometry = "frc/kinematics/DifferentialDriveOdometry.h" -DifferentialDriveWheelPositions = "frc/kinematics/DifferentialDriveWheelPositions.h" -DifferentialDriveWheelSpeeds = "frc/kinematics/DifferentialDriveWheelSpeeds.h" -Kinematics = "frc/kinematics/Kinematics.h" -MecanumDriveKinematics = "frc/kinematics/MecanumDriveKinematics.h" -MecanumDriveOdometry = "frc/kinematics/MecanumDriveOdometry.h" -MecanumDriveOdometry3d = "frc/kinematics/MecanumDriveOdometry3d.h" -MecanumDriveWheelPositions = "frc/kinematics/MecanumDriveWheelPositions.h" -MecanumDriveWheelSpeeds = "frc/kinematics/MecanumDriveWheelSpeeds.h" -Odometry = "frc/kinematics/Odometry.h" -Odometry3d = "frc/kinematics/Odometry3d.h" -SwerveDriveKinematics = "frc/kinematics/SwerveDriveKinematics.h" -SwerveDriveOdometry = "frc/kinematics/SwerveDriveOdometry.h" -SwerveDriveOdometry3d = "frc/kinematics/SwerveDriveOdometry3d.h" -SwerveModulePosition = "frc/kinematics/SwerveModulePosition.h" -SwerveModuleState = "frc/kinematics/SwerveModuleState.h" +# wpi/math/kinematics +ChassisSpeeds = "wpi/math/kinematics/ChassisSpeeds.hpp" +DifferentialDriveKinematics = "wpi/math/kinematics/DifferentialDriveKinematics.hpp" +DifferentialDriveOdometry3d = "wpi/math/kinematics/DifferentialDriveOdometry3d.hpp" +DifferentialDriveOdometry = "wpi/math/kinematics/DifferentialDriveOdometry.hpp" +DifferentialDriveWheelPositions = "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp" +DifferentialDriveWheelSpeeds = "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp" +Kinematics = "wpi/math/kinematics/Kinematics.hpp" +MecanumDriveKinematics = "wpi/math/kinematics/MecanumDriveKinematics.hpp" +MecanumDriveOdometry = "wpi/math/kinematics/MecanumDriveOdometry.hpp" +MecanumDriveOdometry3d = "wpi/math/kinematics/MecanumDriveOdometry3d.hpp" +MecanumDriveWheelPositions = "wpi/math/kinematics/MecanumDriveWheelPositions.hpp" +MecanumDriveWheelSpeeds = "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp" +Odometry = "wpi/math/kinematics/Odometry.hpp" +Odometry3d = "wpi/math/kinematics/Odometry3d.hpp" +SwerveDriveKinematics = "wpi/math/kinematics/SwerveDriveKinematics.hpp" +SwerveDriveOdometry = "wpi/math/kinematics/SwerveDriveOdometry.hpp" +SwerveDriveOdometry3d = "wpi/math/kinematics/SwerveDriveOdometry3d.hpp" +SwerveModulePosition = "wpi/math/kinematics/SwerveModulePosition.hpp" +SwerveModuleState = "wpi/math/kinematics/SwerveModuleState.hpp" [tool.semiwrap.extension_modules."wpimath.spline._spline"] @@ -1555,12 +1553,12 @@ depends = ["wpimath_geometry"] yaml_path = "semiwrap/spline" [tool.semiwrap.extension_modules."wpimath.spline._spline".headers] -# frc/spline -CubicHermiteSpline = "frc/spline/CubicHermiteSpline.h" -QuinticHermiteSpline = "frc/spline/QuinticHermiteSpline.h" -Spline = "frc/spline/Spline.h" -SplineHelper = "frc/spline/SplineHelper.h" -SplineParameterizer = "frc/spline/SplineParameterizer.h" +# wpi/math/spline +CubicHermiteSpline = "wpi/math/spline/CubicHermiteSpline.hpp" +QuinticHermiteSpline = "wpi/math/spline/QuinticHermiteSpline.hpp" +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"] @@ -1570,72 +1568,72 @@ depends = ["wpimath", "wpimath_geometry", "wpimath_kinematics", "wpimath_spline" yaml_path = "semiwrap/controls" [tool.semiwrap.extension_modules."wpimath._controls._controls".headers] -# frc/controller -ArmFeedforward = "frc/controller/ArmFeedforward.h" -BangBangController = "frc/controller/BangBangController.h" -ControlAffinePlantInversionFeedforward = "frc/controller/ControlAffinePlantInversionFeedforward.h" -DifferentialDriveAccelerationLimiter = "frc/controller/DifferentialDriveAccelerationLimiter.h" -DifferentialDriveFeedforward = "frc/controller/DifferentialDriveFeedforward.h" -DifferentialDriveWheelVoltages = "frc/controller/DifferentialDriveWheelVoltages.h" -ElevatorFeedforward = "frc/controller/ElevatorFeedforward.h" -ImplicitModelFollower = "frc/controller/ImplicitModelFollower.h" -LTVDifferentialDriveController = "frc/controller/LTVDifferentialDriveController.h" -LTVUnicycleController = "frc/controller/LTVUnicycleController.h" -LinearPlantInversionFeedforward = "frc/controller/LinearPlantInversionFeedforward.h" -LinearQuadraticRegulator = "frc/controller/LinearQuadraticRegulator.h" -PIDController = "frc/controller/PIDController.h" -ProfiledPIDController = "frc/controller/ProfiledPIDController.h" -SimpleMotorFeedforward = "frc/controller/SimpleMotorFeedforward.h" - -# frc/estimator -# AngleStatistics = "frc/estimator/AngleStatistics.h" -DifferentialDrivePoseEstimator = "frc/estimator/DifferentialDrivePoseEstimator.h" -DifferentialDrivePoseEstimator3d = "frc/estimator/DifferentialDrivePoseEstimator3d.h" -ExtendedKalmanFilter = "frc/estimator/ExtendedKalmanFilter.h" -KalmanFilter = "frc/estimator/KalmanFilter.h" -# KalmanFilterLatencyCompensator = "frc/estimator/KalmanFilterLatencyCompensator.h" -MecanumDrivePoseEstimator = "frc/estimator/MecanumDrivePoseEstimator.h" -MecanumDrivePoseEstimator3d = "frc/estimator/MecanumDrivePoseEstimator3d.h" -# MerweScaledSigmaPoints = "frc/estimator/MerweScaledSigmaPoints.h" -PoseEstimator = "frc/estimator/PoseEstimator.h" -PoseEstimator3d = "frc/estimator/PoseEstimator3d.h" -SwerveDrivePoseEstimator = "frc/estimator/SwerveDrivePoseEstimator.h" -SwerveDrivePoseEstimator3d = "frc/estimator/SwerveDrivePoseEstimator3d.h" -# UnscentedKalmanFilter = "frc/estimator/UnscentedKalmanFilter.h" -# UnscentedTransform = "frc/estimator/UnscentedTransform.h" - -# frc/optimization -SimulatedAnnealing = "frc/optimization/SimulatedAnnealing.h" - -# frc/path -TravelingSalesman = "frc/path/TravelingSalesman.h" - -# frc/system -# Discretization = "frc/system/Discretization.h" -LinearSystem = "frc/system/LinearSystem.h" -LinearSystemLoop = "frc/system/LinearSystemLoop.h" -# NumericalIntegration = "frc/system/NumericalIntegration.h" -# NumericalJacobian = "frc/system/NumericalJacobian.h" - -# frc/system/plant -DCMotor = "frc/system/plant/DCMotor.h" -LinearSystemId = "frc/system/plant/LinearSystemId.h" - -# frc/trajectory -ExponentialProfile = "frc/trajectory/ExponentialProfile.h" -Trajectory = "frc/trajectory/Trajectory.h" -TrajectoryConfig = "frc/trajectory/TrajectoryConfig.h" -TrajectoryGenerator = "frc/trajectory/TrajectoryGenerator.h" -TrajectoryParameterizer = "frc/trajectory/TrajectoryParameterizer.h" -TrapezoidProfile = "frc/trajectory/TrapezoidProfile.h" - -# frc/trajectory/constraint -CentripetalAccelerationConstraint = "frc/trajectory/constraint/CentripetalAccelerationConstraint.h" -DifferentialDriveKinematicsConstraint = "frc/trajectory/constraint/DifferentialDriveKinematicsConstraint.h" -DifferentialDriveVoltageConstraint = "frc/trajectory/constraint/DifferentialDriveVoltageConstraint.h" -EllipticalRegionConstraint = "frc/trajectory/constraint/EllipticalRegionConstraint.h" -MaxVelocityConstraint = "frc/trajectory/constraint/MaxVelocityConstraint.h" -MecanumDriveKinematicsConstraint = "frc/trajectory/constraint/MecanumDriveKinematicsConstraint.h" -RectangularRegionConstraint = "frc/trajectory/constraint/RectangularRegionConstraint.h" -SwerveDriveKinematicsConstraint = "frc/trajectory/constraint/SwerveDriveKinematicsConstraint.h" -TrajectoryConstraint = "frc/trajectory/constraint/TrajectoryConstraint.h" +# 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/path +TravelingSalesman = "wpi/math/path/TravelingSalesman.hpp" + +# wpi/math/system +# Discretization = "wpi/math/system/Discretization.hpp" +LinearSystem = "wpi/math/system/LinearSystem.hpp" +LinearSystemLoop = "wpi/math/system/LinearSystemLoop.hpp" +# NumericalIntegration = "wpi/math/system/NumericalIntegration.hpp" +# NumericalJacobian = "wpi/math/system/NumericalJacobian.hpp" + +# wpi/math/system/plant +DCMotor = "wpi/math/system/plant/DCMotor.hpp" +LinearSystemId = "wpi/math/system/plant/LinearSystemId.hpp" + +# wpi/math/trajectory +ExponentialProfile = "wpi/math/trajectory/ExponentialProfile.hpp" +Trajectory = "wpi/math/trajectory/Trajectory.hpp" +TrajectoryConfig = "wpi/math/trajectory/TrajectoryConfig.hpp" +TrajectoryGenerator = "wpi/math/trajectory/TrajectoryGenerator.hpp" +TrajectoryParameterizer = "wpi/math/trajectory/TrajectoryParameterizer.hpp" +TrapezoidProfile = "wpi/math/trajectory/TrapezoidProfile.hpp" + +# wpi/math/trajectory/constraint +CentripetalAccelerationConstraint = "wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp" +DifferentialDriveKinematicsConstraint = "wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp" +DifferentialDriveVoltageConstraint = "wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp" +EllipticalRegionConstraint = "wpi/math/trajectory/constraint/EllipticalRegionConstraint.hpp" +MaxVelocityConstraint = "wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp" +MecanumDriveKinematicsConstraint = "wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp" +RectangularRegionConstraint = "wpi/math/trajectory/constraint/RectangularRegionConstraint.hpp" +SwerveDriveKinematicsConstraint = "wpi/math/trajectory/constraint/SwerveDriveKinematicsConstraint.hpp" +TrajectoryConstraint = "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp" diff --git a/subprojects/robotpy-wpimath/semiwrap/MathUtil.yml b/subprojects/robotpy-wpimath/semiwrap/MathUtil.yml index 8408fa5af..04fa04bc0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/MathUtil.yml +++ b/subprojects/robotpy-wpimath/semiwrap/MathUtil.yml @@ -33,8 +33,8 @@ functions: - [double] SlewRateLimit: overloads: - const Translation2d&, const Translation2d&, units::second_t, units::meters_per_second_t: - const Translation3d&, const Translation3d&, units::second_t, units::meters_per_second_t: + const Translation2d&, const Translation2d&, wpi::units::second_t, wpi::units::meters_per_second_t: + const Translation3d&, const Translation3d&, wpi::units::second_t, wpi::units::meters_per_second_t: CopyDirectionPow: overloads: T, double, T: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml index 3c34a97d1..65d3920df 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ArmFeedforward.yml @@ -2,26 +2,26 @@ defaults: subpackage: controller classes: - frc::ArmFeedforward: + wpi::math::ArmFeedforward: force_type_casters: - - units::radians_per_second_squared + - wpi::units::radians_per_second_squared typealias: - - frc::ArmFeedforward::Acceleration - - frc::ArmFeedforward::kv_unit - - frc::ArmFeedforward::ka_unit + - wpi::math::ArmFeedforward::Acceleration + - wpi::math::ArmFeedforward::kv_unit + - wpi::math::ArmFeedforward::ka_unit methods: ArmFeedforward: overloads: '': - units::volt_t, units::volt_t, units::unit_t, units::unit_t: + wpi::units::volt_t, wpi::units::volt_t, wpi::units::unit_t, wpi::units::unit_t: Calculate: overloads: - units::unit_t, units::unit_t, units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t, wpi::units::unit_t [const]: ignore: true - units::unit_t, units::unit_t, units::unit_t, units::second_t [const]: + wpi::units::unit_t, wpi::units::unit_t, wpi::units::unit_t, wpi::units::second_t [const]: ignore: true - units::unit_t, units::unit_t [const]: - units::unit_t, units::unit_t, units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t, wpi::units::unit_t [const]: MaxAchievableVelocity: MinAchievableVelocity: MaxAchievableAcceleration: @@ -39,4 +39,4 @@ extra_includes: - wpystruct.h inline_code: | - SetupWPyStruct(cls_ArmFeedforward); + SetupWPyStruct(cls_ArmFeedforward); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml index 3fd20d7e7..daf522a64 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/BangBangController.yml @@ -2,9 +2,9 @@ defaults: subpackage: controller classes: - frc::BangBangController: + wpi::math::BangBangController: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: BangBangController: SetSetpoint: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml index d93fada35..5de0cacf8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/CentripetalAccelerationConstraint.yml @@ -2,9 +2,9 @@ defaults: subpackage: constraint classes: - frc::CentripetalAccelerationConstraint: + wpi::math::CentripetalAccelerationConstraint: typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: CentripetalAccelerationConstraint: MaxVelocity: @@ -12,6 +12,6 @@ classes: inline_code: |- cls_CentripetalAccelerationConstraint - .def_static("fromFps", [](units::feet_per_second_squared_t maxCentripetalAcceleration) { + .def_static("fromFps", [](wpi::units::feet_per_second_squared_t maxCentripetalAcceleration) { return std::make_shared(maxCentripetalAcceleration); }, py::arg("maxCentripetalAcceleration")); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml index 32451caed..d765af91f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ControlAffinePlantInversionFeedforward.yml @@ -2,15 +2,15 @@ defaults: subpackage: controller classes: - frc::ControlAffinePlantInversionFeedforward: + wpi::math::ControlAffinePlantInversionFeedforward: template_params: - int States - int Inputs methods: ControlAffinePlantInversionFeedforward: overloads: - std::function, units::second_t: - std::function, const Matrixd&, units::second_t: + std::function, wpi::units::second_t: + std::function, const Matrixd&, wpi::units::second_t: Uff: overloads: '[const]': @@ -30,17 +30,17 @@ classes: templates: ControlAffinePlantInversionFeedforward_1_1: - qualname: frc::ControlAffinePlantInversionFeedforward + qualname: wpi::math::ControlAffinePlantInversionFeedforward params: - 1 - 1 ControlAffinePlantInversionFeedforward_2_1: - qualname: frc::ControlAffinePlantInversionFeedforward + qualname: wpi::math::ControlAffinePlantInversionFeedforward params: - 2 - 1 ControlAffinePlantInversionFeedforward_2_2: - qualname: frc::ControlAffinePlantInversionFeedforward + qualname: wpi::math::ControlAffinePlantInversionFeedforward params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml index ee62a40d1..c5fd38711 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DCMotor.yml @@ -5,7 +5,7 @@ extra_includes: - wpystruct.h classes: - frc::DCMotor: + wpi::math::DCMotor: attributes: nominalVoltage: stallTorque: @@ -19,8 +19,8 @@ classes: DCMotor: Current: overloads: - units::radians_per_second_t, units::volt_t [const]: - units::newton_meter_t [const]: + wpi::units::radians_per_second_t, wpi::units::volt_t [const]: + wpi::units::newton_meter_t [const]: Torque: Voltage: Speed: @@ -41,6 +41,9 @@ classes: KrakenX60: KrakenX60FOC: NeoVortex: + KrakenX44: + KrakenX44FOC: + Minion: inline_code: | - SetupWPyStruct(cls_DCMotor); + SetupWPyStruct(cls_DCMotor); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml index bd8864415..291fdea9c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveAccelerationLimiter.yml @@ -2,11 +2,12 @@ defaults: subpackage: controller classes: - frc::DifferentialDriveAccelerationLimiter: + wpi::math::DifferentialDriveAccelerationLimiter: methods: DifferentialDriveAccelerationLimiter: overloads: - LinearSystem<2, 2, 2>, units::meter_t, units::meters_per_second_squared_t, units::radians_per_second_squared_t: - ? LinearSystem<2, 2, 2>, units::meter_t, units::meters_per_second_squared_t, units::meters_per_second_squared_t, units::radians_per_second_squared_t + ? LinearSystem<2, 2, 2>, wpi::units::meter_t, wpi::units::meters_per_second_squared_t, wpi::units::radians_per_second_squared_t + : + ? LinearSystem<2, 2, 2>, wpi::units::meter_t, wpi::units::meters_per_second_squared_t, wpi::units::meters_per_second_squared_t, wpi::units::radians_per_second_squared_t : Calculate: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml index ac8a9d1c8..edd1d33ba 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveFeedforward.yml @@ -2,13 +2,13 @@ defaults: subpackage: controller classes: - frc::DifferentialDriveFeedforward: + wpi::math::DifferentialDriveFeedforward: force_type_casters: - - units::meters_per_second - - units::meters_per_second_squared - - units::radians_per_second - - units::radians_per_second_squared - - units::compound_unit + - wpi::units::meters_per_second + - wpi::units::meters_per_second_squared + - wpi::units::radians_per_second + - wpi::units::radians_per_second_squared + - wpi::units::compound_unit attributes: m_kVLinear: m_kALinear: @@ -17,10 +17,10 @@ classes: methods: DifferentialDriveFeedforward: overloads: - decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_rad_per_s), decltype(1_V/1_rad_per_s_sq), units::meter_t: + decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_rad_per_s), decltype(1_V/1_rad_per_s_sq), wpi::units::meter_t: decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_mps), decltype(1_V/1_mps_sq): # ? decltype ( 1 _V / 1 _mps ), decltype ( 1 _V / 1 _mps_sq ), decltype ( - # 1 _V / 1 _rad_per_s ), decltype ( 1 _V / 1 _rad_per_s_sq ), units::meter_t + # 1 _V / 1 _rad_per_s ), decltype ( 1 _V / 1 _rad_per_s_sq ), wpi::units::meter_t # : # param_override: # kVLinear: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml index f3dffbf1b..9a7433242 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveKinematicsConstraint.yml @@ -2,9 +2,9 @@ defaults: subpackage: constraint classes: - frc::DifferentialDriveKinematicsConstraint: + wpi::math::DifferentialDriveKinematicsConstraint: typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: DifferentialDriveKinematicsConstraint: MaxVelocity: @@ -13,7 +13,7 @@ classes: inline_code: |- cls_DifferentialDriveKinematicsConstraint .def_static("fromFps", [](const DifferentialDriveKinematics& kinematics, - units::feet_per_second_t maxSpeed) { + wpi::units::feet_per_second_t maxSpeed) { return std::make_shared(kinematics, maxSpeed); }, py::arg("kinematics"), py::arg("maxSpeed")) ; diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml index a99a28dff..f765ca54c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator.yml @@ -2,7 +2,7 @@ defaults: subpackage: estimator classes: - frc::DifferentialDrivePoseEstimator: + wpi::math::DifferentialDrivePoseEstimator: force_no_trampoline: true doc: | This class wraps an Unscented Kalman Filter to fuse latency-compensated @@ -40,8 +40,8 @@ classes: methods: DifferentialDrivePoseEstimator: overloads: - DifferentialDriveKinematics&, const Rotation2d&, units::meter_t, units::meter_t, const Pose2d&: - ? DifferentialDriveKinematics&, const Rotation2d&, units::meter_t, units::meter_t, const Pose2d&, const wpi::array&, const wpi::array& + DifferentialDriveKinematics&, const Rotation2d&, wpi::units::meter_t, wpi::units::meter_t, const Pose2d&: + ? DifferentialDriveKinematics&, const Rotation2d&, wpi::units::meter_t, wpi::units::meter_t, const Pose2d&, const wpi::util::array&, const wpi::util::array& : ResetPosition: Update: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml index 847cf4a79..3466dbef7 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDrivePoseEstimator3d.yml @@ -2,13 +2,13 @@ defaults: subpackage: estimator classes: - frc::DifferentialDrivePoseEstimator3d: + wpi::math::DifferentialDrivePoseEstimator3d: force_no_trampoline: true methods: DifferentialDrivePoseEstimator3d: overloads: - DifferentialDriveKinematics&, const Rotation3d&, units::meter_t, units::meter_t, const Pose3d&: - ? DifferentialDriveKinematics&, const Rotation3d&, units::meter_t, units::meter_t, const Pose3d&, const wpi::array&, const wpi::array& + DifferentialDriveKinematics&, const Rotation3d&, wpi::units::meter_t, wpi::units::meter_t, const Pose3d&: + ? DifferentialDriveKinematics&, const Rotation3d&, wpi::units::meter_t, wpi::units::meter_t, const Pose3d&, const wpi::util::array&, const wpi::util::array& : ResetPosition: Update: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml index 2107520b5..e8720f986 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveVoltageConstraint.yml @@ -2,9 +2,9 @@ defaults: subpackage: constraint classes: - frc::DifferentialDriveVoltageConstraint: + wpi::math::DifferentialDriveVoltageConstraint: typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: DifferentialDriveVoltageConstraint: MaxVelocity: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml index e199e0316..f2c0f5c4d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/DifferentialDriveWheelVoltages.yml @@ -3,7 +3,7 @@ defaults: classes: - frc::DifferentialDriveWheelVoltages: + wpi::math::DifferentialDriveWheelVoltages: force_no_default_constructor: true attributes: left: @@ -14,7 +14,7 @@ extra_includes: inline_code: | cls_DifferentialDriveWheelVoltages - .def(py::init(), + .def(py::init(), py::arg("left") = 0, py::arg("right") = 0) .def("__repr__", [](const DifferentialDriveWheelVoltages *self) { return "DifferentialDriveWheelVoltages(" @@ -23,4 +23,4 @@ inline_code: | }) ; - SetupWPyStruct(cls_DifferentialDriveWheelVoltages); + SetupWPyStruct(cls_DifferentialDriveWheelVoltages); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml index e44d36584..974d22b42 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ElevatorFeedforward.yml @@ -2,23 +2,23 @@ defaults: subpackage: controller classes: - frc::ElevatorFeedforward: + wpi::math::ElevatorFeedforward: force_type_casters: - - units::meters_per_second + - wpi::units::meters_per_second - meters_per_second_squared methods: ElevatorFeedforward: overloads: '': - units::volt_t, units::volt_t, units::unit_t, units::unit_t: + wpi::units::volt_t, wpi::units::volt_t, wpi::units::unit_t, wpi::units::unit_t: Calculate: overloads: - units::unit_t, units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t [const]: ignore: true - units::unit_t, units::unit_t, units::second_t [const]: + wpi::units::unit_t, wpi::units::unit_t, wpi::units::second_t [const]: ignore: true - units::unit_t [const]: - units::unit_t, units::unit_t [const]: + wpi::units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t [const]: MaxAchievableVelocity: MinAchievableVelocity: MaxAchievableAcceleration: @@ -36,4 +36,4 @@ extra_includes: - wpystruct.h inline_code: | - SetupWPyStruct(cls_ElevatorFeedforward); + SetupWPyStruct(cls_ElevatorFeedforward); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml index d48f5c211..d8c8dadbf 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/EllipticalRegionConstraint.yml @@ -5,23 +5,23 @@ extra_includes: - PyTrajectoryConstraint.h classes: - frc::EllipticalRegionConstraint: + wpi::math::EllipticalRegionConstraint: template_params: - typename Constraint typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: EllipticalRegionConstraint: overloads: - const Translation2d&, units::meter_t, units::meter_t, const Rotation2d&, const Constraint&: + const Translation2d&, wpi::units::meter_t, wpi::units::meter_t, const Rotation2d&, const Constraint&: const Ellipse2d&, const Constraint&: MaxVelocity: MinMaxAcceleration: template_inline_code: | cls_EllipticalRegionConstraint - .def_static("fromFeet", [](const Translation2d& center, units::foot_t xWidth, - units::foot_t yWidth, const Rotation2d& rotation, + .def_static("fromFeet", [](const Translation2d& center, wpi::units::foot_t xWidth, + wpi::units::foot_t yWidth, const Rotation2d& rotation, const Constraint& constraint) { return std::make_shared>(center, xWidth, yWidth, rotation, constraint); }, py::arg("center"), py::arg("xWidth"), py::arg("yWidth"), py::arg("rotation"), py::arg("constraint")) @@ -29,6 +29,6 @@ classes: templates: EllipticalRegionConstraint: - qualname: frc::EllipticalRegionConstraint + qualname: wpi::math::EllipticalRegionConstraint params: - - frc::PyTrajectoryConstraint + - wpi::math::PyTrajectoryConstraint diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml index eff51e3d0..96532b038 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ExponentialProfile.yml @@ -2,9 +2,9 @@ defaults: subpackage: trajectory classes: - frc::ExponentialProfile: + wpi::math::ExponentialProfile: force_type_casters: - - units::meters_per_second_t + - wpi::units::meters_per_second_t template_params: - Distance - Input @@ -18,7 +18,7 @@ classes: CalculateProfileTiming: overloads: const State&, const State& [const]: - frc::ExponentialProfile::Constraints: + wpi::math::ExponentialProfile::Constraints: attributes: maxInput: A: @@ -33,13 +33,13 @@ classes: MaxVelocity: inline_code: | .def_static("fromStateSpace", [](Input_t maxInput, A_t a, B_t b) { - return typename frc::ExponentialProfile::Constraints(maxInput, a, b); + return typename wpi::math::ExponentialProfile::Constraints(maxInput, a, b); }, py::arg("maxInput"), py::arg("a"), py::arg("b")) .def_static("fromCharacteristics", [](Input_t maxInput, kV_t kv, kA_t ka) { - return typename frc::ExponentialProfile::Constraints(maxInput, kv, ka); + return typename wpi::math::ExponentialProfile::Constraints(maxInput, kv, ka); }, py::arg("maxInput"), py::arg("kV"), py::arg("kA")) - frc::ExponentialProfile::State: + wpi::math::ExponentialProfile::State: force_no_default_constructor: true attributes: position: @@ -48,7 +48,7 @@ classes: operator==: inline_code: | .def(py::init()) - frc::ExponentialProfile::ProfileTiming: + wpi::math::ExponentialProfile::ProfileTiming: attributes: inflectionTime: totalTime: @@ -57,7 +57,7 @@ classes: templates: ExponentialProfileMeterVolts: - qualname: frc::ExponentialProfile + qualname: wpi::math::ExponentialProfile params: - - units::meter - - units::volt + - wpi::units::meter + - wpi::units::volt diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml index 27eae0600..95338b699 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ExtendedKalmanFilter.yml @@ -2,7 +2,7 @@ defaults: subpackage: estimator classes: - frc::ExtendedKalmanFilter: + wpi::math::ExtendedKalmanFilter: template_params: - int States - int Inputs @@ -10,9 +10,9 @@ classes: methods: ExtendedKalmanFilter: overloads: - ? std::function, std::function, const StateArray&, const OutputArray&, units::second_t + ? std::function, std::function, const StateArray&, const OutputArray&, wpi::units::second_t : - ? std::function, std::function, const StateArray&, const OutputArray&, std::function, std::function, units::second_t + ? std::function, std::function, const StateArray&, const OutputArray&, std::function, std::function, wpi::units::second_t : P: overloads: @@ -41,25 +41,25 @@ classes: templates: ExtendedKalmanFilter_1_1_1: - qualname: frc::ExtendedKalmanFilter + qualname: wpi::math::ExtendedKalmanFilter params: - 1 - 1 - 1 ExtendedKalmanFilter_2_1_1: - qualname: frc::ExtendedKalmanFilter + qualname: wpi::math::ExtendedKalmanFilter params: - 2 - 1 - 1 ExtendedKalmanFilter_2_1_2: - qualname: frc::ExtendedKalmanFilter + qualname: wpi::math::ExtendedKalmanFilter params: - 2 - 1 - 2 ExtendedKalmanFilter_2_2_2: - qualname: frc::ExtendedKalmanFilter + qualname: wpi::math::ExtendedKalmanFilter params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml index e1bf7563b..f1d240a3c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ImplicitModelFollower.yml @@ -2,7 +2,7 @@ defaults: subpackage: controller classes: - frc::ImplicitModelFollower: + wpi::math::ImplicitModelFollower: template_params: - int States - int Inputs @@ -22,27 +22,27 @@ classes: template_inline_code: | cls_ImplicitModelFollower - .def(py::init&, const frc::LinearSystem&>(), + .def(py::init&, const wpi::math::LinearSystem&>(), py::arg("plant"), py::arg("plantRef")) - .def(py::init&, const frc::LinearSystem&>(), + .def(py::init&, const wpi::math::LinearSystem&>(), py::arg("plant"), py::arg("plantRef")) - .def(py::init&, const frc::LinearSystem&>(), + .def(py::init&, const wpi::math::LinearSystem&>(), py::arg("plant"), py::arg("plantRef")) ; templates: ImplicitModelFollower_1_1: - qualname: frc::ImplicitModelFollower + qualname: wpi::math::ImplicitModelFollower params: - 1 - 1 ImplicitModelFollower_2_1: - qualname: frc::ImplicitModelFollower + qualname: wpi::math::ImplicitModelFollower params: - 2 - 1 ImplicitModelFollower_2_2: - qualname: frc::ImplicitModelFollower + qualname: wpi::math::ImplicitModelFollower params: - 2 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml b/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml index 6ea53930f..94b780203 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/KalmanFilter.yml @@ -2,7 +2,7 @@ defaults: subpackage: estimator classes: - frc::KalmanFilter: + wpi::math::KalmanFilter: template_params: - int States - int Inputs @@ -31,31 +31,31 @@ classes: templates: KalmanFilter_1_1_1: - qualname: frc::KalmanFilter + qualname: wpi::math::KalmanFilter params: - 1 - 1 - 1 KalmanFilter_2_1_1: - qualname: frc::KalmanFilter + qualname: wpi::math::KalmanFilter params: - 2 - 1 - 1 KalmanFilter_2_1_2: - qualname: frc::KalmanFilter + qualname: wpi::math::KalmanFilter params: - 2 - 1 - 2 KalmanFilter_2_2_2: - qualname: frc::KalmanFilter + qualname: wpi::math::KalmanFilter params: - 2 - 2 - 2 KalmanFilter_3_2_3: - qualname: frc::KalmanFilter + qualname: wpi::math::KalmanFilter params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml index 36abca332..5b63d020f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LTVDifferentialDriveController.yml @@ -2,13 +2,13 @@ defaults: subpackage: controller classes: - frc::LTVDifferentialDriveController: + wpi::math::LTVDifferentialDriveController: methods: LTVDifferentialDriveController: AtReference: SetTolerance: Calculate: overloads: - ? const Pose2d&, units::meters_per_second_t, units::meters_per_second_t, const Pose2d&, units::meters_per_second_t, units::meters_per_second_t + ? const Pose2d&, wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, const Pose2d&, wpi::units::meters_per_second_t, wpi::units::meters_per_second_t : - const Pose2d&, units::meters_per_second_t, units::meters_per_second_t, const Trajectory::State&: + const Pose2d&, wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, const Trajectory::State&: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml index 6611e474f..0c94264d0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LTVUnicycleController.yml @@ -2,12 +2,12 @@ defaults: subpackage: controller classes: - frc::LTVUnicycleController: + wpi::math::LTVUnicycleController: methods: LTVUnicycleController: overloads: - units::second_t: - const wpi::array&, const wpi::array&, units::second_t: + wpi::units::second_t: + const wpi::util::array&, const wpi::util::array&, wpi::units::second_t: # param_override: # maxVelocity: # default: 9_mps @@ -15,6 +15,6 @@ classes: SetTolerance: Calculate: overloads: - const Pose2d&, const Pose2d&, units::meters_per_second_t, units::radians_per_second_t: + const Pose2d&, const Pose2d&, wpi::units::meters_per_second_t, wpi::units::radians_per_second_t: const Pose2d&, const Trajectory::State&: SetEnabled: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml index 93deccc6d..4e6743d34 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearPlantInversionFeedforward.yml @@ -2,16 +2,16 @@ defaults: subpackage: controller classes: - frc::LinearPlantInversionFeedforward: + wpi::math::LinearPlantInversionFeedforward: template_params: - int States - int Inputs methods: LinearPlantInversionFeedforward: overloads: - const LinearSystem&, units::second_t: + const LinearSystem&, wpi::units::second_t: ignore: true - const Matrixd&, const Matrixd&, units::second_t: + const Matrixd&, const Matrixd&, wpi::units::second_t: Uff: overloads: '[const]': @@ -31,22 +31,22 @@ classes: templates: LinearPlantInversionFeedforward_1_1: - qualname: frc::LinearPlantInversionFeedforward + qualname: wpi::math::LinearPlantInversionFeedforward params: - 1 - 1 LinearPlantInversionFeedforward_2_1: - qualname: frc::LinearPlantInversionFeedforward + qualname: wpi::math::LinearPlantInversionFeedforward params: - 2 - 1 LinearPlantInversionFeedforward_2_2: - qualname: frc::LinearPlantInversionFeedforward + qualname: wpi::math::LinearPlantInversionFeedforward params: - 2 - 2 LinearPlantInversionFeedforward_3_2: - qualname: frc::LinearPlantInversionFeedforward + qualname: wpi::math::LinearPlantInversionFeedforward params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml index addb967db..025b5c0cf 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearQuadraticRegulator.yml @@ -2,19 +2,19 @@ defaults: subpackage: controller classes: - frc::LinearQuadraticRegulator: + wpi::math::LinearQuadraticRegulator: template_params: - int States - int Inputs methods: LinearQuadraticRegulator: overloads: - const LinearSystem&, const StateArray&, const InputArray&, units::second_t: + const LinearSystem&, const StateArray&, const InputArray&, wpi::units::second_t: ignore: true - const Matrixd&, const Matrixd&, const StateArray&, const InputArray&, units::second_t: - ? const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, units::second_t + const Matrixd&, const Matrixd&, const StateArray&, const InputArray&, wpi::units::second_t: + ? const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, wpi::units::second_t : - ? const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, units::second_t + ? const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, const Matrixd&, wpi::units::second_t : K: overloads: @@ -39,28 +39,28 @@ classes: - ['2'] template_inline_code: | cls_LinearQuadraticRegulator - .def(py::init&, const wpi::array&, const wpi::array&, units::second_t>()) - .def(py::init&, const wpi::array&, const wpi::array&, units::second_t>()) - .def(py::init&, const wpi::array&, const wpi::array&, units::second_t>()); + .def(py::init&, const wpi::util::array&, const wpi::util::array&, wpi::units::second_t>()) + .def(py::init&, const wpi::util::array&, const wpi::util::array&, wpi::units::second_t>()) + .def(py::init&, const wpi::util::array&, const wpi::util::array&, wpi::units::second_t>()); templates: LinearQuadraticRegulator_1_1: - qualname: frc::LinearQuadraticRegulator + qualname: wpi::math::LinearQuadraticRegulator params: - 1 - 1 LinearQuadraticRegulator_2_1: - qualname: frc::LinearQuadraticRegulator + qualname: wpi::math::LinearQuadraticRegulator params: - 2 - 1 LinearQuadraticRegulator_2_2: - qualname: frc::LinearQuadraticRegulator + qualname: wpi::math::LinearQuadraticRegulator params: - 2 - 2 LinearQuadraticRegulator_3_2: - qualname: frc::LinearQuadraticRegulator + qualname: wpi::math::LinearQuadraticRegulator params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml index a96d320eb..52ccfd459 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystem.yml @@ -2,7 +2,7 @@ defaults: subpackage: system classes: - frc::LinearSystem: + wpi::math::LinearSystem: template_params: - int States - int Inputs @@ -33,73 +33,73 @@ classes: templates: LinearSystem_1_1_1: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 1 - 1 - 1 LinearSystem_1_1_2: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 1 - 1 - 2 LinearSystem_1_1_3: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 1 - 1 - 3 LinearSystem_2_1_1: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 1 - 1 LinearSystem_2_1_2: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 1 - 2 LinearSystem_2_1_3: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 1 - 3 LinearSystem_2_2_1: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 2 - 1 LinearSystem_2_2_2: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 2 - 2 LinearSystem_2_2_3: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 2 - 2 - 3 LinearSystem_3_2_1: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 3 - 2 - 1 LinearSystem_3_2_2: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 3 - 2 - 2 LinearSystem_3_2_3: - qualname: frc::LinearSystem + qualname: wpi::math::LinearSystem params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml index 52874e4dd..052bddddc 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemId.yml @@ -2,12 +2,12 @@ defaults: subpackage: plant classes: - frc::LinearSystemId: + wpi::math::LinearSystemId: typealias: - - kv_meters = units::unit_t>> - - kv_radians = units::unit_t>> - - ka_meters = units::unit_t>> - - ka_radians = units::unit_t>> + - kv_meters = wpi::units::unit_t>> + - kv_radians = wpi::units::unit_t>> + - ka_meters = wpi::units::unit_t>> + - ka_radians = wpi::units::unit_t>> methods: ElevatorSystem: SingleJointedArmSystem: @@ -15,48 +15,48 @@ classes: rename: identifyVelocitySystemMeters cpp_code: | [](kv_meters kV, ka_meters kA) { - return frc::LinearSystemId::IdentifyVelocitySystem(kV, kA); + return wpi::math::LinearSystemId::IdentifyVelocitySystem(kV, kA); } IdentifyPositionSystem: rename: identifyPositionSystemMeters cpp_code: | [](kv_meters kV, ka_meters kA) { - return frc::LinearSystemId::IdentifyPositionSystem(kV, kA); + return wpi::math::LinearSystemId::IdentifyPositionSystem(kV, kA); } IdentifyDrivetrainSystem: overloads: decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_mps), decltype(1_V/1_mps_sq): cpp_code: | [](kv_meters kVlinear, ka_meters kAlinear, kv_meters kVangular, ka_meters kAangular) { - return frc::LinearSystemId::IdentifyDrivetrainSystem(kVlinear, kAlinear, kVangular, kAangular); + return wpi::math::LinearSystemId::IdentifyDrivetrainSystem(kVlinear, kAlinear, kVangular, kAangular); } - decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_rad_per_s), decltype(1_V/1_rad_per_s_sq), units::meter_t: + decltype(1_V/1_mps), decltype(1_V/1_mps_sq), decltype(1_V/1_rad_per_s), decltype(1_V/1_rad_per_s_sq), wpi::units::meter_t: cpp_code: | - [](kv_meters kVlinear, ka_meters kAlinear, kv_radians kVangular, ka_radians kAangular, units::meter_t trackWidth) { - return frc::LinearSystemId::IdentifyDrivetrainSystem(kVlinear, kAlinear, kVangular, kAangular, trackWidth); + [](kv_meters kVlinear, ka_meters kAlinear, kv_radians kVangular, ka_radians kAangular, wpi::units::meter_t trackWidth) { + return wpi::math::LinearSystemId::IdentifyDrivetrainSystem(kVlinear, kAlinear, kVangular, kAangular, trackWidth); } FlywheelSystem: DCMotorSystem: overloads: - DCMotor, units::kilogram_square_meter_t, double: + DCMotor, wpi::units::kilogram_square_meter_t, double: decltype(1_V/Velocity_t (1)), decltype(1_V/Acceleration_t (1)): cpp_code: | [](kv_meters kv, ka_meters ka) { - return frc::LinearSystemId::DCMotorSystem(kv, ka); + return wpi::math::LinearSystemId::DCMotorSystem(kv, ka); } DrivetrainVelocitySystem: inline_code: | .def_static("DCMotorSystemRadians", [](kv_radians kV, ka_radians kA) { - return frc::LinearSystemId::DCMotorSystem(kV, kA); + return wpi::math::LinearSystemId::DCMotorSystem(kV, kA); }, py::arg("kV"), py::arg("kA"), release_gil() ) .def_static("identifyVelocitySystemRadians", [](kv_radians kV, ka_radians kA) { - return frc::LinearSystemId::IdentifyVelocitySystem(kV, kA); + return wpi::math::LinearSystemId::IdentifyVelocitySystem(kV, kA); }, py::arg("kV"), py::arg("kA"), release_gil() ) .def_static("identifyPositionSystemRadians", [](kv_radians kV, ka_radians kA) { - return frc::LinearSystemId::IdentifyPositionSystem(kV, kA); + return wpi::math::LinearSystemId::IdentifyPositionSystem(kV, kA); }, py::arg("kV"), py::arg("kA"), release_gil() ) diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml index 09d0bc2b9..00a6897c8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/LinearSystemLoop.yml @@ -2,7 +2,7 @@ defaults: subpackage: system classes: - frc::LinearSystemLoop: + wpi::math::LinearSystemLoop: template_params: - int States - int Inputs @@ -10,11 +10,11 @@ classes: methods: LinearSystemLoop: overloads: - ? LinearSystem&, LinearQuadraticRegulator&, KalmanFilter&, units::volt_t, units::second_t + ? LinearSystem&, LinearQuadraticRegulator&, KalmanFilter&, wpi::units::volt_t, wpi::units::second_t : - ? LinearSystem&, LinearQuadraticRegulator&, KalmanFilter&, std::function, units::second_t + ? LinearSystem&, LinearQuadraticRegulator&, KalmanFilter&, std::function, wpi::units::second_t : - ? LinearQuadraticRegulator&, const LinearPlantInversionFeedforward&, KalmanFilter&, units::volt_t + ? LinearQuadraticRegulator&, const LinearPlantInversionFeedforward&, KalmanFilter&, wpi::units::volt_t : ? LinearQuadraticRegulator&, const LinearPlantInversionFeedforward&, KalmanFilter&, std::function : @@ -48,31 +48,31 @@ classes: ClampInput: templates: LinearSystemLoop_1_1_1: - qualname: frc::LinearSystemLoop + qualname: wpi::math::LinearSystemLoop params: - 1 - 1 - 1 LinearSystemLoop_2_1_1: - qualname: frc::LinearSystemLoop + qualname: wpi::math::LinearSystemLoop params: - 2 - 1 - 1 LinearSystemLoop_2_1_2: - qualname: frc::LinearSystemLoop + qualname: wpi::math::LinearSystemLoop params: - 2 - 1 - 2 LinearSystemLoop_2_2_2: - qualname: frc::LinearSystemLoop + qualname: wpi::math::LinearSystemLoop params: - 2 - 2 - 2 LinearSystemLoop_3_2_3: - qualname: frc::LinearSystemLoop + qualname: wpi::math::LinearSystemLoop params: - 3 - 2 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml index 45053558a..b6a2c94f3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MaxVelocityConstraint.yml @@ -2,9 +2,9 @@ defaults: subpackage: constraint classes: - frc::MaxVelocityConstraint: + wpi::math::MaxVelocityConstraint: typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: MaxVelocityConstraint: MaxVelocity: @@ -12,7 +12,7 @@ classes: inline_code: |- cls_MaxVelocityConstraint - .def_static("fromFps", [](units::feet_per_second_t maxVelocity) { - return std::make_shared(maxVelocity); + .def_static("fromFps", [](wpi::units::feet_per_second_t maxVelocity) { + return std::make_shared(maxVelocity); }, py::arg("maxVelocity")) ; diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml index 051b73235..acf677b0a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDriveKinematicsConstraint.yml @@ -2,9 +2,9 @@ defaults: subpackage: constraint classes: - frc::MecanumDriveKinematicsConstraint: + wpi::math::MecanumDriveKinematicsConstraint: typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: MecanumDriveKinematicsConstraint: MaxVelocity: @@ -12,8 +12,8 @@ classes: inline_code: |- cls_MecanumDriveKinematicsConstraint - .def_static("fromFps", [](const frc::MecanumDriveKinematics& kinematics, - units::feet_per_second_t maxSpeed) { - return std::make_shared(kinematics, maxSpeed); + .def_static("fromFps", [](const wpi::math::MecanumDriveKinematics& kinematics, + wpi::units::feet_per_second_t maxSpeed) { + return std::make_shared(kinematics, maxSpeed); }, py::arg("kinematics"), py::arg("maxSpeed")) ; diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml index f666b3187..48c27ad85 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator.yml @@ -2,7 +2,7 @@ defaults: subpackage: estimator classes: - frc::MecanumDrivePoseEstimator: + wpi::math::MecanumDrivePoseEstimator: force_no_trampoline: true doc: | This class wraps an Unscented Kalman Filter to fuse latency-compensated @@ -34,5 +34,5 @@ classes: MecanumDrivePoseEstimator: overloads: MecanumDriveKinematics&, const Rotation2d&, const MecanumDriveWheelPositions&, const Pose2d&: - ? MecanumDriveKinematics&, const Rotation2d&, const MecanumDriveWheelPositions&, const Pose2d&, const wpi::array&, const wpi::array& + ? MecanumDriveKinematics&, const Rotation2d&, const MecanumDriveWheelPositions&, const Pose2d&, const wpi::util::array&, const wpi::util::array& : diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml index 3cac61fb3..66a08e5f3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/MecanumDrivePoseEstimator3d.yml @@ -2,11 +2,11 @@ defaults: subpackage: estimator classes: - frc::MecanumDrivePoseEstimator3d: + wpi::math::MecanumDrivePoseEstimator3d: force_no_trampoline: true methods: MecanumDrivePoseEstimator3d: overloads: MecanumDriveKinematics&, const Rotation3d&, const MecanumDriveWheelPositions&, const Pose3d&: - ? MecanumDriveKinematics&, const Rotation3d&, const MecanumDriveWheelPositions&, const Pose3d&, const wpi::array&, const wpi::array& + ? MecanumDriveKinematics&, const Rotation3d&, const MecanumDriveWheelPositions&, const Pose3d&, const wpi::util::array&, const wpi::util::array& : diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml index 4da68d4f7..00b2b07bc 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PIDController.yml @@ -2,9 +2,9 @@ defaults: subpackage: controller classes: - frc::PIDController: + wpi::math::PIDController: ignored_bases: - - wpi::SendableHelper + - wpi::util::SendableHelper methods: PIDController: param_override: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml index cb83c6530..5e95d1dde 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator.yml @@ -2,15 +2,15 @@ defaults: subpackage: estimator extra_includes: -- frc/kinematics/DifferentialDriveWheelPositions.h -- frc/kinematics/DifferentialDriveWheelSpeeds.h -- frc/kinematics/MecanumDriveWheelPositions.h -- frc/kinematics/MecanumDriveWheelSpeeds.h -- frc/kinematics/SwerveDriveKinematics.h +- wpi/math/kinematics/DifferentialDriveWheelPositions.hpp +- wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp +- wpi/math/kinematics/MecanumDriveWheelPositions.hpp +- wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp +- wpi/math/kinematics/SwerveDriveKinematics.hpp classes: - frc::PoseEstimator: + wpi::math::PoseEstimator: template_params: - WheelSpeeds - WheelPositions @@ -25,39 +25,39 @@ classes: SampleAt: AddVisionMeasurement: overloads: - const Pose2d&, units::second_t: - const Pose2d&, units::second_t, const wpi::array&: + const Pose2d&, wpi::units::second_t: + const Pose2d&, wpi::units::second_t, const wpi::util::array&: Update: UpdateWithTime: templates: DifferentialDrivePoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - frc::DifferentialDriveWheelSpeeds - - frc::DifferentialDriveWheelPositions + - wpi::math::DifferentialDriveWheelSpeeds + - wpi::math::DifferentialDriveWheelPositions MecanumDrivePoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - frc::MecanumDriveWheelSpeeds - - frc::MecanumDriveWheelPositions + - wpi::math::MecanumDriveWheelSpeeds + - wpi::math::MecanumDriveWheelPositions SwerveDrive2PoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive3PoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive4PoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive6PoseEstimatorBase: - qualname: frc::PoseEstimator + qualname: wpi::math::PoseEstimator params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml index c03548036..69cd62b6e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/PoseEstimator3d.yml @@ -2,14 +2,14 @@ defaults: subpackage: estimator extra_includes: -- frc/kinematics/DifferentialDriveWheelPositions.h -- frc/kinematics/DifferentialDriveWheelSpeeds.h -- frc/kinematics/MecanumDriveWheelPositions.h -- frc/kinematics/MecanumDriveWheelSpeeds.h -- frc/kinematics/SwerveDriveKinematics.h +- wpi/math/kinematics/DifferentialDriveWheelPositions.hpp +- wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp +- wpi/math/kinematics/MecanumDriveWheelPositions.hpp +- wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp +- wpi/math/kinematics/SwerveDriveKinematics.hpp classes: - frc::PoseEstimator3d: + wpi::math::PoseEstimator3d: template_params: - WheelSpeeds - WheelPositions @@ -24,40 +24,40 @@ classes: SampleAt: AddVisionMeasurement: overloads: - const Pose3d&, units::second_t: - const Pose3d&, units::second_t, const wpi::array&: + const Pose3d&, wpi::units::second_t: + const Pose3d&, wpi::units::second_t, const wpi::util::array&: Update: UpdateWithTime: templates: DifferentialDrivePoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - frc::DifferentialDriveWheelSpeeds - - frc::DifferentialDriveWheelPositions + - wpi::math::DifferentialDriveWheelSpeeds + - wpi::math::DifferentialDriveWheelPositions MecanumDrivePoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - frc::MecanumDriveWheelSpeeds - - frc::MecanumDriveWheelPositions + - wpi::math::MecanumDriveWheelSpeeds + - wpi::math::MecanumDriveWheelPositions SwerveDrive2PoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive3PoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive4PoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive6PoseEstimator3dBase: - qualname: frc::PoseEstimator3d + qualname: wpi::math::PoseEstimator3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml index 71cf286a0..f814482a9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/ProfiledPIDController.yml @@ -5,16 +5,16 @@ functions: IncrementAndGetProfiledPIDControllerInstances: ignore: true classes: - frc::ProfiledPIDController: + wpi::math::ProfiledPIDController: force_type_casters: - - units::radians_per_second + - wpi::units::radians_per_second template_params: - Distance ignored_bases: - - wpi::SendableHelper> + - wpi::util::SendableHelper> typealias: - - typename frc::ProfiledPIDController::Velocity - - typename frc::ProfiledPIDController::Velocity_t + - typename wpi::math::ProfiledPIDController::Velocity + - typename wpi::math::ProfiledPIDController::Velocity_t methods: ProfiledPIDController: param_override: @@ -56,7 +56,7 @@ classes: Distance_t: Distance_t, State: Distance_t, Distance_t: - Distance_t, Distance_t, typename frc::TrapezoidProfile::Constraints: + Distance_t, Distance_t, typename wpi::math::TrapezoidProfile::Constraints: param_override: constraints: x_type: typename TrapezoidProfile::Constraints @@ -69,12 +69,12 @@ classes: templates: ProfiledPIDController: - qualname: frc::ProfiledPIDController + qualname: wpi::math::ProfiledPIDController params: - - units::dimensionless::scalar + - wpi::units::dimensionless::scalar # needed for HolonomicDriveController ProfiledPIDControllerRadians: - qualname: frc::ProfiledPIDController + qualname: wpi::math::ProfiledPIDController params: - - units::radian + - wpi::units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml index 153423ae9..6aec5b893 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/RectangularRegionConstraint.yml @@ -5,11 +5,11 @@ extra_includes: - PyTrajectoryConstraint.h classes: - frc::RectangularRegionConstraint: + wpi::math::RectangularRegionConstraint: template_params: - typename Constraint typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: RectangularRegionConstraint: overloads: @@ -20,6 +20,6 @@ classes: templates: RectangularRegionConstraint: - qualname: frc::RectangularRegionConstraint + qualname: wpi::math::RectangularRegionConstraint params: - - frc::PyTrajectoryConstraint + - wpi::math::PyTrajectoryConstraint diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml index 5b4e567b0..2bab307c3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SimpleMotorFeedforward.yml @@ -2,31 +2,31 @@ defaults: subpackage: controller extra_includes: -- units/dimensionless.h +- wpi/units/dimensionless.hpp classes: - frc::SimpleMotorFeedforward: + wpi::math::SimpleMotorFeedforward: force_type_casters: - - units::meters_per_second - - units::meters_per_second_squared - - units::radians_per_second - - units::radians_per_second_squared + - wpi::units::meters_per_second + - wpi::units::meters_per_second_squared + - wpi::units::radians_per_second + - wpi::units::radians_per_second_squared typealias: - - typename frc::SimpleMotorFeedforward::Velocity - - typename frc::SimpleMotorFeedforward::Acceleration - - typename frc::SimpleMotorFeedforward::kv_unit - - typename frc::SimpleMotorFeedforward::ka_unit + - typename wpi::math::SimpleMotorFeedforward::Velocity + - typename wpi::math::SimpleMotorFeedforward::Acceleration + - typename wpi::math::SimpleMotorFeedforward::kv_unit + - typename wpi::math::SimpleMotorFeedforward::ka_unit template_params: - Distance methods: SimpleMotorFeedforward: overloads: '': - units::volt_t, units::unit_t, units::unit_t: + wpi::units::volt_t, wpi::units::unit_t, wpi::units::unit_t: Calculate: overloads: - units::unit_t [const]: - units::unit_t, units::unit_t [const]: + wpi::units::unit_t [const]: + wpi::units::unit_t, wpi::units::unit_t [const]: MaxAchievableVelocity: MinAchievableVelocity: MaxAchievableAcceleration: @@ -42,16 +42,16 @@ classes: templates: # Unfortunately this is broken because calculate requires an SI unit # SimpleMotorFeedforward: - # qualname: frc::SimpleMotorFeedforward + # qualname: wpi::math::SimpleMotorFeedforward # params: - # - units::dimensionless::scalar + # - wpi::units::dimensionless::scalar SimpleMotorFeedforwardMeters: - qualname: frc::SimpleMotorFeedforward + qualname: wpi::math::SimpleMotorFeedforward params: - - units::meter + - wpi::units::meter SimpleMotorFeedforwardRadians: - qualname: frc::SimpleMotorFeedforward + qualname: wpi::math::SimpleMotorFeedforward params: - - units::radian + - wpi::units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml index b13e812ce..eac432a10 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SimulatedAnnealing.yml @@ -5,7 +5,7 @@ extra_includes: - gilsafe_object.h classes: - frc::SimulatedAnnealing: + wpi::math::SimulatedAnnealing: template_params: - State methods: @@ -14,6 +14,6 @@ classes: templates: SimulatedAnnealing: - qualname: frc::SimulatedAnnealing + qualname: wpi::math::SimulatedAnnealing params: - semiwrap::gilsafe_object diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml index b9107a469..4f53b57a2 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDriveKinematicsConstraint.yml @@ -2,37 +2,37 @@ defaults: subpackage: constraint classes: - frc::SwerveDriveKinematicsConstraint: + wpi::math::SwerveDriveKinematicsConstraint: template_params: - size_t NumModules typealias: - - frc::TrajectoryConstraint::MinMax + - wpi::math::TrajectoryConstraint::MinMax methods: SwerveDriveKinematicsConstraint: MaxVelocity: MinMaxAcceleration: template_inline_code: | cls_SwerveDriveKinematicsConstraint - .def_static("fromFps", [](const frc::SwerveDriveKinematics& kinematics, - units::feet_per_second_t maxSpeed) { - return std::make_shared>(kinematics, maxSpeed); + .def_static("fromFps", [](const wpi::math::SwerveDriveKinematics& kinematics, + wpi::units::feet_per_second_t maxSpeed) { + return std::make_shared>(kinematics, maxSpeed); }, py::arg("kinematics"), py::arg("maxSpeed")) ; templates: SwerveDrive2KinematicsConstraint: - qualname: frc::SwerveDriveKinematicsConstraint + qualname: wpi::math::SwerveDriveKinematicsConstraint params: - 2 SwerveDrive3KinematicsConstraint: - qualname: frc::SwerveDriveKinematicsConstraint + qualname: wpi::math::SwerveDriveKinematicsConstraint params: - 3 SwerveDrive4KinematicsConstraint: - qualname: frc::SwerveDriveKinematicsConstraint + qualname: wpi::math::SwerveDriveKinematicsConstraint params: - 4 SwerveDrive6KinematicsConstraint: - qualname: frc::SwerveDriveKinematicsConstraint + qualname: wpi::math::SwerveDriveKinematicsConstraint params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml index eb7f14c0f..05c75827e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator.yml @@ -2,10 +2,10 @@ defaults: subpackage: estimator extra_includes: -- frc/kinematics/SwerveModuleState.h +- wpi/math/kinematics/SwerveModuleState.hpp classes: - frc::SwerveDrivePoseEstimator: + wpi::math::SwerveDrivePoseEstimator: force_no_trampoline: true doc: | This class wraps Swerve Drive Odometry to fuse latency-compensated @@ -30,24 +30,25 @@ classes: methods: SwerveDrivePoseEstimator: overloads: - SwerveDriveKinematics&, const Rotation2d&, const wpi::array&, const Pose2d&: - ? SwerveDriveKinematics&, const Rotation2d&, const wpi::array&, const Pose2d&, const wpi::array&, const wpi::array& + ? SwerveDriveKinematics&, const Rotation2d&, const wpi::util::array&, const Pose2d& + : + ? SwerveDriveKinematics&, const Rotation2d&, const wpi::util::array&, const Pose2d&, const wpi::util::array&, const wpi::util::array& : templates: SwerveDrive2PoseEstimator: - qualname: frc::SwerveDrivePoseEstimator + qualname: wpi::math::SwerveDrivePoseEstimator params: - 2 SwerveDrive3PoseEstimator: - qualname: frc::SwerveDrivePoseEstimator + qualname: wpi::math::SwerveDrivePoseEstimator params: - 3 SwerveDrive4PoseEstimator: - qualname: frc::SwerveDrivePoseEstimator + qualname: wpi::math::SwerveDrivePoseEstimator params: - 4 SwerveDrive6PoseEstimator: - qualname: frc::SwerveDrivePoseEstimator + qualname: wpi::math::SwerveDrivePoseEstimator params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml index 10300ad46..d895537b3 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/SwerveDrivePoseEstimator3d.yml @@ -2,35 +2,36 @@ defaults: subpackage: estimator extra_includes: -- frc/kinematics/SwerveModuleState.h +- wpi/math/kinematics/SwerveModuleState.hpp classes: - frc::SwerveDrivePoseEstimator3d: + wpi::math::SwerveDrivePoseEstimator3d: force_no_trampoline: true template_params: - size_t NumModules methods: SwerveDrivePoseEstimator3d: overloads: - SwerveDriveKinematics&, const Rotation3d&, const wpi::array&, const Pose3d&: - ? SwerveDriveKinematics&, const Rotation3d&, const wpi::array&, const Pose3d&, const wpi::array&, const wpi::array& + ? SwerveDriveKinematics&, const Rotation3d&, const wpi::util::array&, const Pose3d& + : + ? SwerveDriveKinematics&, const Rotation3d&, const wpi::util::array&, const Pose3d&, const wpi::util::array&, const wpi::util::array& : templates: SwerveDrive2PoseEstimator3d: - qualname: frc::SwerveDrivePoseEstimator3d + qualname: wpi::math::SwerveDrivePoseEstimator3d params: - 2 SwerveDrive3PoseEstimator3d: - qualname: frc::SwerveDrivePoseEstimator3d + qualname: wpi::math::SwerveDrivePoseEstimator3d params: - 3 SwerveDrive4PoseEstimator3d: - qualname: frc::SwerveDrivePoseEstimator3d + qualname: wpi::math::SwerveDrivePoseEstimator3d params: - 4 SwerveDrive6PoseEstimator3d: - qualname: frc::SwerveDrivePoseEstimator3d + qualname: wpi::math::SwerveDrivePoseEstimator3d params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml b/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml index d80626393..30e2debe2 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/Trajectory.yml @@ -10,9 +10,9 @@ functions: from_json: ignore: true classes: - frc::Trajectory: + wpi::math::Trajectory: force_type_casters: - - units::curvature_t + - wpi::units::curvature_t methods: Trajectory: overloads: @@ -26,7 +26,7 @@ classes: InitialPose: operator+: operator==: - frc::Trajectory::State: + wpi::math::Trajectory::State: force_no_default_constructor: true attributes: t: @@ -42,11 +42,11 @@ inline_code: | cls_State .def( py::init< - units::second_t, - units::meters_per_second_t, - units::meters_per_second_squared_t, + wpi::units::second_t, + wpi::units::meters_per_second_t, + wpi::units::meters_per_second_squared_t, Pose2d, - units::curvature_t + wpi::units::curvature_t >(), py::arg("t") = 0_s, py::arg("velocity") = 0_mps, @@ -54,13 +54,13 @@ inline_code: | py::arg("pose") = Pose2d(), py::arg("curvature") = 0.0 ) - .def_property_readonly("velocity_fps", [](frc::Trajectory::State * self) -> units::feet_per_second_t { + .def_property_readonly("velocity_fps", [](wpi::math::Trajectory::State * self) -> wpi::units::feet_per_second_t { return self->velocity; }) - .def_property_readonly("acceleration_fps", [](frc::Trajectory::State * self) -> units::feet_per_second_squared_t { + .def_property_readonly("acceleration_fps", [](wpi::math::Trajectory::State * self) -> wpi::units::feet_per_second_squared_t { return self->acceleration; }) - .def("__repr__", [](frc::Trajectory::State *self) { + .def("__repr__", [](wpi::math::Trajectory::State *self) { return "Trajectory.State(" "t=" + std::to_string(self->t()) + ", " "velocity=" + std::to_string(self->velocity()) + ", " @@ -68,4 +68,4 @@ inline_code: | "pose=" + rpy::toString(self->pose) + ", " "curvature=" + std::to_string(self->curvature()) + ")"; }) - .def_readwrite("curvature", &frc::Trajectory::State::curvature); + .def_readwrite("curvature", &wpi::math::Trajectory::State::curvature); diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml index ca1d09d82..6622f8bf2 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConfig.yml @@ -5,7 +5,7 @@ extra_includes: - PyTrajectoryConstraint.h classes: - frc::TrajectoryConfig: + wpi::math::TrajectoryConfig: methods: TrajectoryConfig: SetStartVelocity: @@ -30,14 +30,14 @@ classes: inline_code: |- cls_TrajectoryConfig - .def_static("fromFps", [](units::feet_per_second_t maxVelocity, units::feet_per_second_squared_t maxAcceleration) { + .def_static("fromFps", [](wpi::units::feet_per_second_t maxVelocity, wpi::units::feet_per_second_squared_t maxAcceleration) { return std::make_shared(maxVelocity, maxAcceleration); }, py::arg("maxVelocity"), py::arg("maxAcceleration")) // TODO: robotpy-build bug - .def("setKinematics", static_cast&)>( - &frc::TrajectoryConfig::SetKinematics<2>), + .def("setKinematics", static_cast&)>( + &wpi::math::TrajectoryConfig::SetKinematics<2>), py::arg("kinematics"), release_gil(), py::doc( "Adds a swerve drive kinematics constraint to ensure that\n" "no wheel velocity of a swerve drive goes above the max velocity.\n" @@ -45,8 +45,8 @@ inline_code: |- ":param kinematics: The swerve drive kinematics.") ) - .def("setKinematics", static_cast&)>( - &frc::TrajectoryConfig::SetKinematics<3>), + .def("setKinematics", static_cast&)>( + &wpi::math::TrajectoryConfig::SetKinematics<3>), py::arg("kinematics"), release_gil(), py::doc( "Adds a swerve drive kinematics constraint to ensure that\n" "no wheel velocity of a swerve drive goes above the max velocity.\n" @@ -54,8 +54,8 @@ inline_code: |- ":param kinematics: The swerve drive kinematics.") ) - .def("setKinematics", static_cast&)>( - &frc::TrajectoryConfig::SetKinematics<4>), + .def("setKinematics", static_cast&)>( + &wpi::math::TrajectoryConfig::SetKinematics<4>), py::arg("kinematics"), release_gil(), py::doc( "Adds a swerve drive kinematics constraint to ensure that\n" "no wheel velocity of a swerve drive goes above the max velocity.\n" @@ -63,8 +63,8 @@ inline_code: |- ":param kinematics: The swerve drive kinematics.") ) - .def("setKinematics", static_cast&)>( - &frc::TrajectoryConfig::SetKinematics<6>), + .def("setKinematics", static_cast&)>( + &wpi::math::TrajectoryConfig::SetKinematics<6>), py::arg("kinematics"), release_gil(), py::doc( "Adds a swerve drive kinematics constraint to ensure that\n" "no wheel velocity of a swerve drive goes above the max velocity.\n" diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml index 73af5eced..e905595f8 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryConstraint.yml @@ -2,26 +2,26 @@ defaults: subpackage: constraint classes: - frc::TrajectoryConstraint: + wpi::math::TrajectoryConstraint: force_type_casters: - - units::meters_per_second_squared + - wpi::units::meters_per_second_squared methods: TrajectoryConstraint: MaxVelocity: MinMaxAcceleration: - frc::TrajectoryConstraint::MinMax: + wpi::math::TrajectoryConstraint::MinMax: attributes: minAcceleration: maxAcceleration: inline_code: | .def(py::init([]( - units::meters_per_second_squared_t minAcceleration, - units::meters_per_second_squared_t maxAcceleration) { - return frc::TrajectoryConstraint::MinMax{minAcceleration, maxAcceleration}; + wpi::units::meters_per_second_squared_t minAcceleration, + wpi::units::meters_per_second_squared_t maxAcceleration) { + return wpi::math::TrajectoryConstraint::MinMax{minAcceleration, maxAcceleration}; }), py::arg("minAcceleration"), py::arg("maxAcceleration")) - .def("__len__", [](const frc::TrajectoryConstraint::MinMax& self) { return 2; }) - .def("__getitem__", [](const frc::TrajectoryConstraint::MinMax& self, int index) { + .def("__len__", [](const wpi::math::TrajectoryConstraint::MinMax& self) { return 2; }) + .def("__getitem__", [](const wpi::math::TrajectoryConstraint::MinMax& self, int index) { switch (index) { case 0: return self.minAcceleration; @@ -32,7 +32,7 @@ classes: } }) - .def("__repr__", [](const frc::TrajectoryConstraint::MinMax &self) { + .def("__repr__", [](const wpi::math::TrajectoryConstraint::MinMax &self) { return py::str("TrajectoryConstraint.MinMax(minAcceleration={}, maxAcceleration={})").format( self.minAcceleration, self.maxAcceleration); }) diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml index eb441e29f..585af5ea6 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryGenerator.yml @@ -2,14 +2,14 @@ defaults: subpackage: trajectory extra_includes: -- frc/spline/CubicHermiteSpline.h -- frc/spline/QuinticHermiteSpline.h +- wpi/math/spline/CubicHermiteSpline.hpp +- wpi/math/spline/QuinticHermiteSpline.hpp classes: - frc::TrajectoryGenerator: + wpi::math::TrajectoryGenerator: force_type_casters: - - units::unit_t - - units::curvature_t + - wpi::units::unit_t + - wpi::units::curvature_t methods: GenerateTrajectory: overloads: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml index 97f4b524c..b102e527b 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryParameterizer.yml @@ -2,9 +2,9 @@ defaults: subpackage: trajectory classes: - frc::TrajectoryParameterizer: + wpi::math::TrajectoryParameterizer: force_type_casters: - - units::unit_t - - units::curvature_t + - wpi::units::unit_t + - wpi::units::curvature_t methods: TimeParameterizeTrajectory: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml index 2122c9f1e..8eea00a1a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TrapezoidProfile.yml @@ -2,11 +2,11 @@ defaults: subpackage: trajectory classes: - frc::TrapezoidProfile: + wpi::math::TrapezoidProfile: force_type_casters: - - units::second_t - - units::radians_per_second - - units::radians_per_second_squared + - wpi::units::second_t + - wpi::units::radians_per_second + - wpi::units::radians_per_second_squared template_params: - Distance doc: | @@ -70,7 +70,7 @@ classes: "velocity=" + std::to_string(self.velocity()) + ")"; }); } - frc::TrapezoidProfile::Constraints: + wpi::math::TrapezoidProfile::Constraints: attributes: maxVelocity: maxAcceleration: @@ -85,7 +85,7 @@ classes: default: '0' maxAcceleration: default: '0' - frc::TrapezoidProfile::State: + wpi::math::TrapezoidProfile::State: force_no_default_constructor: true attributes: position: @@ -95,12 +95,12 @@ classes: cpp_code: py::self == State() templates: TrapezoidProfile: - qualname: frc::TrapezoidProfile + qualname: wpi::math::TrapezoidProfile params: - - units::dimensionless::scalar + - wpi::units::dimensionless::scalar # needed for HolonomicDriveController TrapezoidProfileRadians: - qualname: frc::TrapezoidProfile + qualname: wpi::math::TrapezoidProfile params: - - units::radian + - wpi::units::radian diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml index ad40d99f4..de8af84b2 100644 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml +++ b/subprojects/robotpy-wpimath/semiwrap/controls/TravelingSalesman.yml @@ -2,7 +2,7 @@ defaults: subpackage: path classes: - frc::TravelingSalesman: + wpi::math::TravelingSalesman: methods: TravelingSalesman: overloads: @@ -10,6 +10,6 @@ classes: std::function: Solve: overloads: - const wpi::array&, int: + const wpi::util::array&, int: ignore: true std::span, int: diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml b/subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml index fd98a0a50..205b1a963 100644 --- a/subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/filter/Debouncer.yml @@ -1,12 +1,12 @@ classes: - frc::Debouncer: + wpi::math::Debouncer: enums: DebounceType: methods: Debouncer: param_override: type: - default: frc::Debouncer::DebounceType::kRising + default: wpi::math::Debouncer::DebounceType::kRising Calculate: SetDebounceTime: GetDebounceTime: diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml b/subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml index 98b044af4..11bdb90ca 100644 --- a/subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/filter/LinearFilter.yml @@ -1,5 +1,5 @@ classes: - frc::LinearFilter: + wpi::math::LinearFilter: template_params: - T methods: @@ -24,6 +24,6 @@ classes: templates: LinearFilter: - qualname: frc::LinearFilter + qualname: wpi::math::LinearFilter params: - double diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml b/subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml index 28f21609f..13f3e1f2a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/filter/MedianFilter.yml @@ -1,5 +1,5 @@ classes: - frc::MedianFilter: + wpi::math::MedianFilter: template_params: - T methods: @@ -10,6 +10,6 @@ classes: templates: MedianFilter: - qualname: frc::MedianFilter + qualname: wpi::math::MedianFilter params: - double diff --git a/subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml b/subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml index f174c9076..401604fe7 100644 --- a/subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml +++ b/subprojects/robotpy-wpimath/semiwrap/filter/SlewRateLimiter.yml @@ -1,10 +1,10 @@ classes: - frc::SlewRateLimiter: + wpi::math::SlewRateLimiter: template_params: - Unit typealias: - - Unit_t = units::unit_t - - Rate = units::compound_unit> + - Unit_t = wpi::units::unit_t + - Rate = wpi::units::compound_unit> methods: SlewRateLimiter: overloads: @@ -16,6 +16,6 @@ classes: templates: SlewRateLimiter: - qualname: frc::SlewRateLimiter + qualname: wpi::math::SlewRateLimiter params: - - units::dimensionless::scalar + - wpi::units::dimensionless::scalar diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml index 98f03e5d7..5a5664254 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateAxis.yml @@ -1,5 +1,5 @@ classes: - frc::CoordinateAxis: + wpi::math::CoordinateAxis: methods: CoordinateAxis: N: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml index b633e9e34..5e251abd9 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/CoordinateSystem.yml @@ -1,5 +1,5 @@ classes: - frc::CoordinateSystem: + wpi::math::CoordinateSystem: methods: CoordinateSystem: NWU: diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml index 1d9bb7ed7..bf717940f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Ellipse2d.yml @@ -3,14 +3,14 @@ extra_includes: - wpystruct.h classes: - frc::Ellipse2d: + wpi::math::Ellipse2d: force_type_casters: - - units::foot_t - - units::meter_t + - wpi::units::foot_t + - wpi::units::meter_t methods: Ellipse2d: overloads: - const Pose2d&, units::meter_t, units::meter_t: + const Pose2d&, wpi::units::meter_t, wpi::units::meter_t: const Translation2d&, double: Center: Rotation: @@ -29,18 +29,18 @@ classes: inline_code: |- cls_Ellipse2d - .def_static("fromFeet", [](const Pose2d& center, units::foot_t xSemiAxis, units::foot_t ySemiAxis) { + .def_static("fromFeet", [](const Pose2d& center, wpi::units::foot_t xSemiAxis, wpi::units::foot_t ySemiAxis) { return std::make_unique(center, xSemiAxis, ySemiAxis); }, py::arg("center"), py::arg("xSemiAxis"), py::arg("ySemiAxis")) .def_property_readonly("xsemiaxis", &Ellipse2d::XSemiAxis) .def_property_readonly("ysemiaxis", &Ellipse2d::YSemiAxis) - .def_property_readonly("xsemiaxis_feet", [](Ellipse2d &self) -> units::foot_t { + .def_property_readonly("xsemiaxis_feet", [](Ellipse2d &self) -> wpi::units::foot_t { return self.XSemiAxis(); }) - .def_property_readonly("ysemiaxis_feet", [](Ellipse2d &self) -> units::foot_t { + .def_property_readonly("ysemiaxis_feet", [](Ellipse2d &self) -> wpi::units::foot_t { return self.YSemiAxis(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Ellipse2d); + SetupWPyStruct(cls_Ellipse2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml index 6d294640e..2cc1c8ecf 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Pose2d.yml @@ -8,17 +8,17 @@ functions: from_json: ignore: true classes: - frc::Pose2d: + wpi::math::Pose2d: force_type_casters: - - units::foot_t - - units::meter_t - - units::radian_t + - wpi::units::foot_t + - wpi::units::meter_t + - wpi::units::radian_t methods: Pose2d: overloads: '': Translation2d, Rotation2d: - units::meter_t, units::meter_t, Rotation2d: + wpi::units::meter_t, wpi::units::meter_t, Rotation2d: const Eigen::Matrix3d&: rename: fromMatrix keepalive: [] @@ -44,23 +44,23 @@ classes: inline_code: | cls_Pose2d - .def_static("fromFeet", [](units::foot_t x, units::foot_t y, Rotation2d r) { + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y, Rotation2d r) { return std::make_unique(x, y, r); }, py::arg("x"), py::arg("y"), py::arg("r")) - .def_static("fromFeet", [](units::foot_t x, units::foot_t y, units::radian_t angle) { + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y, wpi::units::radian_t angle) { return std::make_unique(x, y, Rotation2d(angle)); }, py::arg("x"), py::arg("y"), py::arg("angle")) - .def(py::init([](units::meter_t x, units::meter_t y, units::radian_t angle) { + .def(py::init([](wpi::units::meter_t x, wpi::units::meter_t y, wpi::units::radian_t angle) { return std::make_unique(x, y, angle); }), py::arg("x"), py::arg("y"), py::arg("angle")) .def_property_readonly("x", &Pose2d::X) .def_property_readonly("y", &Pose2d::Y) - .def_property_readonly("x_feet", [](Pose2d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](Pose2d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](Pose2d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](Pose2d * self) -> wpi::units::foot_t { return self->Y(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Pose2d); + SetupWPyStruct(cls_Pose2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml index d55a93e8e..93f6755ba 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Pose3d.yml @@ -8,13 +8,13 @@ functions: from_json: ignore: true classes: - frc::Pose3d: + wpi::math::Pose3d: methods: Pose3d: overloads: '': Translation3d, Rotation3d: - units::meter_t, units::meter_t, units::meter_t, Rotation3d: + wpi::units::meter_t, wpi::units::meter_t, wpi::units::meter_t, Rotation3d: const Pose2d&: keepalive: [] const Eigen::Matrix4d&: @@ -44,21 +44,21 @@ classes: inline_code: | cls_Pose3d - .def_static("fromFeet", [](units::foot_t x, units::foot_t y, units::foot_t z, Rotation3d r) { + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y, wpi::units::foot_t z, Rotation3d r) { return std::make_unique(x, y, z, r); }, py::arg("x"), py::arg("y"), py::arg("z"), py::arg("r")) .def_property_readonly("x", &Pose3d::X) .def_property_readonly("y", &Pose3d::Y) .def_property_readonly("z", &Pose3d::Z) - .def_property_readonly("x_feet", [](const Pose3d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](const Pose3d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](const Pose3d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](const Pose3d * self) -> wpi::units::foot_t { return self->Y(); }) - .def_property_readonly("z_feet", [](const Pose3d * self) -> units::foot_t { + .def_property_readonly("z_feet", [](const Pose3d * self) -> wpi::units::foot_t { return self->Z(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Pose3d); + SetupWPyStruct(cls_Pose3d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml index 74886f4d7..717305bc0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Quaternion.yml @@ -8,7 +8,7 @@ functions: from_json: ignore: true classes: - frc::Quaternion: + wpi::math::Quaternion: methods: Quaternion: overloads: @@ -47,4 +47,4 @@ inline_code: | cls_Quaternion .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Quaternion); + SetupWPyStruct(cls_Quaternion); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml index bb8c895f7..f02d69100 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Rectangle2d.yml @@ -3,14 +3,14 @@ extra_includes: - wpystruct.h classes: - frc::Rectangle2d: + wpi::math::Rectangle2d: force_type_casters: - - units::foot_t - - units::meter_t + - wpi::units::foot_t + - wpi::units::meter_t methods: Rectangle2d: overloads: - const Pose2d&, units::meter_t, units::meter_t: + const Pose2d&, wpi::units::meter_t, wpi::units::meter_t: const Translation2d&, const Translation2d&: Center: Rotation: @@ -28,18 +28,18 @@ classes: inline_code: |- cls_Rectangle2d - .def_static("fromFeet", [](const Pose2d& center, units::foot_t xWidth, units::foot_t yWidth) { + .def_static("fromFeet", [](const Pose2d& center, wpi::units::foot_t xWidth, wpi::units::foot_t yWidth) { return std::make_unique(center, xWidth, yWidth); }, py::arg("center"), py::arg("xWidth"), py::arg("yWidth")) .def_property_readonly("xwidth", &Rectangle2d::XWidth) .def_property_readonly("ywidth", &Rectangle2d::YWidth) - .def_property_readonly("xwidth_feet", [](Rectangle2d &self) -> units::foot_t { + .def_property_readonly("xwidth_feet", [](Rectangle2d &self) -> wpi::units::foot_t { return self.XWidth(); }) - .def_property_readonly("ywidth_feet", [](Rectangle2d &self) -> units::foot_t { + .def_property_readonly("ywidth_feet", [](Rectangle2d &self) -> wpi::units::foot_t { return self.YWidth(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Rectangle2d); + SetupWPyStruct(cls_Rectangle2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml index 162c1a77c..51c9489d5 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation2d.yml @@ -8,7 +8,7 @@ functions: from_json: ignore: true classes: - frc::Rotation2d: + wpi::math::Rotation2d: methods: Rotation2d: overloads: @@ -19,9 +19,9 @@ classes: :param value: The value of the angle in radians. param_override: value: - x_type: units::radian_t + x_type: wpi::units::radian_t template_impls: - - [units::radian_t] + - [wpi::units::radian_t] double, double: const Eigen::Matrix2d&: rename: fromMatrix @@ -44,12 +44,12 @@ classes: inline_code: | cls_Rotation2d - .def_static("fromDegrees", [](units::degree_t value) { + .def_static("fromDegrees", [](wpi::units::degree_t value) { return std::make_unique(value); }, py::arg("value")) - .def_static("fromRotations", [](units::turn_t value) { + .def_static("fromRotations", [](wpi::units::turn_t value) { return std::make_unique(value); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Rotation2d); + SetupWPyStruct(cls_Rotation2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml index 881a99571..8e2f469b1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Rotation3d.yml @@ -8,15 +8,15 @@ functions: from_json: ignore: true classes: - frc::Rotation3d: + wpi::math::Rotation3d: methods: Rotation3d: overloads: '': const Quaternion&: keepalive: [] - units::radian_t, units::radian_t, units::radian_t: - const Eigen::Vector3d&, units::radian_t: + wpi::units::radian_t, wpi::units::radian_t, wpi::units::radian_t: + const Eigen::Vector3d&, wpi::units::radian_t: keepalive: [] const Eigen::Vector3d&: keepalive: [] @@ -47,25 +47,25 @@ classes: inline_code: | cls_Rotation3d - .def_static("fromDegrees", [](units::degree_t roll, units::degree_t pitch, units::degree_t yaw) { + .def_static("fromDegrees", [](wpi::units::degree_t roll, wpi::units::degree_t pitch, wpi::units::degree_t yaw) { return std::make_unique(roll, pitch, yaw); }, py::arg("roll"), py::arg("pitch"), py::arg("yaw")) .def_property_readonly("x", &Rotation3d::X) .def_property_readonly("y", &Rotation3d::Y) .def_property_readonly("z", &Rotation3d::Z) .def_property_readonly("angle", &Rotation3d::Angle) - .def_property_readonly("x_degrees", [](const Rotation3d * self) -> units::degree_t { + .def_property_readonly("x_degrees", [](const Rotation3d * self) -> wpi::units::degree_t { return self->X(); }) - .def_property_readonly("y_degrees", [](const Rotation3d * self) -> units::degree_t { + .def_property_readonly("y_degrees", [](const Rotation3d * self) -> wpi::units::degree_t { return self->Y(); }) - .def_property_readonly("z_degrees", [](const Rotation3d * self) -> units::degree_t { + .def_property_readonly("z_degrees", [](const Rotation3d * self) -> wpi::units::degree_t { return self->Z(); }) - .def_property_readonly("angle_degrees", [](const Rotation3d * self) -> units::degree_t { + .def_property_readonly("angle_degrees", [](const Rotation3d * self) -> wpi::units::degree_t { return self->Angle(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Rotation3d); + SetupWPyStruct(cls_Rotation3d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml index e32caec75..ce14e4833 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Transform2d.yml @@ -1,21 +1,21 @@ extra_includes: -- frc/geometry/Pose2d.h +- wpi/math/geometry/Pose2d.hpp - rpy/geometryToString.h - wpystruct.h classes: - frc::Transform2d: + wpi::math::Transform2d: force_type_casters: - - units::foot_t - - units::meter_t - - units::radian_t + - wpi::units::foot_t + - wpi::units::meter_t + - wpi::units::radian_t methods: Transform2d: overloads: const Pose2d&, const Pose2d&: keepalive: [] Translation2d, Rotation2d: - units::meter_t, units::meter_t, Rotation2d: + wpi::units::meter_t, wpi::units::meter_t, Rotation2d: const Eigen::Matrix3d&: rename: fromMatrix keepalive: [] @@ -34,21 +34,21 @@ classes: inline_code: | cls_Transform2d - .def_static("fromFeet", [](units::foot_t x, units::foot_t y, units::radian_t angle){ + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y, wpi::units::radian_t angle){ return std::make_unique(Translation2d(x, y), Rotation2d(angle)); }, py::arg("x"), py::arg("y"), py::arg("angle")) - .def(py::init([](units::meter_t x, units::meter_t y, units::radian_t angle) { + .def(py::init([](wpi::units::meter_t x, wpi::units::meter_t y, wpi::units::radian_t angle) { return std::make_unique(Translation2d(x, y), Rotation2d(angle)); }), py::arg("x"), py::arg("y"), py::arg("angle")) .def_property_readonly("x", &Transform2d::X) .def_property_readonly("y", &Transform2d::Y) - .def_property_readonly("x_feet", [](Transform2d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](Transform2d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](Transform2d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](Transform2d * self) -> wpi::units::foot_t { return self->Y(); }) .def("__repr__", py::overload_cast(&rpy::toString)); ; - SetupWPyStruct(cls_Transform2d); + SetupWPyStruct(cls_Transform2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml index 9a9bb2773..d45d6d78d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Transform3d.yml @@ -3,19 +3,19 @@ extra_includes: - wpystruct.h classes: - frc::Transform3d: + wpi::math::Transform3d: methods: Transform3d: overloads: const Pose3d&, const Pose3d&: keepalive: [] Translation3d, Rotation3d: - units::meter_t, units::meter_t, units::meter_t, Rotation3d: + wpi::units::meter_t, wpi::units::meter_t, wpi::units::meter_t, Rotation3d: const Eigen::Matrix4d&: rename: fromMatrix keepalive: [] '': - const frc::Transform2d&: + const wpi::math::Transform2d&: keepalive: [] Translation: X: @@ -36,15 +36,15 @@ inline_code: | .def_property_readonly("x", &Transform3d::X) .def_property_readonly("y", &Transform3d::Y) .def_property_readonly("z", &Transform3d::Z) - .def_property_readonly("x_feet", [](const Transform3d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](const Transform3d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](const Transform3d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](const Transform3d * self) -> wpi::units::foot_t { return self->Y(); }) - .def_property_readonly("z_feet", [](const Transform3d * self) -> units::foot_t { + .def_property_readonly("z_feet", [](const Transform3d * self) -> wpi::units::foot_t { return self->Z(); }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Transform3d); + SetupWPyStruct(cls_Transform3d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml index ed8d689dd..a00387586 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Translation2d.yml @@ -9,13 +9,13 @@ functions: from_json: ignore: true classes: - frc::Translation2d: + wpi::math::Translation2d: methods: Translation2d: overloads: '': - units::meter_t, units::meter_t: - units::meter_t, const Rotation2d&: + wpi::units::meter_t, wpi::units::meter_t: + wpi::units::meter_t, const Rotation2d&: const Eigen::Vector2d&: Distance: X: @@ -45,24 +45,24 @@ classes: inline_code: | cls_Translation2d - .def_static("fromFeet", [](units::foot_t x, units::foot_t y){ + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y){ return std::make_unique(x, y); }, py::arg("x"), py::arg("y")) - .def_static("fromFeet", [](units::foot_t distance, const Rotation2d &angle) { + .def_static("fromFeet", [](wpi::units::foot_t distance, const Rotation2d &angle) { return std::make_unique(distance, angle); }, py::arg("distance"), py::arg("angle")) .def_property_readonly("x", &Translation2d::X) .def_property_readonly("y", &Translation2d::Y) - .def_property_readonly("x_feet", [](Translation2d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](Translation2d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](Translation2d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](Translation2d * self) -> wpi::units::foot_t { return self->Y(); }) - .def("distanceFeet", [](Translation2d * self, const Translation2d &other) -> units::foot_t { + .def("distanceFeet", [](Translation2d * self, const Translation2d &other) -> wpi::units::foot_t { return self->Distance(other); }) - .def("normFeet", [](Translation2d * self) -> units::foot_t { + .def("normFeet", [](Translation2d * self) -> wpi::units::foot_t { return self->Norm(); }) .def("__abs__", &Translation2d::Norm) @@ -79,4 +79,4 @@ inline_code: | }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Translation2d); + SetupWPyStruct(cls_Translation2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml index e2cfdf53e..6a1d8379e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Translation3d.yml @@ -9,13 +9,13 @@ functions: from_json: ignore: true classes: - frc::Translation3d: + wpi::math::Translation3d: methods: Translation3d: overloads: '': - units::meter_t, units::meter_t, units::meter_t: - units::meter_t, const Rotation3d&: + wpi::units::meter_t, wpi::units::meter_t, wpi::units::meter_t: + wpi::units::meter_t, const Rotation3d&: const Eigen::Vector3d&: const Translation2d&: Distance: @@ -47,25 +47,25 @@ classes: Cross: inline_code: | cls_Translation3d - .def_static("fromFeet", [](units::foot_t x, units::foot_t y, units::foot_t z){ + .def_static("fromFeet", [](wpi::units::foot_t x, wpi::units::foot_t y, wpi::units::foot_t z){ return std::make_unique(x, y, z); }, py::arg("x"), py::arg("y"), py::arg("z")) .def_property_readonly("x", &Translation3d::X) .def_property_readonly("y", &Translation3d::Y) .def_property_readonly("z", &Translation3d::Z) - .def_property_readonly("x_feet", [](const Translation3d * self) -> units::foot_t { + .def_property_readonly("x_feet", [](const Translation3d * self) -> wpi::units::foot_t { return self->X(); }) - .def_property_readonly("y_feet", [](const Translation3d * self) -> units::foot_t { + .def_property_readonly("y_feet", [](const Translation3d * self) -> wpi::units::foot_t { return self->Y(); }) - .def_property_readonly("z_feet", [](const Translation3d * self) -> units::foot_t { + .def_property_readonly("z_feet", [](const Translation3d * self) -> wpi::units::foot_t { return self->Z(); }) - .def("distanceFeet", [](Translation3d * self, const Translation3d &other) -> units::foot_t { + .def("distanceFeet", [](Translation3d * self, const Translation3d &other) -> wpi::units::foot_t { return self->Distance(other); }) - .def("normFeet", [](const Translation3d * self) -> units::foot_t { + .def("normFeet", [](const Translation3d * self) -> wpi::units::foot_t { return self->Norm(); }) .def("__abs__", &Translation3d::Norm) @@ -84,4 +84,4 @@ inline_code: | }) .def("__repr__", py::overload_cast(&rpy::toString)); - SetupWPyStruct(cls_Translation3d); + SetupWPyStruct(cls_Translation3d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml index 2963a0114..149815bbd 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Twist2d.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::Twist2d: + wpi::math::Twist2d: force_no_default_constructor: true attributes: dx: @@ -16,33 +16,33 @@ classes: inline_code: | cls_Twist2d .def( - py::init(), + py::init(), py::arg("dx") = 0, py::arg("dy") = 0, py::arg("dtheta") = 0 ) - .def_static("fromFeet", [](units::foot_t dx, units::foot_t dy, units::radian_t dtheta){ + .def_static("fromFeet", [](wpi::units::foot_t dx, wpi::units::foot_t dy, wpi::units::radian_t dtheta){ return Twist2d{dx, dy, dtheta}; }, py::arg("dx") = 0, py::arg("dy") = 0, py::arg("dtheta") = 0) .def_property("dx_feet", - [](Twist2d * self) -> units::foot_t { + [](Twist2d * self) -> wpi::units::foot_t { return self->dx; }, - [](Twist2d * self, units::foot_t dx) { + [](Twist2d * self, wpi::units::foot_t dx) { self->dx = dx; } ) .def_property("dy_feet", - [](Twist2d * self) -> units::foot_t { + [](Twist2d * self) -> wpi::units::foot_t { return self->dy; }, - [](Twist2d * self, units::foot_t dy) { + [](Twist2d * self, wpi::units::foot_t dy) { self->dy = dy; } ) .def_property("dtheta_degrees", - [](Twist2d * self) -> units::degree_t { + [](Twist2d * self) -> wpi::units::degree_t { return self->dtheta; }, - [](Twist2d * self, units::degree_t dtheta) { + [](Twist2d * self, wpi::units::degree_t dtheta) { self->dtheta = dtheta; } ) @@ -53,4 +53,4 @@ inline_code: | }) ; - SetupWPyStruct(cls_Twist2d); + SetupWPyStruct(cls_Twist2d); diff --git a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml b/subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml index 8d8cd6af9..d2fece48e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/geometry/Twist3d.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::Twist3d: + wpi::math::Twist3d: force_no_default_constructor: true attributes: dx: @@ -19,62 +19,62 @@ classes: inline_code: |- cls_Twist3d .def( - py::init(), + py::init(), py::arg("dx") = 0, py::arg("dy") = 0, py::arg("dz") = 0, py::arg("rx") = 0, py::arg("ry") = 0, py::arg("rz") = 0) .def_static("fromFeet", []( - units::foot_t dx, units::foot_t dy, units::foot_t dz, - units::radian_t rx, units::radian_t ry, units::radian_t rz){ + wpi::units::foot_t dx, wpi::units::foot_t dy, wpi::units::foot_t dz, + wpi::units::radian_t rx, wpi::units::radian_t ry, wpi::units::radian_t rz){ return Twist3d{dx, dy, dz, rx, ry, rz}; }, py::arg("dx") = 0, py::arg("dy") = 0, py::arg("dz") = 0, py::arg("rx") = 0, py::arg("ry") = 0, py::arg("rz") = 0) .def_property("dx_feet", - [](Twist3d * self) -> units::foot_t { + [](Twist3d * self) -> wpi::units::foot_t { return self->dx; }, - [](Twist3d * self, units::foot_t dx) { + [](Twist3d * self, wpi::units::foot_t dx) { self->dx = dx; } ) .def_property("dy_feet", - [](Twist3d * self) -> units::foot_t { + [](Twist3d * self) -> wpi::units::foot_t { return self->dy; }, - [](Twist3d * self, units::foot_t dy) { + [](Twist3d * self, wpi::units::foot_t dy) { self->dy = dy; } ) .def_property("dz_feet", - [](Twist3d * self) -> units::foot_t { + [](Twist3d * self) -> wpi::units::foot_t { return self->dz; }, - [](Twist3d * self, units::foot_t dz) { + [](Twist3d * self, wpi::units::foot_t dz) { self->dz = dz; } ) .def_property("rx_degrees", - [](Twist3d * self) -> units::degree_t { + [](Twist3d * self) -> wpi::units::degree_t { return self->rx; }, - [](Twist3d * self, units::degree_t rx) { + [](Twist3d * self, wpi::units::degree_t rx) { self->rx = rx; } ) .def_property("ry_degrees", - [](Twist3d * self) -> units::degree_t { + [](Twist3d * self) -> wpi::units::degree_t { return self->ry; }, - [](Twist3d * self, units::degree_t ry) { + [](Twist3d * self, wpi::units::degree_t ry) { self->ry = ry; } ) .def_property("rz_degrees", - [](Twist3d * self) -> units::degree_t { + [](Twist3d * self) -> wpi::units::degree_t { return self->rz; }, - [](Twist3d * self, units::degree_t rz) { + [](Twist3d * self, wpi::units::degree_t rz) { self->rz = rz; } ) @@ -88,4 +88,4 @@ inline_code: |- }) ; - SetupWPyStruct(cls_Twist3d); + SetupWPyStruct(cls_Twist3d); diff --git a/subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml b/subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml index 2269cb018..f02c04c0d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/interpolation/TimeInterpolatableBuffer.yml @@ -1,15 +1,15 @@ extra_includes: -- "frc/geometry/Pose3d.h" +- "wpi/math/geometry/Pose3d.hpp" classes: - frc::TimeInterpolatableBuffer: + wpi::math::TimeInterpolatableBuffer: template_params: - T methods: TimeInterpolatableBuffer: overloads: - units::second_t, std::function: - units::second_t: + wpi::units::second_t, std::function: + wpi::units::second_t: AddSample: Clear: Sample: @@ -21,30 +21,30 @@ classes: templates: TimeInterpolatablePose2dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Pose2d + - wpi::math::Pose2d TimeInterpolatablePose3dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Pose3d + - wpi::math::Pose3d TimeInterpolatableRotation2dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Rotation2d + - wpi::math::Rotation2d TimeInterpolatableRotation3dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Rotation3d + - wpi::math::Rotation3d TimeInterpolatableTranslation2dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Translation2d + - wpi::math::Translation2d TimeInterpolatableTranslation3dBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - - frc::Translation3d + - wpi::math::Translation3d TimeInterpolatableFloatBuffer: - qualname: frc::TimeInterpolatableBuffer + qualname: wpi::math::TimeInterpolatableBuffer params: - double diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml index d67328996..beef1c644 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::ChassisSpeeds: + wpi::math::ChassisSpeeds: force_no_default_constructor: true attributes: vx: @@ -12,8 +12,8 @@ classes: ToTwist2d: Discretize: overloads: - units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, units::second_t: - const ChassisSpeeds&, units::second_t: + wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, wpi::units::radians_per_second_t, wpi::units::second_t: + const ChassisSpeeds&, wpi::units::second_t: operator+: operator-: overloads: @@ -29,35 +29,35 @@ inline_code: | cls_ChassisSpeeds .def( py::init< - units::meters_per_second_t, units::meters_per_second_t, - units::radians_per_second_t + wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, + wpi::units::radians_per_second_t >(), py::arg("vx") = 0, py::arg("vy") = 0, py::arg("omega") = 0 ) - .def_static("fromFeet", [](units::feet_per_second_t vx, units::feet_per_second_t vy, units::radians_per_second_t omega){ + .def_static("fromFeet", [](wpi::units::feet_per_second_t vx, wpi::units::feet_per_second_t vy, wpi::units::radians_per_second_t omega){ return ChassisSpeeds{vx, vy, omega}; }, py::arg("vx") = 0, py::arg("vy") = 0, py::arg("omega") = 0) .def_property("vx_fps", - [](ChassisSpeeds * self) -> units::feet_per_second_t { + [](ChassisSpeeds * self) -> wpi::units::feet_per_second_t { return self->vx; }, - [](ChassisSpeeds * self, units::feet_per_second_t vx) { + [](ChassisSpeeds * self, wpi::units::feet_per_second_t vx) { self->vx = vx; } ) .def_property("vy_fps", - [](ChassisSpeeds * self) -> units::feet_per_second_t { + [](ChassisSpeeds * self) -> wpi::units::feet_per_second_t { return self->vy; }, - [](ChassisSpeeds * self, units::feet_per_second_t vy) { + [](ChassisSpeeds * self, wpi::units::feet_per_second_t vy) { self->vy = vy; } ) .def_property("omega_dps", - [](ChassisSpeeds * self) -> units::degrees_per_second_t { + [](ChassisSpeeds * self) -> wpi::units::degrees_per_second_t { return self->omega; }, - [](ChassisSpeeds * self, units::degrees_per_second_t omega) { + [](ChassisSpeeds * self, wpi::units::degrees_per_second_t omega) { self->omega = omega; } ) @@ -81,4 +81,4 @@ inline_code: | }) ; - SetupWPyStruct(cls_ChassisSpeeds); + SetupWPyStruct(cls_ChassisSpeeds); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml index 24b8c460d..04b2ee336 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveKinematics.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::DifferentialDriveKinematics: + wpi::math::DifferentialDriveKinematics: attributes: trackwidth: methods: @@ -11,9 +11,9 @@ classes: ToWheelSpeeds: ToTwist2d: overloads: - const units::meter_t, const units::meter_t [const]: + const wpi::units::meter_t, const wpi::units::meter_t [const]: const DifferentialDriveWheelPositions&, const DifferentialDriveWheelPositions& [const]: Interpolate: inline_code: | - SetupWPyStruct(cls_DifferentialDriveKinematics); + SetupWPyStruct(cls_DifferentialDriveKinematics); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml index 687e53a0a..55f164938 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry.yml @@ -1,5 +1,5 @@ classes: - frc::DifferentialDriveOdometry: + wpi::math::DifferentialDriveOdometry: force_no_trampoline: true methods: DifferentialDriveOdometry: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml index 9048eb7f1..485f23f7c 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveOdometry3d.yml @@ -1,5 +1,5 @@ classes: - frc::DifferentialDriveOdometry3d: + wpi::math::DifferentialDriveOdometry3d: force_no_trampoline: true methods: DifferentialDriveOdometry3d: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml index a50e54f79..55c6f3867 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelPositions.yml @@ -1,5 +1,5 @@ classes: - frc::DifferentialDriveWheelPositions: + wpi::math::DifferentialDriveWheelPositions: attributes: left: right: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml index 7b4040c47..cfb96dd9b 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/DifferentialDriveWheelSpeeds.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::DifferentialDriveWheelSpeeds: + wpi::math::DifferentialDriveWheelSpeeds: force_no_default_constructor: true attributes: left: @@ -21,25 +21,25 @@ classes: inline_code: | cls_DifferentialDriveWheelSpeeds .def( - py::init(), + py::init(), py::arg("left") = 0, py::arg("right") = 0 ) - .def_static("fromFeet", [](units::feet_per_second_t left, units::feet_per_second_t right){ + .def_static("fromFeet", [](wpi::units::feet_per_second_t left, wpi::units::feet_per_second_t right){ return DifferentialDriveWheelSpeeds{left, right}; }, py::arg("left"), py::arg("right")) .def_property("left_fps", - [](DifferentialDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](DifferentialDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->left; }, - [](DifferentialDriveWheelSpeeds * self, units::feet_per_second_t left) { + [](DifferentialDriveWheelSpeeds * self, wpi::units::feet_per_second_t left) { self->left = left; } ) .def_property("right_fps", - [](DifferentialDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](DifferentialDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->right; }, - [](DifferentialDriveWheelSpeeds * self, units::feet_per_second_t right) { + [](DifferentialDriveWheelSpeeds * self, wpi::units::feet_per_second_t right) { self->right = right; } ) @@ -49,5 +49,5 @@ inline_code: | }) ; - SetupWPyStruct(cls_DifferentialDriveWheelSpeeds); + SetupWPyStruct(cls_DifferentialDriveWheelSpeeds); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml index 286c65756..57b87c12e 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/Kinematics.yml @@ -1,15 +1,15 @@ extra_includes: -- frc/kinematics/DifferentialDriveWheelPositions.h -- frc/kinematics/DifferentialDriveWheelSpeeds.h -- frc/kinematics/MecanumDriveWheelPositions.h -- frc/kinematics/MecanumDriveWheelSpeeds.h -- frc/kinematics/SwerveDriveKinematics.h +- wpi/math/kinematics/DifferentialDriveWheelPositions.hpp +- wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp +- wpi/math/kinematics/MecanumDriveWheelPositions.hpp +- wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp +- wpi/math/kinematics/SwerveDriveKinematics.hpp classes: - frc::Kinematics: + wpi::math::Kinematics: force_type_casters: - - wpi::array + - wpi::util::array template_params: - WheelSpeeds - WheelPositions @@ -22,32 +22,32 @@ classes: templates: DifferentialDriveKinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - frc::DifferentialDriveWheelSpeeds - - frc::DifferentialDriveWheelPositions + - wpi::math::DifferentialDriveWheelSpeeds + - wpi::math::DifferentialDriveWheelPositions MecanumDriveKinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - frc::MecanumDriveWheelSpeeds - - frc::MecanumDriveWheelPositions + - wpi::math::MecanumDriveWheelSpeeds + - wpi::math::MecanumDriveWheelPositions SwerveDrive2KinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive3KinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive4KinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive6KinematicsBase: - qualname: frc::Kinematics + qualname: wpi::math::Kinematics params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml index 17fcfe253..b97bf4ee4 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveKinematics.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::MecanumDriveKinematics: + wpi::math::MecanumDriveKinematics: methods: MecanumDriveKinematics: ToWheelSpeeds: @@ -47,4 +47,4 @@ classes: Interpolate: inline_code: | - SetupWPyStruct(cls_MecanumDriveKinematics); + SetupWPyStruct(cls_MecanumDriveKinematics); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml index 929e3e257..6f56a97a1 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry.yml @@ -1,5 +1,5 @@ classes: - frc::MecanumDriveOdometry: + wpi::math::MecanumDriveOdometry: force_no_trampoline: true methods: MecanumDriveOdometry: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml index a53f0d75e..9ac611404 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveOdometry3d.yml @@ -1,5 +1,5 @@ classes: - frc::MecanumDriveOdometry3d: + wpi::math::MecanumDriveOdometry3d: force_no_trampoline: true methods: MecanumDriveOdometry3d: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml index 82be5f55e..5eafa4fc0 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelPositions.yml @@ -1,5 +1,5 @@ classes: - frc::MecanumDriveWheelPositions: + wpi::math::MecanumDriveWheelPositions: attributes: frontLeft: frontRight: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml index fff03df0d..1e90ba340 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/MecanumDriveWheelSpeeds.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::MecanumDriveWheelSpeeds: + wpi::math::MecanumDriveWheelSpeeds: force_no_default_constructor: true attributes: frontLeft: @@ -23,50 +23,50 @@ inline_code: | cls_MecanumDriveWheelSpeeds .def( py::init< - units::meters_per_second_t, units::meters_per_second_t, - units::meters_per_second_t, units::meters_per_second_t + wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, + wpi::units::meters_per_second_t, wpi::units::meters_per_second_t >(), py::arg("frontLeft") = 0, py::arg("frontRight") = 0, py::arg("rearLeft") = 0, py::arg("rearRight") = 0 ) .def_static("fromFeet", []( - units::feet_per_second_t frontLeft, - units::feet_per_second_t frontRight, - units::feet_per_second_t rearLeft, - units::feet_per_second_t rearRight + wpi::units::feet_per_second_t frontLeft, + wpi::units::feet_per_second_t frontRight, + wpi::units::feet_per_second_t rearLeft, + wpi::units::feet_per_second_t rearRight ){ return MecanumDriveWheelSpeeds{frontLeft, frontRight, rearLeft, rearRight}; }, py::arg("frontLeft"), py::arg("frontRight"), py::arg("rearLeft"), py::arg("rearRight")) .def_property("frontLeft_fps", - [](MecanumDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](MecanumDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->frontLeft; }, - [](MecanumDriveWheelSpeeds * self, units::feet_per_second_t fps) { + [](MecanumDriveWheelSpeeds * self, wpi::units::feet_per_second_t fps) { self->frontLeft = fps; } ) .def_property("frontRight_fps", - [](MecanumDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](MecanumDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->frontRight; }, - [](MecanumDriveWheelSpeeds * self, units::feet_per_second_t fps) { + [](MecanumDriveWheelSpeeds * self, wpi::units::feet_per_second_t fps) { self->frontRight = fps; } ) .def_property("rearLeft_fps", - [](MecanumDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](MecanumDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->rearLeft; }, - [](MecanumDriveWheelSpeeds * self, units::feet_per_second_t fps) { + [](MecanumDriveWheelSpeeds * self, wpi::units::feet_per_second_t fps) { self->rearLeft = fps; } ) .def_property("rearRight_fps", - [](MecanumDriveWheelSpeeds * self) -> units::feet_per_second_t { + [](MecanumDriveWheelSpeeds * self) -> wpi::units::feet_per_second_t { return self->rearRight; }, - [](MecanumDriveWheelSpeeds * self, units::feet_per_second_t fps) { + [](MecanumDriveWheelSpeeds * self, wpi::units::feet_per_second_t fps) { self->rearRight = fps; } ) @@ -78,4 +78,4 @@ inline_code: | }) ; - SetupWPyStruct(cls_MecanumDriveWheelSpeeds); + SetupWPyStruct(cls_MecanumDriveWheelSpeeds); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml index d11548e0c..d144ac62a 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry.yml @@ -1,12 +1,12 @@ extra_includes: -- frc/kinematics/DifferentialDriveWheelPositions.h -- frc/kinematics/DifferentialDriveWheelSpeeds.h -- frc/kinematics/MecanumDriveWheelPositions.h -- frc/kinematics/MecanumDriveWheelSpeeds.h -- frc/kinematics/SwerveDriveKinematics.h +- wpi/math/kinematics/DifferentialDriveWheelPositions.hpp +- wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp +- wpi/math/kinematics/MecanumDriveWheelPositions.hpp +- wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp +- wpi/math/kinematics/SwerveDriveKinematics.hpp classes: - frc::Odometry: + wpi::math::Odometry: template_params: - WheelSpeeds - WheelPositions @@ -21,32 +21,32 @@ classes: templates: DifferentialDriveOdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - frc::DifferentialDriveWheelSpeeds - - frc::DifferentialDriveWheelPositions + - wpi::math::DifferentialDriveWheelSpeeds + - wpi::math::DifferentialDriveWheelPositions MecanumDriveOdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - frc::MecanumDriveWheelSpeeds - - frc::MecanumDriveWheelPositions + - wpi::math::MecanumDriveWheelSpeeds + - wpi::math::MecanumDriveWheelPositions SwerveDrive2OdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive3OdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive4OdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive6OdometryBase: - qualname: frc::Odometry + qualname: wpi::math::Odometry params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml index 8c5d9eefa..6b1657f5f 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/Odometry3d.yml @@ -1,12 +1,12 @@ extra_includes: -- frc/kinematics/DifferentialDriveWheelPositions.h -- frc/kinematics/DifferentialDriveWheelSpeeds.h -- frc/kinematics/MecanumDriveWheelPositions.h -- frc/kinematics/MecanumDriveWheelSpeeds.h -- frc/kinematics/SwerveDriveKinematics.h +- wpi/math/kinematics/DifferentialDriveWheelPositions.hpp +- wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp +- wpi/math/kinematics/MecanumDriveWheelPositions.hpp +- wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp +- wpi/math/kinematics/SwerveDriveKinematics.hpp classes: - frc::Odometry3d: + wpi::math::Odometry3d: template_params: - WheelSpeeds - WheelPositions @@ -22,32 +22,32 @@ classes: templates: DifferentialDriveOdometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - frc::DifferentialDriveWheelSpeeds - - frc::DifferentialDriveWheelPositions + - wpi::math::DifferentialDriveWheelSpeeds + - wpi::math::DifferentialDriveWheelPositions MecanumDriveOdometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - frc::MecanumDriveWheelSpeeds - - frc::MecanumDriveWheelPositions + - wpi::math::MecanumDriveWheelSpeeds + - wpi::math::MecanumDriveWheelPositions SwerveDrive2Odometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive3Odometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive4Odometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array SwerveDrive6Odometry3dBase: - qualname: frc::Odometry3d + qualname: wpi::math::Odometry3d params: - - wpi::array - - wpi::array + - wpi::util::array + - wpi::util::array diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml index aa14d190f..141fd9666 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveKinematics.yml @@ -1,7 +1,7 @@ classes: - frc::SwerveDriveKinematics: + wpi::math::SwerveDriveKinematics: force_type_casters: - - wpi::array + - wpi::util::array template_params: - size_t NumModules methods: @@ -9,14 +9,14 @@ classes: overloads: ModuleTranslations&&...: ignore: true - const wpi::array&: + const wpi::util::array&: ignore: true ResetHeadings: overloads: ModuleHeadings&&...: ignore: true - wpi::array: + wpi::util::array: ToSwerveModuleStates: doc: | @@ -48,29 +48,30 @@ classes: overloads: ModuleStates&&... [const]: ignore: true - const wpi::array& [const]: + const wpi::util::array& [const]: ToTwist2d: overloads: ModuleDeltas&&... [const]: ignore: true - wpi::array [const]: - const wpi::array&, const wpi::array& [const]: + wpi::util::array [const]: + ? const wpi::util::array&, const wpi::util::array& [const] + : DesaturateWheelSpeeds: overloads: - wpi::array*, units::meters_per_second_t: + wpi::util::array*, wpi::units::meters_per_second_t: cpp_code: | - [](wpi::array moduleStates, units::meters_per_second_t attainableMaxSpeed) { - frc::SwerveDriveKinematics::DesaturateWheelSpeeds(&moduleStates, attainableMaxSpeed); + [](wpi::util::array moduleStates, wpi::units::meters_per_second_t attainableMaxSpeed) { + wpi::math::SwerveDriveKinematics::DesaturateWheelSpeeds(&moduleStates, attainableMaxSpeed); return moduleStates; } - ? wpi::array*, ChassisSpeeds, units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t + ? wpi::util::array*, ChassisSpeeds, wpi::units::meters_per_second_t, wpi::units::meters_per_second_t, wpi::units::radians_per_second_t : cpp_code: | - [](wpi::array moduleStates, + [](wpi::util::array moduleStates, ChassisSpeeds currentChassisSpeed, - units::meters_per_second_t attainableMaxModuleSpeed, - units::meters_per_second_t attainableMaxRobotTranslationSpeed, - units::radians_per_second_t attainableMaxRobotRotationSpeed) { - frc::SwerveDriveKinematics::DesaturateWheelSpeeds(&moduleStates, currentChassisSpeed, attainableMaxModuleSpeed, attainableMaxRobotTranslationSpeed, attainableMaxRobotRotationSpeed); + wpi::units::meters_per_second_t attainableMaxModuleSpeed, + wpi::units::meters_per_second_t attainableMaxRobotTranslationSpeed, + wpi::units::radians_per_second_t attainableMaxRobotRotationSpeed) { + wpi::math::SwerveDriveKinematics::DesaturateWheelSpeeds(&moduleStates, currentChassisSpeed, attainableMaxModuleSpeed, attainableMaxRobotTranslationSpeed, attainableMaxRobotRotationSpeed); return moduleStates; } @@ -91,18 +92,18 @@ classes: templates: SwerveDrive2Kinematics: - qualname: frc::SwerveDriveKinematics + qualname: wpi::math::SwerveDriveKinematics params: - 2 SwerveDrive3Kinematics: - qualname: frc::SwerveDriveKinematics + qualname: wpi::math::SwerveDriveKinematics params: - 3 SwerveDrive4Kinematics: - qualname: frc::SwerveDriveKinematics + qualname: wpi::math::SwerveDriveKinematics params: - 4 SwerveDrive6Kinematics: - qualname: frc::SwerveDriveKinematics + qualname: wpi::math::SwerveDriveKinematics params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml index 072f0cfac..32e7ad3dc 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry.yml @@ -1,5 +1,5 @@ classes: - frc::SwerveDriveOdometry: + wpi::math::SwerveDriveOdometry: force_no_trampoline: true template_params: - size_t NumModules @@ -7,18 +7,18 @@ classes: SwerveDriveOdometry: templates: SwerveDrive2Odometry: - qualname: frc::SwerveDriveOdometry + qualname: wpi::math::SwerveDriveOdometry params: - 2 SwerveDrive3Odometry: - qualname: frc::SwerveDriveOdometry + qualname: wpi::math::SwerveDriveOdometry params: - 3 SwerveDrive4Odometry: - qualname: frc::SwerveDriveOdometry + qualname: wpi::math::SwerveDriveOdometry params: - 4 SwerveDrive6Odometry: - qualname: frc::SwerveDriveOdometry + qualname: wpi::math::SwerveDriveOdometry params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml index 63752d468..c76351210 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveDriveOdometry3d.yml @@ -1,5 +1,5 @@ classes: - frc::SwerveDriveOdometry3d: + wpi::math::SwerveDriveOdometry3d: force_no_trampoline: true template_params: - size_t NumModules @@ -8,18 +8,18 @@ classes: templates: SwerveDrive2Odometry3d: - qualname: frc::SwerveDriveOdometry3d + qualname: wpi::math::SwerveDriveOdometry3d params: - 2 SwerveDrive3Odometry3d: - qualname: frc::SwerveDriveOdometry3d + qualname: wpi::math::SwerveDriveOdometry3d params: - 3 SwerveDrive4Odometry3d: - qualname: frc::SwerveDriveOdometry3d + qualname: wpi::math::SwerveDriveOdometry3d params: - 4 SwerveDrive6Odometry3d: - qualname: frc::SwerveDriveOdometry3d + qualname: wpi::math::SwerveDriveOdometry3d params: - 6 diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml index aaa7130fe..637475a57 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModulePosition.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::SwerveModulePosition: + wpi::math::SwerveModulePosition: force_no_default_constructor: true attributes: distance: @@ -13,15 +13,15 @@ classes: inline_code: | .def( py::init< - units::meter_t, frc::Rotation2d + wpi::units::meter_t, wpi::math::Rotation2d >(), - py::arg("distance") = 0, py::arg("angle") = frc::Rotation2d() + py::arg("distance") = 0, py::arg("angle") = wpi::math::Rotation2d() ) .def_property("distance_ft", - [](SwerveModulePosition * self) -> units::foot_t { + [](SwerveModulePosition * self) -> wpi::units::foot_t { return self->distance; }, - [](SwerveModulePosition * self, units::foot_t distance) { + [](SwerveModulePosition * self, wpi::units::foot_t distance) { self->distance = distance; } ) @@ -31,4 +31,4 @@ classes: }) inline_code: | - SetupWPyStruct(cls_SwerveModulePosition); + SetupWPyStruct(cls_SwerveModulePosition); diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml index 9ba68ee96..70b647826 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/SwerveModuleState.yml @@ -2,7 +2,7 @@ extra_includes: - wpystruct.h classes: - frc::SwerveModuleState: + wpi::math::SwerveModuleState: force_no_default_constructor: true attributes: speed: @@ -20,15 +20,15 @@ inline_code: | cls_SwerveModuleState .def( py::init< - units::meters_per_second_t, frc::Rotation2d + wpi::units::meters_per_second_t, wpi::math::Rotation2d >(), - py::arg("speed") = 0, py::arg("angle") = frc::Rotation2d() + py::arg("speed") = 0, py::arg("angle") = wpi::math::Rotation2d() ) .def_property("speed_fps", - [](SwerveModuleState * self) -> units::feet_per_second_t { + [](SwerveModuleState * self) -> wpi::units::feet_per_second_t { return self->speed; }, - [](SwerveModuleState * self, units::feet_per_second_t speed) { + [](SwerveModuleState * self, wpi::units::feet_per_second_t speed) { self->speed = speed; } ) @@ -38,4 +38,4 @@ inline_code: | }) ; - SetupWPyStruct(cls_SwerveModuleState); + SetupWPyStruct(cls_SwerveModuleState); diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml b/subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml index 8947e658a..f32ee9e85 100644 --- a/subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml +++ b/subprojects/robotpy-wpimath/semiwrap/spline/CubicHermiteSpline.yml @@ -1,5 +1,5 @@ classes: - frc::CubicHermiteSpline: + wpi::math::CubicHermiteSpline: force_no_trampoline: true methods: CubicHermiteSpline: diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml b/subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml index 054929423..b7750fc60 100644 --- a/subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml +++ b/subprojects/robotpy-wpimath/semiwrap/spline/QuinticHermiteSpline.yml @@ -1,5 +1,5 @@ classes: - frc::QuinticHermiteSpline: + wpi::math::QuinticHermiteSpline: force_no_trampoline: true methods: QuinticHermiteSpline: diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml b/subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml index 8804b137a..4417d7550 100644 --- a/subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml +++ b/subprojects/robotpy-wpimath/semiwrap/spline/Spline.yml @@ -2,11 +2,11 @@ extra_includes: - pybind11/stl.h classes: - frc::Spline: + wpi::math::Spline: is_polymorphic: true force_type_casters: - - units::curvature_t - - wpi::array + - wpi::units::curvature_t + - wpi::util::array template_params: - int Degree methods: @@ -26,12 +26,12 @@ classes: cls_ControlVector .def( py::init< - wpi::array, - wpi::array>(), + wpi::util::array, + wpi::util::array>(), py::arg("x"), py::arg("y") ); - frc::Spline::ControlVector: + wpi::math::Spline::ControlVector: force_no_default_constructor: true attributes: x: @@ -39,11 +39,11 @@ classes: templates: Spline3: - qualname: frc::Spline + qualname: wpi::math::Spline params: - 3 Spline5: - qualname: frc::Spline + qualname: wpi::math::Spline params: - 5 diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml b/subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml index 8ec639465..f6f25b214 100644 --- a/subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml +++ b/subprojects/robotpy-wpimath/semiwrap/spline/SplineHelper.yml @@ -1,5 +1,5 @@ classes: - frc::SplineHelper: + wpi::math::SplineHelper: methods: CubicControlVectorsFromWaypoints: QuinticSplinesFromWaypoints: diff --git a/subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml b/subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml index a4971fa5b..5a1e4d916 100644 --- a/subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml +++ b/subprojects/robotpy-wpimath/semiwrap/spline/SplineParameterizer.yml @@ -1,13 +1,13 @@ classes: - frc::SplineParameterizer: + wpi::math::SplineParameterizer: force_no_default_constructor: true force_type_casters: - - units::curvature_t + - wpi::units::curvature_t methods: Parameterize: template_impls: - ['3'] - ['5'] - frc::SplineParameterizer::MalformedSplineException: + wpi::math::SplineParameterizer::MalformedSplineException: ignore: true diff --git a/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml b/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml index bcec6a22f..e06366e06 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml +++ b/subprojects/robotpy-wpimath/tests/cpp/semiwrap/module.yml @@ -1,4 +1,3 @@ - classes: SomeClass: attributes: diff --git a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py index 5dff80ff0..e904b8633 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py +++ b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/__init__.py @@ -1,6 +1,6 @@ from . import _init__wpimath_test -# autogenerated by 'robotpy-build create-imports wpimath_test' +# autogenerated by 'semiwrap create-imports wpimath_test wpimath_test._wpimath_test' from ._wpimath_test import SomeClass __all__ = ["SomeClass"] diff --git a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/include/module.h b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/include/module.h index a4afe39d3..3e2b18876 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/include/module.h +++ b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/include/module.h @@ -1,24 +1,24 @@ #pragma once -#include -#include +#include "wpi/units/time.hpp" +#include "wpi/units/length.hpp" struct SomeClass { static constexpr auto s_constant = 2_s; static constexpr auto ms_constant1 = 20_ms; - static constexpr units::second_t ms_constant2 = 50_ms; - static constexpr units::millisecond_t ms_constant3 = 0.20_s; + static constexpr wpi::units::second_t ms_constant2 = 50_ms; + static constexpr wpi::units::millisecond_t ms_constant3 = 0.20_s; - bool checkDefaultByName1(units::second_t period = ms_constant1); - bool checkDefaultByName2(units::second_t period = ms_constant2); - bool checkDefaultByNum1(units::second_t period = 50_ms); - bool checkDefaultByNum2(units::second_t period = 0.5_s); + bool checkDefaultByName1(wpi::units::second_t period = ms_constant1); + bool checkDefaultByName2(wpi::units::second_t period = ms_constant2); + bool checkDefaultByNum1(wpi::units::second_t period = 50_ms); + bool checkDefaultByNum2(wpi::units::second_t period = 0.5_s); - units::second_t ms2s(units::millisecond_t ms); - units::millisecond_t s2ms(units::second_t s); + wpi::units::second_t ms2s(wpi::units::millisecond_t ms); + wpi::units::millisecond_t s2ms(wpi::units::second_t s); - static constexpr units::foot_t five_ft = 5_ft; + static constexpr wpi::units::foot_t five_ft = 5_ft; - units::meter_t ft2m(units::foot_t f); + wpi::units::meter_t ft2m(wpi::units::foot_t f); }; \ No newline at end of file diff --git a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/src/module.cpp b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/src/module.cpp index c101790b3..129fdb402 100644 --- a/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/src/module.cpp +++ b/subprojects/robotpy-wpimath/tests/cpp/wpimath_test/src/module.cpp @@ -8,46 +8,46 @@ SEMIWRAP_PYBIND11_MODULE(m) initWrapper(m); } -bool SomeClass::checkDefaultByName1(units::second_t period) +bool SomeClass::checkDefaultByName1(wpi::units::second_t period) { if (period != SomeClass::ms_constant1) { - throw std::runtime_error(units::to_string(period)); + throw std::runtime_error(wpi::units::to_string(period)); } return true; } -bool SomeClass::checkDefaultByName2(units::second_t period) +bool SomeClass::checkDefaultByName2(wpi::units::second_t period) { if (period != SomeClass::ms_constant2) { - throw std::runtime_error(units::to_string(period)); + throw std::runtime_error(wpi::units::to_string(period)); } return true; } -bool SomeClass::checkDefaultByNum1(units::second_t period) +bool SomeClass::checkDefaultByNum1(wpi::units::second_t period) { if (period != 50_ms) { - throw std::runtime_error(units::to_string(period)); + throw std::runtime_error(wpi::units::to_string(period)); } return true; } -bool SomeClass::checkDefaultByNum2(units::second_t period) +bool SomeClass::checkDefaultByNum2(wpi::units::second_t period) { if (period != 50_ms) { - throw std::runtime_error(units::to_string(period)); + throw std::runtime_error(wpi::units::to_string(period)); } return true; } -units::meter_t SomeClass::ft2m(units::foot_t f) { +wpi::units::meter_t SomeClass::ft2m(wpi::units::foot_t f) { return f; } -units::second_t SomeClass::ms2s(units::millisecond_t ms) { +wpi::units::second_t SomeClass::ms2s(wpi::units::millisecond_t ms) { return ms; } -units::millisecond_t SomeClass::s2ms(units::second_t s) { +wpi::units::millisecond_t SomeClass::s2ms(wpi::units::second_t s) { return s; } diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h index 8d91ed04c..e80ff7929 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/PyTrajectoryConstraint.h @@ -1,37 +1,37 @@ #pragma once -#include +#include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp" #include -namespace frc { +namespace wpi::math { struct PyTrajectoryConstraint : public TrajectoryConstraint { PyTrajectoryConstraint() {} - units::meters_per_second_t - MaxVelocity(const Pose2d &pose, units::curvature_t curvature, - units::meters_per_second_t velocity) const override { + wpi::units::meters_per_second_t + MaxVelocity(const Pose2d &pose, wpi::units::curvature_t curvature, + wpi::units::meters_per_second_t velocity) const override { return m_constraint->MaxVelocity(pose, curvature, velocity); } - MinMax MinMaxAcceleration(const Pose2d &pose, units::curvature_t curvature, - units::meters_per_second_t speed) const override { + MinMax MinMaxAcceleration(const Pose2d &pose, wpi::units::curvature_t curvature, + wpi::units::meters_per_second_t speed) const override { return m_constraint->MinMaxAcceleration(pose, curvature, speed); } std::shared_ptr m_constraint; }; -}; // namespace frc +}; // namespace wpi::math namespace pybind11 { namespace detail { -template <> struct type_caster { - using value_conv = make_caster>; +template <> struct type_caster { + using value_conv = make_caster>; - PYBIND11_TYPE_CASTER(frc::PyTrajectoryConstraint, _("wpimath._controls._controls.constraint.TrajectoryConstraint")); + PYBIND11_TYPE_CASTER(wpi::math::PyTrajectoryConstraint, _("wpimath._controls._controls.constraint.TrajectoryConstraint")); bool load(handle src, bool convert) { value_conv conv; @@ -40,11 +40,11 @@ template <> struct type_caster { } value.m_constraint = - cast_op>(std::move(conv)); + cast_op>(std::move(conv)); return true; } - static handle cast(const frc::PyTrajectoryConstraint &src, + static handle cast(const wpi::math::PyTrajectoryConstraint &src, return_value_policy policy, handle parent) { return value_conv::cast(src.m_constraint, policy, parent); } diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/_units_base_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/_units_base_type_caster.h index d53940551..10d5f88c3 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/_units_base_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/_units_base_type_caster.h @@ -11,24 +11,24 @@ namespace detail { When going from C++ to Python (eg, return values), the units that a user gets as a float are in whatever the unit was for C++. - units::foot_t getFeet(); // converted to float, value is feet + wpi::units::foot_t getFeet(); // converted to float, value is feet When going from Python to C++, the units a user uses are once again whatever the C++ function specifies: - void setFeet(units::foot_t ft); // must pass a float, it's in feet - void setMeters(units::meter_t m); // must pass a float, it's in meters + void setFeet(wpi::units::foot_t ft); // must pass a float, it's in feet + void setMeters(wpi::units::meter_t m); // must pass a float, it's in meters Unfortunately, with this type caster and robotpy-build there are mismatch issues with implicit conversions when default values are used that don't match the actual value: - foo(units::second_t tm = 10_ms); // if not careful, pybind11 will + foo(wpi::units::second_t tm = 10_ms); // if not careful, pybind11 will // store as 10 seconds */ template class S> -struct type_caster> { - using value_type = units::unit_t; +struct type_caster> { + using value_type = wpi::units::unit_t; // TODO: there should be a way to include the type with this PYBIND11_TYPE_CASTER(value_type, handle_type_name::name); diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_acceleration_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_acceleration_type_caster.h index 503fec414..032c09f05 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_acceleration_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_acceleration_type_caster.h @@ -1,30 +1,30 @@ #pragma once -#include +#include "wpi/units/acceleration.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.standard_gravity"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.standard_gravity"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angle_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angle_type_caster.h index 11e5456d2..c4323817c 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angle_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angle_type_caster.h @@ -1,94 +1,94 @@ #pragma once -#include +#include "wpi/units/angle.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.arcminutes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.arcminutes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.arcseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.arcseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliarcseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliarcseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gradians"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_acceleration_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_acceleration_type_caster.h index 6ccff80ec..01dc182c8 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_acceleration_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_acceleration_type_caster.h @@ -1,30 +1,30 @@ #pragma once -#include +#include "wpi/units/angular_acceleration.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns_per_second_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns_per_second_squared"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_velocity_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_velocity_type_caster.h index f441ec17c..ca974fec0 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_velocity_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_angular_velocity_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/angular_velocity.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.radians_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.turns_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.revolutions_per_minute"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.revolutions_per_minute"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliarcseconds_per_year"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliarcseconds_per_year"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_area_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_area_type_caster.h index e50d13565..ff733500a 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_area_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_area_type_caster.h @@ -1,62 +1,62 @@ #pragma once -#include +#include "wpi/units/area.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.square_kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hectares"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hectares"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.acres"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.acres"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_capacitance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_capacitance_type_caster.h index 2dfcb1be5..7ab11464a 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_capacitance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_capacitance_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/capacitance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.farads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.farads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanofarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanofarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microfarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microfarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millifarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millifarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilofarads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilofarads"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_charge_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_charge_type_caster.h index 0ddb1ed31..e1d260bef 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_charge_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_charge_type_caster.h @@ -1,86 +1,86 @@ #pragma once -#include +#include "wpi/units/charge.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.coulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.coulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocoulombs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloampere_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloampere_hours"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_compound_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_compound_type_caster.h index bafe8b19d..e837852a9 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_compound_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_compound_type_caster.h @@ -1,92 +1,92 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "wpi/units/acceleration.hpp" +#include "wpi/units/angle.hpp" +#include "wpi/units/angular_velocity.hpp" +#include "wpi/units/length.hpp" +#include "wpi/units/time.hpp" +#include "wpi/units/voltage.hpp" namespace pybind11 { namespace detail { template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.radians_per_meter"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.radians_per_second_per_volt"); }; template <> -struct handle_type_name>> { +struct handle_type_name>> { static constexpr auto name = _("wpimath.units.units_per_second"); }; template <> struct handle_type_name< - units::unit_t>>> { + wpi::units::unit_t>>> { static constexpr auto name = _("wpimath.units.units_per_second_squared"); }; -using volt_seconds = units::compound_unit; -using volt_seconds_squared = units::compound_unit; +using volt_seconds = wpi::units::compound_unit; +using volt_seconds_squared = wpi::units::compound_unit; -template <> struct handle_type_name> { +template <> struct handle_type_name> { static constexpr auto name = _("wpimath.units.volt_seconds"); }; -template <> struct handle_type_name> { +template <> struct handle_type_name> { static constexpr auto name = _("wpimath.units.volt_seconds_squared"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_per_meter"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_squared_per_meter"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_per_feet"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_squared_per_feet"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_per_radian"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.volt_seconds_squared_per_radian"); }; -using unit_seconds = units::compound_unit; -using unit_seconds_squared = units::compound_unit; +using unit_seconds = wpi::units::compound_unit; +using unit_seconds_squared = wpi::units::compound_unit; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.unit_seconds_squared_per_unit"); }; template <> -struct handle_type_name>>> { +struct handle_type_name>>> { static constexpr auto name = _("wpimath.units.meters_per_second_squared_per_volt"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_concentration_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_concentration_type_caster.h index fb2eb4170..7a4d8d5fd 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_concentration_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_concentration_type_caster.h @@ -1,38 +1,38 @@ #pragma once -#include +#include "wpi/units/concentration.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_million"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_million"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_billion"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_billion"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_trillion"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parts_per_trillion"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.percent"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.percent"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_conductance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_conductance_type_caster.h index 331d44d60..bf3200b09 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_conductance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_conductance_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/conductance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.siemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.siemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosiemens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosiemens"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_current_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_current_type_caster.h index a617364c4..fd5939564 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_current_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_current_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/current.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.amperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.amperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloamperes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloamperes"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_transfer_rate_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_transfer_rate_type_caster.h index 86211701a..717702982 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_transfer_rate_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_transfer_rate_type_caster.h @@ -1,22 +1,22 @@ #pragma once -#include +#include "wpi/units/data_transfer_rate.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabytes_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabytes_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabits_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabits_per_second"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_type_caster.h index 0d6c085e5..759fa1caf 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_data_type_caster.h @@ -1,22 +1,22 @@ #pragma once -#include +#include "wpi/units/data.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabytes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabytes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabits"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.exabits"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_density_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_density_type_caster.h index 387d916ca..7b4d2bf3f 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_density_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_density_type_caster.h @@ -1,86 +1,86 @@ #pragma once -#include +#include "wpi/units/density.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms_per_cubic_meter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms_per_cubic_meter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grams_per_milliliter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grams_per_milliliter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms_per_liter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms_per_liter"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_cubic_foot"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_cubic_foot"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_cubic_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_cubic_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_gallon"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces_per_gallon"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_cubic_foot"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_cubic_foot"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_cubic_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_cubic_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_gallon"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_gallon"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.slugs_per_cubic_foot"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.slugs_per_cubic_foot"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_energy_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_energy_type_caster.h index e747cd80e..b671ab4b2 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_energy_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_energy_type_caster.h @@ -1,142 +1,142 @@ #pragma once -#include +#include "wpi/units/energy.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.joules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.joules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanojoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanojoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microjoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microjoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millijoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millijoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilojoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilojoules"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.calories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.calories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocalories"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowatt_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowatt_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.watt_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.watt_hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units_iso"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units_iso"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units_59"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.british_thermal_units_59"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.therms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.therms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.foot_pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.foot_pounds"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_force_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_force_type_caster.h index 2b1f692d2..94274e63e 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_force_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_force_type_caster.h @@ -1,78 +1,78 @@ #pragma once -#include +#include "wpi/units/force.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.newtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.newtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanonewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanonewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micronewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micronewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millinewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millinewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilonewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilonewtons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.dynes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.dynes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloponds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloponds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.poundals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.poundals"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_frequency_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_frequency_type_caster.h index 3618eb71a..f4a477487 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_frequency_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_frequency_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/frequency.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanohertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanohertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microhertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microhertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millihertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millihertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilohertz"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilohertz"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_illuminance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_illuminance_type_caster.h index d24217815..f087b0b30 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_illuminance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_illuminance_type_caster.h @@ -1,70 +1,70 @@ #pragma once -#include +#include "wpi/units/illuminance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.luxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.luxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloluxes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.footcandles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.footcandles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lumens_per_square_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lumens_per_square_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.phots"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.phots"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_impedance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_impedance_type_caster.h index b4af8ad02..57b6c9f63 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_impedance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_impedance_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/impedance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloohms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloohms"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_inductance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_inductance_type_caster.h index 59700cf08..3820713b4 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_inductance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_inductance_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/inductance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.henries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.henries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanohenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanohenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microhenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microhenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millihenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millihenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilohenries"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilohenries"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_length_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_length_type_caster.h index 9f0cee402..3eb4321ea 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_length_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_length_type_caster.h @@ -1,190 +1,190 @@ #pragma once -#include +#include "wpi/units/length.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.centimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.centimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.mils"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.mils"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nauticalMiles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nauticalMiles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.astronicalUnits"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.astronicalUnits"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lightyears"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lightyears"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parsecs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.parsecs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.angstroms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.angstroms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubits"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubits"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fathoms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fathoms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.chains"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.chains"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.furlongs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.furlongs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hands"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hands"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.leagues"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.leagues"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nauticalLeagues"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nauticalLeagues"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.yards"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.yards"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_flux_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_flux_type_caster.h index bfb2209bf..9e0af5d05 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_flux_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_flux_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/luminous_flux.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.lumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanolumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanolumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microlumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microlumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millilumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millilumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilolumens"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilolumens"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_intensity_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_intensity_type_caster.h index 4d4a382b7..45061f63b 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_intensity_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_luminous_intensity_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/luminous_intensity.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.candelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.candelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanocandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microcandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millicandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocandelas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilocandelas"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_field_strength_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_field_strength_type_caster.h index f52feb6cd..d9d09accd 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_field_strength_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_field_strength_type_caster.h @@ -1,54 +1,54 @@ #pragma once -#include +#include "wpi/units/magnetic_field_strength.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.teslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.teslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloteslas"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gauss"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gauss"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_flux_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_flux_type_caster.h index 6d0b9a7b3..4650ff64b 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_flux_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_magnetic_flux_type_caster.h @@ -1,54 +1,54 @@ #pragma once -#include +#include "wpi/units/magnetic_flux.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.webers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.webers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanowebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanowebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microwebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microwebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliwebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliwebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowebers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.maxwells"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.maxwells"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_mass_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_mass_type_caster.h index 27f091234..e49d80348 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_mass_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_mass_type_caster.h @@ -1,110 +1,110 @@ #pragma once -#include +#include "wpi/units/mass.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milligrams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milligrams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.metric_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.metric_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.long_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.long_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.short_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.short_tons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.stone"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.stone"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.ounces"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.carats"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.carats"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.slugs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.slugs"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_misc_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_misc_type_caster.h index 9bd4dd775..e500aa456 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_misc_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_misc_type_caster.h @@ -1,23 +1,23 @@ #pragma once -#include +#include "wpi/units/mass.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("float"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("float"); }; -// template <> struct handle_type_name { +// template <> struct handle_type_name { // static constexpr auto name = _("float"); // }; -// template <> struct handle_type_name { +// template <> struct handle_type_name { // static constexpr auto name = _("float"); // }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_moment_of_inertia_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_moment_of_inertia_type_caster.h index ff9e37078..ba4ca2007 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_moment_of_inertia_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_moment_of_inertia_type_caster.h @@ -1,14 +1,14 @@ #pragma once -#include +#include "wpi/units/moment_of_inertia.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilogram_square_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilogram_square_meters"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_power_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_power_type_caster.h index 6082e37cf..e4f43087e 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_power_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_power_type_caster.h @@ -1,54 +1,54 @@ #pragma once -#include +#include "wpi/units/power.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.watts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.watts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanowatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanowatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microwatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microwatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliwatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliwatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilowatts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.horsepower"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.horsepower"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_pressure_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_pressure_type_caster.h index c12ffb1d4..c6aacba34 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_pressure_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_pressure_type_caster.h @@ -1,86 +1,86 @@ #pragma once -#include +#include "wpi/units/pressure.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanopascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanopascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micropascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micropascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millipascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millipascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilopascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilopascals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.bars"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.bars"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.mbars"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.mbars"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.atmospheres"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.atmospheres"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_square_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pounds_per_square_inch"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.torrs"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.torrs"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_radiation_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_radiation_type_caster.h index 0e8c268dc..b48cef48d 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_radiation_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_radiation_type_caster.h @@ -1,150 +1,150 @@ #pragma once -#include +#include "wpi/units/radiation.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.becquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.becquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanobecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanobecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microbecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microbecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millibecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millibecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilobecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilobecquerels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grays"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.grays"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.micrograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milligrays"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milligrays"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilograys"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.sieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.sieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosieverts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.curies"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.curies"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rutherfords"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rutherfords"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rads"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rads"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_solid_angle_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_solid_angle_type_caster.h index 9e32b5006..490a1d3a0 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_solid_angle_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_solid_angle_type_caster.h @@ -1,62 +1,62 @@ #pragma once -#include +#include "wpi/units/solid_angle.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.steradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.steradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanosteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microsteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millisteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilosteradians"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.degrees_squared"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.spats"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.spats"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_substance_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_substance_type_caster.h index 08e29242e..202f8f0fb 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_substance_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_substance_type_caster.h @@ -1,14 +1,14 @@ #pragma once -#include +#include "wpi/units/substance.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.moles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.moles"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_temperature_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_temperature_type_caster.h index 3d068c7eb..091e2ebcc 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_temperature_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_temperature_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/temperature.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kelvin"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kelvin"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.celsius"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.celsius"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fahrenheit"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fahrenheit"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.reaumur"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.reaumur"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rankine"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.rankine"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_time_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_time_type_caster.h index 4edfa26ae..f0bb0ad13 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_time_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_time_type_caster.h @@ -1,102 +1,102 @@ #pragma once -#include +#include "wpi/units/time.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.seconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.seconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloseconds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.minutes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.minutes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.hours"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.days"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.days"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.weeks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.weeks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.years"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.years"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.julian_years"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.julian_years"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gregorian_years"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gregorian_years"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_torque_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_torque_type_caster.h index 7954423a2..f0cc6e6be 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_torque_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_torque_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/torque.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.newton_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.newton_meters"); }; -// template <> struct handle_type_name { +// template <> struct handle_type_name { // static constexpr auto name = _("wpimath.units.foot_pounds"); // }; -// template <> struct handle_type_name { +// template <> struct handle_type_name { // static constexpr auto name = _("wpimath.units.foot_pounds"); // }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.foot_poundals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.foot_poundals"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.inch_pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.inch_pounds"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meter_kilograms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meter_kilograms"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_velocity_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_velocity_type_caster.h index 7c1e2e564..d6e331973 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_velocity_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_velocity_type_caster.h @@ -1,46 +1,46 @@ #pragma once -#include +#include "wpi/units/velocity.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.meters_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.feet_per_second"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.miles_per_hour"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.miles_per_hour"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilometers_per_hour"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilometers_per_hour"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.knots"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.knots"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_voltage_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_voltage_type_caster.h index 67faeec08..8c9931896 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_voltage_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_voltage_type_caster.h @@ -1,62 +1,62 @@ #pragma once -#include +#include "wpi/units/voltage.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.volts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.volts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanovolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanovolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microvolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microvolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millivolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.millivolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilovolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kilovolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.statvolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.statvolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.abvolts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.abvolts"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_volume_type_caster.h b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_volume_type_caster.h index c294c3b31..c2253cbba 100644 --- a/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_volume_type_caster.h +++ b/subprojects/robotpy-wpimath/wpimath/_impl/src/type_casters/units_volume_type_caster.h @@ -1,270 +1,270 @@ #pragma once -#include +#include "wpi/units/volume.hpp" namespace pybind11 { namespace detail { -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_meters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_millimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_millimeters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_kilometers"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.liters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.liters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.nanoliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.microliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.milliliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.kiloliters"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_inches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_feet"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_yards"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_yards"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_miles"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gallons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gallons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.quarts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.quarts"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pints"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pints"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cups"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cups"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fluid_ounces"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fluid_ounces"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.barrels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.barrels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.bushels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.bushels"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cords"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cords"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_fathoms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.cubic_fathoms"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.tablespoons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.tablespoons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.teaspoons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.teaspoons"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pinches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pinches"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.dashes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.dashes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.drops"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.drops"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fifths"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.fifths"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.drams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.drams"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gills"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.gills"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pecks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.pecks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.sacks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.sacks"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.shots"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.shots"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.strikes"); }; -template <> struct handle_type_name { +template <> struct handle_type_name { static constexpr auto name = _("wpimath.units.strikes"); }; diff --git a/subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h b/subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h index 4ba07ad5b..7ef82e799 100644 --- a/subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h +++ b/subprojects/robotpy-wpimath/wpimath/geometry/include/rpy/geometryToString.h @@ -1,21 +1,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "wpi/math/geometry/Ellipse2d.hpp" +#include "wpi/math/geometry/Pose2d.hpp" +#include "wpi/math/geometry/Pose3d.hpp" +#include "wpi/math/geometry/Rectangle2d.hpp" +#include "wpi/math/geometry/Rotation2d.hpp" +#include "wpi/math/geometry/Rotation3d.hpp" +#include "wpi/math/geometry/Translation2d.hpp" +#include "wpi/math/geometry/Translation3d.hpp" namespace rpy { -inline std::string toString(const frc::Rotation2d &self) { +inline std::string toString(const wpi::math::Rotation2d &self) { return "Rotation2d(" + std::to_string(self.Radians()()) + ")"; } -inline std::string toString(const frc::Rotation3d &self) { +inline std::string toString(const wpi::math::Rotation3d &self) { return "Rotation3d(" "x=" + std::to_string(self.X()()) + @@ -27,7 +27,7 @@ inline std::string toString(const frc::Rotation3d &self) { std::to_string(self.Z()()) + ")"; } -inline std::string toString(const frc::Translation2d &self) { +inline std::string toString(const wpi::math::Translation2d &self) { return "Translation2d(" "x=" + std::to_string(self.X()()) + @@ -36,7 +36,7 @@ inline std::string toString(const frc::Translation2d &self) { std::to_string(self.Y()()) + ")"; } -inline std::string toString(const frc::Translation3d &self) { +inline std::string toString(const wpi::math::Translation3d &self) { return "Translation3d(" "x=" + std::to_string(self.X()()) + @@ -48,7 +48,7 @@ inline std::string toString(const frc::Translation3d &self) { std::to_string(self.Z()()) + ")"; } -inline std::string toString(const frc::Quaternion &self) { +inline std::string toString(const wpi::math::Quaternion &self) { return "Quaternion(" "w=" + std::to_string(self.W()) + @@ -63,33 +63,33 @@ inline std::string toString(const frc::Quaternion &self) { std::to_string(self.Z()) + ")"; } -inline std::string toString(const frc::Transform2d &self) { +inline std::string toString(const wpi::math::Transform2d &self) { return "Transform2d(" + rpy::toString(self.Translation()) + ", " + rpy::toString(self.Rotation()) + ")"; } -inline std::string toString(const frc::Transform3d &self) { +inline std::string toString(const wpi::math::Transform3d &self) { return "Transform3d(" + rpy::toString(self.Translation()) + ", " + rpy::toString(self.Rotation()) + ")"; } -inline std::string toString(const frc::Pose2d &self) { +inline std::string toString(const wpi::math::Pose2d &self) { return "Pose2d(" + rpy::toString(self.Translation()) + ", " + rpy::toString(self.Rotation()) + ")"; } -inline std::string toString(const frc::Pose3d &self) { +inline std::string toString(const wpi::math::Pose3d &self) { return "Pose3d(" + rpy::toString(self.Translation()) + ", " + rpy::toString(self.Rotation()) + ")"; } -inline std::string toString(const frc::Rectangle2d &self) { +inline std::string toString(const wpi::math::Rectangle2d &self) { return "Rectangle2d(center=" + rpy::toString(self.Center()) + ", xWidth=" + std::to_string(self.XWidth()()) + ", yWidth=" + std::to_string(self.YWidth()()) + ")"; } -inline std::string toString(const frc::Ellipse2d &self) { +inline std::string toString(const wpi::math::Ellipse2d &self) { return "Ellipse2d(center=" + rpy::toString(self.Center()) + ", xSemiAxis=" + std::to_string(self.XSemiAxis()()) + ", ySemiAxis=" + std::to_string(self.YSemiAxis()()) + ")"; diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index f79af21e0..1ebeca60a 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -6,21 +6,21 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3" + "robotpy-native-wpinet==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project] name = "robotpy-wpinet" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC wpinet library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpinet==2027.0.0a3", - "robotpy-wpiutil==2027.0.0a3" + "robotpy-native-wpinet==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project.urls] @@ -52,5 +52,5 @@ depends = ["wpiutil"] [tool.semiwrap.extension_modules."wpinet._wpinet".headers] # wpinet -PortForwarder = "wpinet/PortForwarder.h" -WebServer = "wpinet/WebServer.h" +PortForwarder = "wpi/net/PortForwarder.hpp" +WebServer = "wpi/net/WebServer.hpp" diff --git a/subprojects/robotpy-wpinet/semiwrap/PortForwarder.yml b/subprojects/robotpy-wpinet/semiwrap/PortForwarder.yml index 64e172eae..6c80be714 100644 --- a/subprojects/robotpy-wpinet/semiwrap/PortForwarder.yml +++ b/subprojects/robotpy-wpinet/semiwrap/PortForwarder.yml @@ -1,5 +1,5 @@ classes: - wpi::PortForwarder: + wpi::net::PortForwarder: nodelete: true methods: GetInstance: diff --git a/subprojects/robotpy-wpinet/semiwrap/WebServer.yml b/subprojects/robotpy-wpinet/semiwrap/WebServer.yml index 61ac08875..192ae1791 100644 --- a/subprojects/robotpy-wpinet/semiwrap/WebServer.yml +++ b/subprojects/robotpy-wpinet/semiwrap/WebServer.yml @@ -1,5 +1,5 @@ classes: - wpi::WebServer: + wpi::net::WebServer: nodelete: true methods: GetInstance: diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index 206ee492f..8d5d8aa2c 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -5,19 +5,19 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-wpiutil" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for FRC WPIUtil library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpiutil==0.0.0", ] [project.urls] @@ -67,15 +67,15 @@ depends = ["wpiutil-casters"] [tool.semiwrap.extension_modules."wpiutil._wpiutil".headers] # wpi -StackTrace = "wpi/StackTrace.h" -Synchronization = "wpi/Synchronization.h" -RawFrame = "wpi/RawFrame.h" +StackTrace = "wpi/util/StackTrace.hpp" +Synchronization = "wpi/util/Synchronization.h" +RawFrame = "wpi/util/RawFrame.h" # wpi/sendable -Sendable = "wpi/sendable/Sendable.h" -SendableBuilder = "wpi/sendable/SendableBuilder.h" -#SendableHelper = "wpi/sendable/SendableHelper.h" -SendableRegistry = "wpi/sendable/SendableRegistry.h" +Sendable = "wpi/util/sendable/Sendable.hpp" +SendableBuilder = "wpi/util/sendable/SendableBuilder.hpp" +#SendableHelper = "wpi/util/sendable/SendableHelper.hpp" +SendableRegistry = "wpi/util/sendable/SendableRegistry.hpp" WPyStruct = "src/wpistruct/wpystruct_fns.h" @@ -88,11 +88,11 @@ includedir = [ [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_array_type_caster.h" -types = ["wpi::array"] +types = ["wpi::util::array"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_json_type_caster.h" -types = ["wpi::json"] +types = ["wpi::util::json"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_span_type_caster.h" @@ -100,23 +100,23 @@ types = ["std::span"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_smallset_type_caster.h" -types = ["wpi::SmallSet"] +types = ["wpi::util::SmallSet"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_smallvector_type_caster.h" -types = ["wpi::SmallVector"] +types = ["wpi::util::SmallVector"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_smallvectorimpl_type_caster.h" -types = ["wpi::SmallVectorImpl"] +types = ["wpi::util::SmallVectorImpl"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_string_map_caster.h" -types = ["wpi::StringMap"] +types = ["wpi::util::StringMap"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpi_ct_string_type_caster.h" -types = ["wpi::ct_string"] +types = ["wpi::util::ct_string"] [[tool.semiwrap.export_type_casters.wpiutil-casters.headers]] header = "wpystruct.h" diff --git a/subprojects/robotpy-wpiutil/semiwrap/Sendable.yml b/subprojects/robotpy-wpiutil/semiwrap/Sendable.yml index c146a2911..6ec6c43a0 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/Sendable.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/Sendable.yml @@ -1,8 +1,8 @@ extra_includes: -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/SendableBuilder.hpp classes: - wpi::Sendable: + wpi::util::Sendable: methods: InitSendable: virtual_xform: |- diff --git a/subprojects/robotpy-wpiutil/semiwrap/SendableBuilder.yml b/subprojects/robotpy-wpiutil/semiwrap/SendableBuilder.yml index 1a52df427..44e621a6e 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/SendableBuilder.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/SendableBuilder.yml @@ -1,5 +1,5 @@ classes: - wpi::SendableBuilder: + wpi::util::SendableBuilder: enums: BackendKind: methods: diff --git a/subprojects/robotpy-wpiutil/semiwrap/SendableRegistry.yml b/subprojects/robotpy-wpiutil/semiwrap/SendableRegistry.yml index 65e97a169..dd7822334 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/SendableRegistry.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/SendableRegistry.yml @@ -1,9 +1,9 @@ extra_includes: -- wpi/sendable/Sendable.h -- wpi/sendable/SendableBuilder.h +- wpi/util/sendable/Sendable.hpp +- wpi/util/sendable/SendableBuilder.hpp classes: - wpi::SendableRegistry: + wpi::util::SendableRegistry: nodelete: true methods: Add: diff --git a/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml b/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml index 633c7d56c..a051b684c 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml +++ b/subprojects/robotpy-wpiutil/semiwrap/Synchronization.yml @@ -30,7 +30,7 @@ functions: [](std::span handles) { py::gil_scoped_release release; std::vector signaled(handles.size()); - auto result = wpi::WaitForObjects(handles, signaled); + auto result = wpi::util::WaitForObjects(handles, signaled); signaled.resize(result.size()); return signaled; } @@ -47,7 +47,7 @@ functions: py::gil_scoped_release release; std::vector signaled(handles.size()); bool timedOut = false; - auto result = wpi::WaitForObjects(handles, signaled, timeout, &timedOut); + auto result = wpi::util::WaitForObjects(handles, signaled, timeout, &timedOut); signaled.resize(result.size()); return std::make_tuple(signaled, timedOut); } diff --git a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/module.cpp b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/module.cpp index ca045a8a0..8eb61211e 100644 --- a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/module.cpp +++ b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/module.cpp @@ -18,11 +18,11 @@ /* array tests */ -wpi::array load_array_int(wpi::array data) { +wpi::util::array load_array_int(wpi::util::array data) { return data; } -wpi::array load_array_int1(wpi::array data) { +wpi::util::array load_array_int1(wpi::util::array data) { return data; } @@ -84,12 +84,12 @@ void modify_span_buffer(std::span ref) { SmallSet tests */ -wpi::SmallSet load_smallset_int(wpi::SmallSet ref) { +wpi::util::SmallSet load_smallset_int(wpi::util::SmallSet ref) { return ref; } -wpi::SmallSet cast_smallset() { - static wpi::SmallSet set; +wpi::util::SmallSet cast_smallset() { + static wpi::util::SmallSet set; set.insert(1); set.insert(2); set.insert(3); @@ -101,12 +101,12 @@ wpi::SmallSet cast_smallset() { SmallVector tests */ -wpi::SmallVector load_smallvec_int(wpi::SmallVector ref) { +wpi::util::SmallVector load_smallvec_int(wpi::util::SmallVector ref) { return ref; } -wpi::SmallVector cast_smallvec() { - static wpi::SmallVector set; +wpi::util::SmallVector cast_smallvec() { + static wpi::util::SmallVector set; set.append({1, 2, 3, 4}); return set; } @@ -117,36 +117,36 @@ SmallVectorImpl tests .. seems like references are the only useful things to do with them */ -wpi::SmallVectorImpl& load_smallvecimpl_int(wpi::SmallVectorImpl& ref) { - static wpi::SmallVector set(ref.begin(), ref.end()); +wpi::util::SmallVectorImpl& load_smallvecimpl_int(wpi::util::SmallVectorImpl& ref) { + static wpi::util::SmallVector set(ref.begin(), ref.end()); return set; } /* StringMap tests */ -wpi::StringMap load_stringmap_int(wpi::StringMap ref) { +wpi::util::StringMap load_stringmap_int(wpi::util::StringMap ref) { return ref; } -wpi::StringMap cast_stringmap() { - static wpi::StringMap m; +wpi::util::StringMap cast_stringmap() { + static wpi::util::StringMap m; m["one"] = 1; m["two"] = 2; return m; } /* JSON tests */ -wpi::json cast_json_arg(const wpi::json &j) { +wpi::util::json cast_json_arg(const wpi::util::json &j) { return j; } -wpi::json cast_json_val(std::function fn) { +wpi::util::json cast_json_val(std::function fn) { return fn(); } constexpr auto const_string() { - return wpi::ct_string, 3>{{'#', '1', '2'}}; + return wpi::util::ct_string, 3>{{'#', '1', '2'}}; } void sendable_test(py::module &m); diff --git a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp index bc15a6053..6f28fb85e 100644 --- a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp +++ b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp @@ -2,10 +2,10 @@ #include #include #include -#include -#include +#include "wpi/util/sendable/SendableBuilder.hpp" +#include "wpi/util/sendable/SendableRegistry.hpp" -class MySendableBuilder : public wpi::SendableBuilder { +class MySendableBuilder : public wpi::util::SendableBuilder { public: MySendableBuilder(py::dict keys) : keys(keys) {} @@ -94,49 +94,49 @@ class MySendableBuilder : public wpi::SendableBuilder { void AddSmallStringProperty( std::string_view key, - std::function &buf)> getter, + std::function &buf)> getter, std::function setter) override {} void AddSmallBooleanArrayProperty( std::string_view key, - std::function(wpi::SmallVectorImpl &buf)> + std::function(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} void AddSmallIntegerArrayProperty( std::string_view key, std::function< - std::span(wpi::SmallVectorImpl &buf)> + std::span(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} void AddSmallFloatArrayProperty( std::string_view key, - std::function(wpi::SmallVectorImpl &buf)> + std::function(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} void AddSmallDoubleArrayProperty( std::string_view key, - std::function(wpi::SmallVectorImpl &buf)> + std::function(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} void AddSmallStringArrayProperty( std::string_view key, std::function< - std::span(wpi::SmallVectorImpl &buf)> + std::span(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} void AddSmallRawProperty( std::string_view key, std::string_view typeString, - std::function(wpi::SmallVectorImpl &buf)> + std::function(wpi::util::SmallVectorImpl &buf)> getter, std::function)> setter) override {} - wpi::SendableBuilder::BackendKind GetBackendKind() const override { - return wpi::SendableBuilder::BackendKind::kUnknown; + wpi::util::SendableBuilder::BackendKind GetBackendKind() const override { + return wpi::util::SendableBuilder::BackendKind::kUnknown; } bool IsPublished() const override { return false; } @@ -146,9 +146,9 @@ class MySendableBuilder : public wpi::SendableBuilder { py::dict keys; }; -void Publish(wpi::SendableRegistry::UID sendableUid, py::dict keys) { +void Publish(wpi::util::SendableRegistry::UID sendableUid, py::dict keys) { auto builder = std::make_unique(keys); - wpi::SendableRegistry::Publish(sendableUid, std::move(builder)); + wpi::util::SendableRegistry::Publish(sendableUid, std::move(builder)); } void sendable_test(py::module &m) { m.def("publish", Publish); } \ No newline at end of file diff --git a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/struct_test.cpp b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/struct_test.cpp index 200822e9f..89080e75c 100644 --- a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/struct_test.cpp +++ b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/struct_test.cpp @@ -15,7 +15,7 @@ struct ThingA { bool operator==(const ThingA &other) const { return x == other.x; } }; -template <> struct wpi::Struct { +template <> struct wpi::util::Struct { static constexpr std::string_view GetTypeName() { return "ThingA"; } static constexpr size_t GetSize() { return 1; } static constexpr std::string_view GetSchema() { return "uint8 value"; } @@ -40,26 +40,26 @@ struct Outer { }; template <> -struct wpi::Struct { +struct wpi::util::Struct { static constexpr std::string_view GetTypeName() { return "Outer"; } - static constexpr size_t GetSize() { return wpi::GetStructSize() + 4; } + static constexpr size_t GetSize() { return wpi::util::GetStructSize() + 4; } static constexpr std::string_view GetSchema() { return "ThingA inner; int32 c"; } static Outer Unpack(std::span data) { - constexpr size_t innerSize = wpi::GetStructSize(); - return {wpi::UnpackStruct(data), - wpi::UnpackStruct(data)}; + constexpr size_t innerSize = wpi::util::GetStructSize(); + return {wpi::util::UnpackStruct(data), + wpi::util::UnpackStruct(data)}; } static void Pack(std::span data, const Outer& value) { - constexpr size_t innerSize = wpi::GetStructSize(); - wpi::PackStruct<0>(data, value.inner); - wpi::PackStruct(data, value.c); + constexpr size_t innerSize = wpi::util::GetStructSize(); + wpi::util::PackStruct<0>(data, value.inner); + wpi::util::PackStruct(data, value.c); } static void ForEachNested( std::invocable auto fn) { - wpi::ForEachStructSchema(fn); + wpi::util::ForEachStructSchema(fn); } }; diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp b/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp index c1ab2b42b..9422c8a2f 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp +++ b/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp @@ -9,13 +9,13 @@ void cleanup_safethread_gil(); #ifndef __FRC_SYSTEMCORE__ -namespace wpi::impl { +namespace wpi::util::impl { void ResetSendableRegistry(); -} // namespace wpi::impl +} // namespace wpi::util::impl void cleanup_sendable_registry() { py::gil_scoped_release unlock; - wpi::impl::ResetSendableRegistry(); + wpi::util::impl::ResetSendableRegistry(); } #else diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/safethread_gil.cpp b/subprojects/robotpy-wpiutil/wpiutil/src/safethread_gil.cpp index c7bb7ba70..4f6d43937 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/safethread_gil.cpp +++ b/subprojects/robotpy-wpiutil/wpiutil/src/safethread_gil.cpp @@ -6,7 +6,7 @@ using OnThreadStartFn = void *(*)(); using OnThreadEndFn = void (*)(void *); -namespace wpi::impl { +namespace wpi::util::impl { void SetSafeThreadNotifiers(OnThreadStartFn OnStart, OnThreadEndFn OnEnd); } @@ -59,7 +59,7 @@ void setup_safethread_gil() { atexit.attr("register")( py::cpp_function([]() { g_gilstate_managed = false; })); - wpi::impl::SetSafeThreadNotifiers(on_safe_thread_start, on_safe_thread_end); + wpi::util::impl::SetSafeThreadNotifiers(on_safe_thread_start, on_safe_thread_end); } void cleanup_safethread_gil() { g_gilstate_managed = false; } diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/stacktracehook.cpp b/subprojects/robotpy-wpiutil/wpiutil/src/stacktracehook.cpp index 97e560229..ab56e1db6 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/stacktracehook.cpp +++ b/subprojects/robotpy-wpiutil/wpiutil/src/stacktracehook.cpp @@ -1,6 +1,6 @@ #include -#include +#include "wpi/util/StackTrace.hpp" py::object &get_hook_ref() { static py::object hook; @@ -9,7 +9,7 @@ py::object &get_hook_ref() { std::string final_py_stack_trace_hook(int offset) { std::string msg = "\tat \n"; - msg += wpi::GetStackTraceDefault(offset); + msg += wpi::util::GetStackTraceDefault(offset); return msg; } @@ -25,16 +25,16 @@ std::string py_stack_trace_hook(int offset) { e.discard_as_unraisable("wpiutil._stacktrace._stack_trace_hook"); } - return wpi::GetStackTraceDefault(offset); + return wpi::util::GetStackTraceDefault(offset); } void setup_stack_trace_hook(py::object fn) { get_hook_ref() = fn; - wpi::SetGetStackTraceImpl(py_stack_trace_hook); + wpi::util::SetGetStackTraceImpl(py_stack_trace_hook); } void cleanup_stack_trace_hook() { - wpi::SetGetStackTraceImpl(final_py_stack_trace_hook); + wpi::util::SetGetStackTraceImpl(final_py_stack_trace_hook); // release the function during interpreter shutdown auto &hook = get_hook_ref(); diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_array_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_array_type_caster.h index 0c3d61922..b3955b79d 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_array_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_array_type_caster.h @@ -2,7 +2,7 @@ #include #include -#include +#include "wpi/util/array.hpp" namespace pybind11 { namespace detail { @@ -24,15 +24,15 @@ struct wpi_array_name_maker<1> { }; template -struct type_caster> { +struct type_caster> { using value_conv = make_caster; - // Have to copy/paste PYBIND11_TYPE_CASTER implementation because wpi::array + // Have to copy/paste PYBIND11_TYPE_CASTER implementation because wpi::util::array // is not default constructable // // begin PYBIND11_TYPE_CASTER protected: - wpi::array value{wpi::empty_array_t{}}; + wpi::util::array value{wpi::util::empty_array_t{}}; // An empty tuple is pretty useless static_assert(Size > 0, "empty array not supported"); @@ -41,7 +41,7 @@ struct type_caster> { static constexpr auto name = const_name("Tuple[") + wpi_array_name_maker::make(value_conv::name) + const_name("]"); template < typename T_, - enable_if_t, remove_cv_t>::value, + enable_if_t, remove_cv_t>::value, int> = 0> static handle cast(T_ *src, return_value_policy policy, handle parent) { if (!src) @@ -54,9 +54,9 @@ struct type_caster> { return cast(*src, policy, parent); } } - operator wpi::array *() { return &value; } - operator wpi::array &() { return value; } - operator wpi::array &&() && { return std::move(value); } + operator wpi::util::array *() { return &value; } + operator wpi::util::array &() { return value; } + operator wpi::util::array &&() && { return std::move(value); } template using cast_op_type = pybind11::detail::movable_cast_op_type; // end PYBIND11_TYPE_CASTER diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_ct_string_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_ct_string_type_caster.h index 702afcf52..0a83d63b8 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_ct_string_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_ct_string_type_caster.h @@ -3,14 +3,14 @@ #include -#include +#include "wpi/util/ct_string.hpp" namespace pybind11 { namespace detail { template -struct type_caster> { - using str_type = wpi::ct_string; +struct type_caster> { + using str_type = wpi::util::ct_string; PYBIND11_TYPE_CASTER(str_type, const_name(PYBIND11_STRING_NAME)); // TODO @@ -54,8 +54,8 @@ struct type_caster> { }; // template -// struct type_caster> -// : string_caster, false> {}; +// struct type_caster> +// : string_caster, false> {}; } // namespace detail } // namespace pybind11 diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_json_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_json_type_caster.h index 66c87ab71..b10cddd3c 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_json_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_json_type_caster.h @@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "wpi/json.h" +#include "wpi/util/json.hpp" #include "pybind11/pybind11.h" @@ -47,7 +47,7 @@ namespace pyjson using number_unsigned_t = uint64_t; using number_integer_t = int64_t; - inline py::object from_json(const wpi::json& j) + inline py::object from_json(const wpi::util::json& j) { if (j.is_null()) { @@ -85,7 +85,7 @@ namespace pyjson else // Object { py::dict obj; - for (wpi::json::const_iterator it = j.cbegin(); it != j.cend(); ++it) + for (wpi::util::json::const_iterator it = j.cbegin(); it != j.cend(); ++it) { obj[py::str(it.key())] = from_json(it.value()); } @@ -93,7 +93,7 @@ namespace pyjson } } - inline wpi::json to_json(const py::handle& obj) + inline wpi::util::json to_json(const py::handle& obj) { if (obj.ptr() == nullptr || obj.is_none()) { @@ -144,7 +144,7 @@ namespace pyjson } if (py::isinstance(obj) || py::isinstance(obj)) { - auto out = wpi::json::array(); + auto out = wpi::util::json::array(); for (const py::handle value : obj) { out.push_back(to_json(value)); @@ -153,7 +153,7 @@ namespace pyjson } if (py::isinstance(obj)) { - auto out = wpi::json::object(); + auto out = wpi::util::json::object(); for (const py::handle key : obj) { if (py::isinstance(key)) { @@ -174,7 +174,7 @@ namespace pyjson } // nlohmann_json serializers -namespace wpi +namespace wpi::util { #define MAKE_NLJSON_SERIALIZER_DESERIALIZER(T) \ template <> \ @@ -229,10 +229,10 @@ namespace pybind11 { namespace detail { - template <> struct type_caster + template <> struct type_caster { public: - PYBIND11_TYPE_CASTER(wpi::json, _("wpiutil.json")); + PYBIND11_TYPE_CASTER(wpi::util::json, _("wpiutil.json")); bool load(handle src, bool convert) { @@ -249,7 +249,7 @@ namespace pybind11 // } } - static handle cast(wpi::json src, return_value_policy /* policy */, handle /* parent */) + static handle cast(wpi::util::json src, return_value_policy /* policy */, handle /* parent */) { object obj = pyjson::from_json(src); return obj.release(); diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallset_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallset_type_caster.h index e3c31e161..6e1cb4c05 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallset_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallset_type_caster.h @@ -4,15 +4,15 @@ #include #include -#include +#include "wpi/util/SmallSet.hpp" namespace pybind11 { namespace detail { -template struct type_caster> - : set_caster, Type> { }; +template struct type_caster> + : set_caster, Type> { }; } // namespace detail } // namespace pybind11 \ No newline at end of file diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvector_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvector_type_caster.h index 7c899be47..7813732a8 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvector_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvector_type_caster.h @@ -4,15 +4,15 @@ #include #include -#include +#include "wpi/util/SmallVector.hpp" namespace pybind11 { namespace detail { -template struct type_caster> - : list_caster, Type> { }; +template struct type_caster> + : list_caster, Type> { }; } // namespace detail } // namespace pybind11 \ No newline at end of file diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvectorimpl_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvectorimpl_type_caster.h index 5ab35e87e..2f791e83d 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvectorimpl_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_smallvectorimpl_type_caster.h @@ -3,7 +3,7 @@ #include #include -#include +#include "wpi/util/SmallVector.hpp" namespace pybind11 { @@ -11,7 +11,7 @@ namespace detail { -template struct type_caster> { +template struct type_caster> { using value_conv = make_caster; // Have to copy/paste PYBIND11_TYPE_CASTER implementation because SmallVectorImpl @@ -19,10 +19,10 @@ template struct type_caster> { // // begin PYBIND11_TYPE_CASTER protected: - wpi::SmallVector value; + wpi::util::SmallVector value; public: static constexpr auto name = _("List[") + value_conv::name + _("]"); - template , remove_cv_t>::value, int> = 0> + template , remove_cv_t>::value, int> = 0> static handle cast(T_ *src, return_value_policy policy, handle parent) { if (!src) return none().release(); if (policy == return_value_policy::take_ownership) { @@ -31,9 +31,9 @@ template struct type_caster> { return cast(*src, policy, parent); } } - operator wpi::SmallVectorImpl*() { return &value; } - operator wpi::SmallVectorImpl&() { return value; } - operator wpi::SmallVectorImpl&&() && { return std::move(value); } + operator wpi::util::SmallVectorImpl*() { return &value; } + operator wpi::util::SmallVectorImpl&() { return value; } + operator wpi::util::SmallVectorImpl&&() && { return std::move(value); } template using cast_op_type = pybind11::detail::movable_cast_op_type; // end PYBIND11_TYPE_CASTER diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_span_type_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_span_type_caster.h index 99397a5cf..22f8c6dd5 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_span_type_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_span_type_caster.h @@ -4,7 +4,7 @@ #include #include -#include +#include "wpi/util/SmallVector.hpp" #include namespace pybind11 { @@ -82,7 +82,7 @@ template struct type_caster using value_type = typename std::remove_cv::type; PYBIND11_TYPE_CASTER(span_type, _("List[") + value_conv::name + _("]")); - wpi::SmallVector vec; + wpi::util::SmallVector vec; bool load(handle src, bool convert) { if (!isinstance(src) || isinstance(src)) return false; diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_string_map_caster.h b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_string_map_caster.h index 6ffc2eb72..581d0a8bb 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_string_map_caster.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/type_casters/wpi_string_map_caster.h @@ -4,7 +4,7 @@ #include #include -#include +#include "wpi/util/StringMap.hpp" namespace pybind11 { @@ -12,8 +12,8 @@ namespace detail { template -struct type_caster> - : map_caster, std::string, Value> { }; +struct type_caster> + : map_caster, std::string, Value> { }; } // namespace detail } // namespace pybind11 \ No newline at end of file diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct.h b/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct.h index f9b3876c8..7b11b244a 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct.h +++ b/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct.h @@ -6,7 +6,7 @@ #include #include -#include +#include "wpi/util/struct/Struct.hpp" #include #include @@ -103,38 +103,38 @@ struct WPyStructConverter { // static C++ converter template struct WPyStructCppConverter : WPyStructConverter { std::string_view GetTypeName() const override { - return wpi::Struct::GetTypeName(); + return wpi::util::Struct::GetTypeName(); } - size_t GetSize() const override { return wpi::Struct::GetSize(); } + size_t GetSize() const override { return wpi::util::Struct::GetSize(); } std::string_view GetSchema() const override { - return wpi::Struct::GetSchema(); + return wpi::util::Struct::GetSchema(); } void Pack(std::span data, const WPyStruct &value) const override { py::gil_scoped_acquire gil; const T &v = value.py.cast(); - wpi::Struct::Pack(data, v); + wpi::util::Struct::Pack(data, v); } WPyStruct Unpack(std::span data) const override { py::gil_scoped_acquire gil; - return WPyStruct{py::cast(wpi::UnpackStruct(data))}; + return WPyStruct{py::cast(wpi::util::UnpackStruct(data))}; } // void UnpackInto(WPyStruct *pyv, // std::span data) const override { // py::gil_scoped_acquire gil; // T *v = pyv->py.cast(); - // wpi::UnpackStructInto(v, data); + // wpi::util::UnpackStructInto(v, data); // } void ForEachNested( const std::function &fn) const override { - if constexpr (wpi::HasNestedStruct) { - wpi::Struct::ForEachNested(fn); + if constexpr (wpi::util::HasNestedStruct) { + wpi::util::Struct::ForEachNested(fn); } } }; @@ -224,7 +224,7 @@ struct WPyStructPyConverter : WPyStructConverter { } }; -// passed as I... to the wpi::Struct methods +// passed as I... to the wpi::util::Struct methods struct WPyStructInfo { WPyStructInfo() = default; WPyStructInfo(const py::type &t) { @@ -275,7 +275,7 @@ struct WPyStructInfo { }; // Leverages the converter stored in WPyStructInfo to do the actual work -template <> struct wpi::Struct { +template <> struct wpi::util::Struct { static std::string_view GetTypeName(const WPyStructInfo &info) { return info->GetTypeName(); } @@ -310,8 +310,8 @@ template <> struct wpi::Struct { } }; -static_assert(wpi::StructSerializable); -static_assert(wpi::HasNestedStruct); +static_assert(wpi::util::StructSerializable); +static_assert(wpi::util::HasNestedStruct); // This breaks on readonly structs, so we disable for now -// static_assert(wpi::MutableStructSerializable); +// static_assert(wpi::util::MutableStructSerializable); diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct_fns.cpp b/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct_fns.cpp index 730cb7193..739d56a80 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct_fns.cpp +++ b/subprojects/robotpy-wpiutil/wpiutil/src/wpistruct/wpystruct_fns.cpp @@ -5,28 +5,28 @@ void forEachNested( const py::type &t, const std::function &fn) { WPyStructInfo info(t); - wpi::ForEachStructSchema(fn, info); + wpi::util::ForEachStructSchema(fn, info); } py::str getTypeName(const py::type &t) { WPyStructInfo info(t); - return wpi::GetStructTypeName(info); + return wpi::util::GetStructTypeName(info); } py::str getSchema(const py::type &t) { WPyStructInfo info(t); - return wpi::GetStructSchema(info); + return wpi::util::GetStructSchema(info); } size_t getSize(const py::type &t) { WPyStructInfo info(t); - return wpi::GetStructSize(info); + return wpi::util::GetStructSize(info); } py::bytes pack(const WPyStruct &v) { WPyStructInfo info(v); - auto sz = wpi::GetStructSize(info); + auto sz = wpi::util::GetStructSize(info); PyObject *b = PyBytes_FromStringAndSize(NULL, sz); if (b == NULL) { throw py::error_already_set(); @@ -40,7 +40,7 @@ py::bytes pack(const WPyStruct &v) { } auto s = std::span((uint8_t *)pybuf, pysz); - wpi::PackStruct(s, v, info); + wpi::util::PackStruct(s, v, info); return py::reinterpret_steal(b); } @@ -52,7 +52,7 @@ py::bytes packArray(const py::sequence &seq) { } WPyStructInfo info(py::type::of(seq[0])); - auto sz = wpi::GetStructSize(info); + auto sz = wpi::util::GetStructSize(info); auto total = sz*len; PyObject *b = PyBytes_FromStringAndSize(NULL, total); @@ -72,7 +72,7 @@ py::bytes packArray(const py::sequence &seq) { for (const auto &v: seq) { WPyStruct wv(v); auto s = std::span((uint8_t *)pybuf, sz); - wpi::PackStruct(s, wv, info); + wpi::util::PackStruct(s, wv, info); pybuf += sz; } @@ -81,7 +81,7 @@ py::bytes packArray(const py::sequence &seq) { void packInto(const WPyStruct &v, py::buffer &b) { WPyStructInfo info(v); - py::ssize_t sz = wpi::GetStructSize(info); + py::ssize_t sz = wpi::util::GetStructSize(info); auto req = b.request(); if (req.itemsize != 1) { @@ -95,12 +95,12 @@ void packInto(const WPyStruct &v, py::buffer &b) { } auto s = std::span((uint8_t *)req.ptr, req.size); - wpi::PackStruct(s, v, info); + wpi::util::PackStruct(s, v, info); } WPyStruct unpack(const py::type &t, const py::buffer &b) { WPyStructInfo info(t); - py::ssize_t sz = wpi::GetStructSize(info); + py::ssize_t sz = wpi::util::GetStructSize(info); auto req = b.request(); if (req.itemsize != 1) { @@ -114,12 +114,12 @@ WPyStruct unpack(const py::type &t, const py::buffer &b) { } auto s = std::span((const uint8_t *)req.ptr, req.size); - return wpi::UnpackStruct(s, info); + return wpi::util::UnpackStruct(s, info); } py::typing::List unpackArray(const py::type &t, const py::buffer &b) { WPyStructInfo info(t); - py::ssize_t sz = wpi::GetStructSize(info); + py::ssize_t sz = wpi::util::GetStructSize(info); auto req = b.request(); if (req.itemsize != 1) { @@ -137,7 +137,7 @@ py::typing::List unpackArray(const py::type &t, const py::buffer &b) const uint8_t *ptr = (const uint8_t *)req.ptr; for (py::ssize_t i = 0; i < items; i++) { auto s = std::span(ptr, sz); - auto v = wpi::UnpackStruct(s, info); + auto v = wpi::util::UnpackStruct(s, info); // steals a reference PyList_SET_ITEM(a.ptr(), i, v.py.inc_ref().ptr()); ptr += sz; @@ -148,7 +148,7 @@ py::typing::List unpackArray(const py::type &t, const py::buffer &b) // void unpackInto(const py::buffer &b, WPyStruct *v) { // WPyStructInfo info(*v); -// py::ssize_t sz = wpi::GetStructSize(info); +// py::ssize_t sz = wpi::util::GetStructSize(info); // auto req = b.request(); // if (req.itemsize != 1) { @@ -162,5 +162,5 @@ py::typing::List unpackArray(const py::type &t, const py::buffer &b) // } // auto s = std::span((const uint8_t *)req.ptr, req.size); -// wpi::UnpackStructInto(v, s, info); +// wpi::util::UnpackStructInto(v, s, info); // } diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index 78620144c..ba2b4a443 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-xrp==2027.0.0a3", - "wpilib==2027.0.0a3", + "robotpy-native-xrp==0.0.0", + "wpilib==0.0.0", ] [project] name = "robotpy-xrp" -version = "2027.0.0a3" +version = "0.0.0" description = "Binary wrapper for WPILib XRP Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-xrp==2027.0.0a3", - "wpilib==2027.0.0a3" + "robotpy-native-xrp==0.0.0", + "wpilib==0.0.0" ] [project.entry-points."robotpy_sim.2027"] @@ -34,7 +34,7 @@ version_file = "xrp/version.py" artifact_id = "halsim_xrp" group_id = "edu.wpi.first.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +version = "0.0.0" use_headers = false extract_to = "xrp/extension" @@ -58,9 +58,9 @@ depends = ["wpilib", "wpimath_geometry"] [tool.semiwrap.extension_modules."xrp._xrp".headers] # frc/xrp -XRPGyro = "frc/xrp/XRPGyro.h" -XRPMotor = "frc/xrp/XRPMotor.h" -XRPOnBoardIO = "frc/xrp/XRPOnBoardIO.h" -XRPRangefinder = "frc/xrp/XRPRangefinder.h" -XRPReflectanceSensor = "frc/xrp/XRPReflectanceSensor.h" -XRPServo = "frc/xrp/XRPServo.h" +XRPGyro = "wpi/xrp/XRPGyro.hpp" +XRPMotor = "wpi/xrp/XRPMotor.hpp" +XRPOnBoardIO = "wpi/xrp/XRPOnBoardIO.hpp" +XRPRangefinder = "wpi/xrp/XRPRangefinder.hpp" +XRPReflectanceSensor = "wpi/xrp/XRPReflectanceSensor.hpp" +XRPServo = "wpi/xrp/XRPServo.hpp" diff --git a/subprojects/robotpy-xrp/semiwrap/XRPGyro.yml b/subprojects/robotpy-xrp/semiwrap/XRPGyro.yml index e5726f252..4f83b7806 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPGyro.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPGyro.yml @@ -1,5 +1,5 @@ classes: - frc::XRPGyro: + wpi::xrp::XRPGyro: methods: XRPGyro: GetAngle: diff --git a/subprojects/robotpy-xrp/semiwrap/XRPMotor.yml b/subprojects/robotpy-xrp/semiwrap/XRPMotor.yml index a534dc999..5845840c2 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPMotor.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPMotor.yml @@ -1,5 +1,5 @@ classes: - frc::XRPMotor: + wpi::xrp::XRPMotor: methods: XRPMotor: Set: diff --git a/subprojects/robotpy-xrp/semiwrap/XRPOnBoardIO.yml b/subprojects/robotpy-xrp/semiwrap/XRPOnBoardIO.yml index 3ea7645c3..cb60a5a29 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPOnBoardIO.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPOnBoardIO.yml @@ -1,5 +1,5 @@ classes: - frc::XRPOnBoardIO: + wpi::xrp::XRPOnBoardIO: attributes: kMessageInterval: m_nextMessageTime: diff --git a/subprojects/robotpy-xrp/semiwrap/XRPRangefinder.yml b/subprojects/robotpy-xrp/semiwrap/XRPRangefinder.yml index 1a7a05365..4b8e880af 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPRangefinder.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPRangefinder.yml @@ -1,4 +1,4 @@ classes: - frc::XRPRangefinder: + wpi::xrp::XRPRangefinder: methods: GetDistance: diff --git a/subprojects/robotpy-xrp/semiwrap/XRPReflectanceSensor.yml b/subprojects/robotpy-xrp/semiwrap/XRPReflectanceSensor.yml index 5052c0365..1d70286df 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPReflectanceSensor.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPReflectanceSensor.yml @@ -1,5 +1,5 @@ classes: - frc::XRPReflectanceSensor: + wpi::xrp::XRPReflectanceSensor: methods: GetLeftReflectanceValue: GetRightReflectanceValue: diff --git a/subprojects/robotpy-xrp/semiwrap/XRPServo.yml b/subprojects/robotpy-xrp/semiwrap/XRPServo.yml index 5fc8e1bf6..01890a062 100644 --- a/subprojects/robotpy-xrp/semiwrap/XRPServo.yml +++ b/subprojects/robotpy-xrp/semiwrap/XRPServo.yml @@ -1,5 +1,5 @@ classes: - frc::XRPServo: + wpi::xrp::XRPServo: methods: XRPServo: SetAngle: From 1c52565815f9528de6c22d6388b308c0782b86b7 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 12 Nov 2025 21:41:29 -0500 Subject: [PATCH 2/4] Updated dependencies - build-system.requires: pyntcore==2027.0.0a3 - build-system.requires: robotpy-hal==2027.0.0a3 - build-system.requires: robotpy-native-apriltag==2027.0.0a3 - build-system.requires: robotpy-native-datalog==2027.0.0a3 - build-system.requires: robotpy-native-ntcore==2027.0.0a3 - build-system.requires: robotpy-native-romi==2027.0.0a3 - build-system.requires: robotpy-native-wpihal==2027.0.0a3 - build-system.requires: robotpy-native-wpilib==2027.0.0a3 - build-system.requires: robotpy-native-wpimath==2027.0.0a3 - build-system.requires: robotpy-native-wpinet==2027.0.0a3 - build-system.requires: robotpy-native-wpiutil==2027.0.0a3 - build-system.requires: robotpy-native-xrp==2027.0.0a3 - build-system.requires: robotpy-wpilog==2027.0.0a3 - build-system.requires: robotpy-wpimath==2027.0.0a3 - build-system.requires: robotpy-wpinet==2027.0.0a3 - build-system.requires: robotpy-wpiutil==2027.0.0a3 - build-system.requires: wpilib==2027.0.0a3 - lib updated to 2027.0.0-alpha-3-86-g418b381 - project.dependencies: pyntcore==2027.0.0a3 - project.dependencies: robotpy-hal==2027.0.0a3 - project.dependencies: robotpy-native-apriltag==2027.0.0a3 - project.dependencies: robotpy-native-datalog==2027.0.0a3 - project.dependencies: robotpy-native-ntcore==2027.0.0a3 - project.dependencies: robotpy-native-romi==2027.0.0a3 - project.dependencies: robotpy-native-wpihal==2027.0.0a3 - project.dependencies: robotpy-native-wpilib==2027.0.0a3 - project.dependencies: robotpy-native-wpimath==2027.0.0a3 - project.dependencies: robotpy-native-wpinet==2027.0.0a3 - project.dependencies: robotpy-native-wpiutil==2027.0.0a3 - project.dependencies: robotpy-native-xrp==2027.0.0a3 - project.dependencies: robotpy-wpilog==2027.0.0a3 - project.dependencies: robotpy-wpimath==2027.0.0a3 - project.dependencies: robotpy-wpinet==2027.0.0a3 - project.dependencies: robotpy-wpiutil==2027.0.0a3 - project.dependencies: wpilib==2027.0.0a3 - pyntcore updated to 2027.0.0a3 - repo updated to https://frcmaven.wpi.edu/artifactory/development-2027 - robotpy-apriltag updated to 2027.0.0a3 - robotpy-hal updated to 2027.0.0a3 - robotpy-native-apriltag updated to 2027.0.0a3 - robotpy-native-datalog updated to 2027.0.0a3 - robotpy-native-ntcore updated to 2027.0.0a3 - robotpy-native-romi updated to 2027.0.0a3 - robotpy-native-wpihal updated to 2027.0.0a3 - robotpy-native-wpilib updated to 2027.0.0a3 - robotpy-native-wpimath updated to 2027.0.0a3 - robotpy-native-wpinet updated to 2027.0.0a3 - robotpy-native-wpiutil updated to 2027.0.0a3 - robotpy-native-xrp updated to 2027.0.0a3 - robotpy-romi updated to 2027.0.0a3 - robotpy-wpilog updated to 2027.0.0a3 - robotpy-wpimath updated to 2027.0.0a3 - robotpy-wpinet updated to 2027.0.0a3 - robotpy-wpiutil updated to 2027.0.0a3 - robotpy-xrp updated to 2027.0.0a3 - wpilib updated to 2027.0.0a3 --- rdev.toml | 4 +-- subprojects/pyntcore/pyproject.toml | 18 ++++++------- subprojects/robotpy-apriltag/pyproject.toml | 14 +++++----- subprojects/robotpy-cscore/pyproject.toml | 8 +++--- subprojects/robotpy-hal/pyproject.toml | 14 +++++----- .../robotpy-halsim-ds-socket/pyproject.toml | 4 +-- subprojects/robotpy-halsim-gui/pyproject.toml | 4 +-- subprojects/robotpy-halsim-ws/pyproject.toml | 8 +++--- .../robotpy-native-apriltag/pyproject.toml | 14 +++++----- .../robotpy-native-datalog/pyproject.toml | 10 +++---- .../robotpy-native-ntcore/pyproject.toml | 18 ++++++------- .../robotpy-native-romi/pyproject.toml | 10 +++---- .../robotpy-native-wpihal/pyproject.toml | 14 +++++----- .../robotpy-native-wpilib/pyproject.toml | 26 +++++++++---------- .../robotpy-native-wpimath/pyproject.toml | 10 +++---- .../robotpy-native-wpinet/pyproject.toml | 10 +++---- .../robotpy-native-wpiutil/pyproject.toml | 6 ++--- subprojects/robotpy-native-xrp/pyproject.toml | 10 +++---- subprojects/robotpy-romi/pyproject.toml | 10 +++---- subprojects/robotpy-wpilib/pyproject.toml | 22 ++++++++-------- subprojects/robotpy-wpilog/pyproject.toml | 10 +++---- subprojects/robotpy-wpimath/pyproject.toml | 10 +++---- subprojects/robotpy-wpinet/pyproject.toml | 10 +++---- subprojects/robotpy-wpiutil/pyproject.toml | 6 ++--- subprojects/robotpy-xrp/pyproject.toml | 14 +++++----- 25 files changed, 142 insertions(+), 142 deletions(-) diff --git a/rdev.toml b/rdev.toml index 80503c52a..d2480770a 100644 --- a/rdev.toml +++ b/rdev.toml @@ -22,8 +22,8 @@ wrapper = "2027.0.0a3" [params] -wpilib_bin_version = "2027.0.0-alpha-3" -wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release-2027" +wpilib_bin_version = "2027.0.0-alpha-3-86-g418b381" +wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027" # wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027" # Don't update these maven artifacts diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index 1401c7c14..a38bbbedf 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -5,26 +5,26 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-ntcore==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpinet==0.0.0", - "robotpy-wpilog==0.0.0", + "robotpy-native-ntcore==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpinet==2027.0.0a3", + "robotpy-wpilog==2027.0.0a3", ] [project] name = "pyntcore" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrappers for the FRC ntcore library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-ntcore==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpinet==0.0.0", - "robotpy-wpilog==0.0.0", + "robotpy-native-ntcore==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpinet==2027.0.0a3", + "robotpy-wpilog==2027.0.0a3", ] [project.urls] diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index 83e4728f6..ff56d4f8d 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -5,23 +5,23 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-apriltag==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpimath==0.0.0", + "robotpy-native-apriltag==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpimath==2027.0.0a3", ] [project] name = "robotpy-apriltag" -version = "0.0.0" +version = "2027.0.0a3" description = "RobotPy bindings for WPILib's AprilTag library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-apriltag==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpimath==0.0.0", + "robotpy-native-apriltag==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpimath==2027.0.0a3", ] [project.urls] diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 5d2f5cbf5..eacb3e2d5 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -43,8 +43,8 @@ version_file = "cscore/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cscore-cpp" group_id = "edu.wpi.first.cscore" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" staticlibs = ["cscore"] extract_to = "lib" @@ -52,8 +52,8 @@ extract_to = "lib" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cameraserver-cpp" group_id = "edu.wpi.first.cameraserver" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" staticlibs = ["cameraserver"] extract_to = "lib" diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 2c14ae0a5..d6ae6053e 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -4,23 +4,23 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "pyntcore==0.0.0", - "robotpy-native-wpihal==0.0.0", - "robotpy-wpiutil==0.0.0", + "pyntcore==2027.0.0a3", + "robotpy-native-wpihal==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", ] [project] name = "robotpy-hal" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC HAL" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "pyntcore==0.0.0", - "robotpy-native-wpihal==0.0.0", - "robotpy-wpiutil==0.0.0", + "pyntcore==2027.0.0a3", + "robotpy-native-wpihal==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", ] [project.urls] diff --git a/subprojects/robotpy-halsim-ds-socket/pyproject.toml b/subprojects/robotpy-halsim-ds-socket/pyproject.toml index 5aa9c1ebc..4c0a9e74c 100644 --- a/subprojects/robotpy-halsim-ds-socket/pyproject.toml +++ b/subprojects/robotpy-halsim-ds-socket/pyproject.toml @@ -28,8 +28,8 @@ version_file = "halsim_ds_socket/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ds_socket" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" use_headers = false extract_to = "halsim_ds_socket" diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index 7f164a9a4..8fe00ad56 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -36,8 +36,8 @@ version_file = "halsim_gui/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_gui" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" use_headers = true libs = ["halsim_gui"] diff --git a/subprojects/robotpy-halsim-ws/pyproject.toml b/subprojects/robotpy-halsim-ws/pyproject.toml index 9aed54116..e4f01ae7e 100644 --- a/subprojects/robotpy-halsim-ws/pyproject.toml +++ b/subprojects/robotpy-halsim-ws/pyproject.toml @@ -33,8 +33,8 @@ version_file = "halsim_ws/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_server" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" use_headers = false extract_to = "halsim_ws/server" @@ -43,8 +43,8 @@ libs = ["halsim_ws_server"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_client" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-3" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" use_headers = false extract_to = "halsim_ws/client" diff --git a/subprojects/robotpy-native-apriltag/pyproject.toml b/subprojects/robotpy-native-apriltag/pyproject.toml index ba1bded93..467bffbfd 100644 --- a/subprojects/robotpy-native-apriltag/pyproject.toml +++ b/subprojects/robotpy-native-apriltag/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpimath==2027.0.0a3", ] [project] name = "robotpy-native-apriltag" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib AprilTag Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpimath==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -25,8 +25,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "apriltag-cpp" group_id = "edu.wpi.first.apriltag" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/apriltag" libs = ["apriltag"] diff --git a/subprojects/robotpy-native-datalog/pyproject.toml b/subprojects/robotpy-native-datalog/pyproject.toml index c9c1e733a..8ba7c6e3b 100644 --- a/subprojects/robotpy-native-datalog/pyproject.toml +++ b/subprojects/robotpy-native-datalog/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [project] name = "robotpy-native-datalog" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Utility Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -24,8 +24,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "datalog-cpp" group_id = "edu.wpi.first.datalog" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/datalog" libs = ["datalog"] diff --git a/subprojects/robotpy-native-ntcore/pyproject.toml b/subprojects/robotpy-native-ntcore/pyproject.toml index 29d4792de..85f078b32 100644 --- a/subprojects/robotpy-native-ntcore/pyproject.toml +++ b/subprojects/robotpy-native-ntcore/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpinet==0.0.0", - "robotpy-native-datalog==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-native-datalog==2027.0.0a3", ] [project] name = "robotpy-native-ntcore" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib NetworkTables Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpinet==0.0.0", - "robotpy-native-datalog==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-native-datalog==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -27,8 +27,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "ntcore-cpp" group_id = "edu.wpi.first.ntcore" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/ntcore" libs = ["ntcore"] diff --git a/subprojects/robotpy-native-romi/pyproject.toml b/subprojects/robotpy-native-romi/pyproject.toml index c3ef9dc83..81fd44c92 100644 --- a/subprojects/robotpy-native-romi/pyproject.toml +++ b/subprojects/robotpy-native-romi/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", ] [project] name = "robotpy-native-romi" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Romi support library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "romiVendordep-cpp" group_id = "edu.wpi.first.romiVendordep" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/romi" libs = ["romiVendordep"] diff --git a/subprojects/robotpy-native-wpihal/pyproject.toml b/subprojects/robotpy-native-wpihal/pyproject.toml index 1d8be210b..ac96d28c6 100644 --- a/subprojects/robotpy-native-wpihal/pyproject.toml +++ b/subprojects/robotpy-native-wpihal/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-ntcore==2027.0.0a3", ] [project] name = "robotpy-native-wpihal" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib HAL implementation" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-ntcore==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -25,8 +25,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "hal-cpp" group_id = "edu.wpi.first.hal" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/wpihal" libs = ["wpiHal"] diff --git a/subprojects/robotpy-native-wpilib/pyproject.toml b/subprojects/robotpy-native-wpilib/pyproject.toml index 852e1c70a..45f0b97c2 100644 --- a/subprojects/robotpy-native-wpilib/pyproject.toml +++ b/subprojects/robotpy-native-wpilib/pyproject.toml @@ -4,25 +4,25 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpinet==0.0.0", - "robotpy-native-ntcore==0.0.0", - "robotpy-native-wpimath==0.0.0", - "robotpy-native-wpihal==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-native-ntcore==2027.0.0a3", + "robotpy-native-wpimath==2027.0.0a3", + "robotpy-native-wpihal==2027.0.0a3", ] [project] name = "robotpy-native-wpilib" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Robotics Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", - "robotpy-native-wpinet==0.0.0", - "robotpy-native-ntcore==0.0.0", - "robotpy-native-wpimath==0.0.0", - "robotpy-native-wpihal==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-native-ntcore==2027.0.0a3", + "robotpy-native-wpimath==2027.0.0a3", + "robotpy-native-wpihal==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -31,8 +31,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpilibc-cpp" group_id = "edu.wpi.first.wpilibc" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/wpilib" libs = ["wpilibc"] diff --git a/subprojects/robotpy-native-wpimath/pyproject.toml b/subprojects/robotpy-native-wpimath/pyproject.toml index eb5b45b66..e536249e7 100644 --- a/subprojects/robotpy-native-wpimath/pyproject.toml +++ b/subprojects/robotpy-native-wpimath/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [project] name = "robotpy-native-wpimath" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Math Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpimath-cpp" group_id = "edu.wpi.first.wpimath" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/wpimath" libs = ["wpimath"] diff --git a/subprojects/robotpy-native-wpinet/pyproject.toml b/subprojects/robotpy-native-wpinet/pyproject.toml index 0c771c4fd..a872d4147 100644 --- a/subprojects/robotpy-native-wpinet/pyproject.toml +++ b/subprojects/robotpy-native-wpinet/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [project] name = "robotpy-native-wpinet" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Networking Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpinet-cpp" group_id = "edu.wpi.first.wpinet" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/wpinet" libs = ["wpinet"] diff --git a/subprojects/robotpy-native-wpiutil/pyproject.toml b/subprojects/robotpy-native-wpiutil/pyproject.toml index 9459ef83a..c001763b0 100644 --- a/subprojects/robotpy-native-wpiutil/pyproject.toml +++ b/subprojects/robotpy-native-wpiutil/pyproject.toml @@ -8,7 +8,7 @@ requires = [ [project] name = "robotpy-native-wpiutil" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib Utility Library" license = "BSD-3-Clause" @@ -22,8 +22,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpiutil-cpp" group_id = "edu.wpi.first.wpiutil" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/wpiutil" libs = ["wpiutil"] diff --git a/subprojects/robotpy-native-xrp/pyproject.toml b/subprojects/robotpy-native-xrp/pyproject.toml index c073a9e8a..fe341f4d7 100644 --- a/subprojects/robotpy-native-xrp/pyproject.toml +++ b/subprojects/robotpy-native-xrp/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", ] [project] name = "robotpy-native-xrp" -version = "0.0.0" +version = "2027.0.0a3" description = "WPILib XRP vendor library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "xrpVendordep-cpp" group_id = "edu.wpi.first.xrpVendordep" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" extract_to = "src/native/xrp" libs = ["xrpVendordep"] diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index 3ebd3cce3..189547334 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-romi==0.0.0", - "wpilib==0.0.0", + "robotpy-native-romi==2027.0.0a3", + "wpilib==2027.0.0a3", ] [project] name = "robotpy-romi" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for WPILib Romi Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-romi==0.0.0", - "wpilib==0.0.0" + "robotpy-native-romi==2027.0.0a3", + "wpilib==2027.0.0a3" ] [project.urls] diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 99afb6cb8..e356b915e 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -5,27 +5,27 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpilib==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpimath==0.0.0", - "robotpy-hal==0.0.0", - "pyntcore==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpimath==2027.0.0a3", + "robotpy-hal==2027.0.0a3", + "pyntcore==2027.0.0a3", ] [project] name = "wpilib" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC WPILib" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==0.0.0", - "robotpy-wpiutil==0.0.0", - "robotpy-wpimath==0.0.0", - "robotpy-hal==0.0.0", - "pyntcore==0.0.0", + "robotpy-native-wpilib==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", + "robotpy-wpimath==2027.0.0a3", + "robotpy-hal==2027.0.0a3", + "pyntcore==2027.0.0a3", "robotpy-cli~=2027.0.0a1" ] diff --git a/subprojects/robotpy-wpilog/pyproject.toml b/subprojects/robotpy-wpilog/pyproject.toml index 4bda639fd..841259350 100644 --- a/subprojects/robotpy-wpilog/pyproject.toml +++ b/subprojects/robotpy-wpilog/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-datalog==0.0.0", - "robotpy-wpiutil==0.0.0" + "robotpy-native-datalog==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3" ] [project] name = "robotpy-wpilog" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC wpilog library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-datalog==0.0.0", - "robotpy-wpiutil==0.0.0" + "robotpy-native-datalog==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3" ] [project.urls] diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 3a36a798a..b5d1f5e30 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpimath==0.0.0", - "robotpy-wpiutil==0.0.0", + "robotpy-native-wpimath==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", # "numpy", # broken in raspbian CI ] [project] name = "robotpy-wpimath" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC WPIMath library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpimath==0.0.0", - "robotpy-wpiutil==0.0.0", + "robotpy-native-wpimath==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3", ] [project.urls] diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index 1ebeca60a..2609db55f 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -6,21 +6,21 @@ requires = [ "semiwrap~=0.2.1", "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-wpinet==0.0.0", - "robotpy-wpiutil==0.0.0" + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3" ] [project] name = "robotpy-wpinet" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC wpinet library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpinet==0.0.0", - "robotpy-wpiutil==0.0.0" + "robotpy-native-wpinet==2027.0.0a3", + "robotpy-wpiutil==2027.0.0a3" ] [project.urls] diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index 8d5d8aa2c..9ca2ef1d1 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -5,19 +5,19 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [project] name = "robotpy-wpiutil" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for FRC WPIUtil library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpiutil==2027.0.0a3", ] [project.urls] diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index ba2b4a443..a14c344e6 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-xrp==0.0.0", - "wpilib==0.0.0", + "robotpy-native-xrp==2027.0.0a3", + "wpilib==2027.0.0a3", ] [project] name = "robotpy-xrp" -version = "0.0.0" +version = "2027.0.0a3" description = "Binary wrapper for WPILib XRP Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-xrp==0.0.0", - "wpilib==0.0.0" + "robotpy-native-xrp==2027.0.0a3", + "wpilib==2027.0.0a3" ] [project.entry-points."robotpy_sim.2027"] @@ -33,8 +33,8 @@ version_file = "xrp/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_xrp" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "0.0.0" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2027.0.0-alpha-3-86-g418b381" use_headers = false extract_to = "xrp/extension" From 45d4c9d4e90c16f2e7514fe6a81987bc65350013 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 12 Nov 2025 21:43:13 -0500 Subject: [PATCH 3/4] Hand update source files not updated from the mirror --- .../robotpy-cscore/cscore/src/main.cpp | 4 +-- .../robotpy-cscore/semiwrap/CameraServer.yml | 2 +- .../robotpy-cscore/semiwrap/cscore_cpp.yml | 24 +++++++------- .../robotpy-cscore/semiwrap/cscore_cv.yml | 8 ++--- .../robotpy-cscore/semiwrap/cscore_oo.yml | 32 +++++++++---------- .../halsim_gui/_ext/main.cpp | 4 +-- subprojects/robotpy-wpimath/pyproject.toml | 2 ++ 7 files changed, 39 insertions(+), 37 deletions(-) diff --git a/subprojects/robotpy-cscore/cscore/src/main.cpp b/subprojects/robotpy-cscore/cscore/src/main.cpp index 2255306b0..15fb40152 100644 --- a/subprojects/robotpy-cscore/cscore/src/main.cpp +++ b/subprojects/robotpy-cscore/cscore/src/main.cpp @@ -1,7 +1,7 @@ #include -#include "cscore_cpp.h" +#include "wpi/cs/cscore_cpp.hpp" SEMIWRAP_PYBIND11_MODULE(m) { initWrapper(m); @@ -9,7 +9,7 @@ SEMIWRAP_PYBIND11_MODULE(m) { static int unused; // the capsule needs something to reference py::capsule cleanup(&unused, [](void *) { // don't release gil until after calling this - cs::SetDefaultLogger(20 /* WPI_LOG_INFO */); + wpi::cs::SetDefaultLogger(20 /* WPI_LOG_INFO */); // but this MUST release the gil, or deadlock may occur py::gil_scoped_release __release; diff --git a/subprojects/robotpy-cscore/semiwrap/CameraServer.yml b/subprojects/robotpy-cscore/semiwrap/CameraServer.yml index 5da9f0f9a..4ac455fcb 100644 --- a/subprojects/robotpy-cscore/semiwrap/CameraServer.yml +++ b/subprojects/robotpy-cscore/semiwrap/CameraServer.yml @@ -3,7 +3,7 @@ extra_includes: - optional classes: - frc::CameraServer: + wpi::CameraServer: force_type_casters: - std::optional attributes: diff --git a/subprojects/robotpy-cscore/semiwrap/cscore_cpp.yml b/subprojects/robotpy-cscore/semiwrap/cscore_cpp.yml index 29c63fde3..431538684 100644 --- a/subprojects/robotpy-cscore/semiwrap/cscore_cpp.yml +++ b/subprojects/robotpy-cscore/semiwrap/cscore_cpp.yml @@ -6,7 +6,7 @@ functions: overloads: CS_Property, CS_Status*: ignore: true - CS_Property, wpi::SmallVectorImpl&, CS_Status*: + CS_Property, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true GetProperty: ignore: true @@ -24,7 +24,7 @@ functions: overloads: CS_Property, CS_Status*: ignore: true - CS_Property, wpi::SmallVectorImpl&, CS_Status*: + CS_Property, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true SetStringProperty: ignore: true @@ -48,13 +48,13 @@ functions: overloads: CS_Source, CS_Status*: ignore: true - CS_Source, wpi::SmallVectorImpl&, CS_Status*: + CS_Source, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true GetSourceDescription: overloads: CS_Source, CS_Status*: ignore: true - CS_Source, wpi::SmallVectorImpl&, CS_Status*: + CS_Source, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true GetSourceLastFrameTime: ignore: true @@ -82,7 +82,7 @@ functions: overloads: CS_Source, std::string_view, CS_Status*: ignore: true - CS_Source, const wpi::json&, CS_Status*: + CS_Source, const wpi::util::json&, CS_Status*: ignore: true GetSourceConfigJson: ignore: true @@ -146,13 +146,13 @@ functions: overloads: CS_Sink, CS_Status*: ignore: true - CS_Sink, wpi::SmallVectorImpl&, CS_Status*: + CS_Sink, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true GetSinkDescription: overloads: CS_Sink, CS_Status*: ignore: true - CS_Sink, wpi::SmallVectorImpl&, CS_Status*: + CS_Sink, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true GetSinkProperty: ignore: true @@ -166,7 +166,7 @@ functions: overloads: CS_Sink, std::string_view, CS_Status*: ignore: true - CS_Sink, const wpi::json&, CS_Status*: + CS_Sink, const wpi::util::json&, CS_Status*: ignore: true GetSinkConfigJson: ignore: true @@ -188,7 +188,7 @@ functions: overloads: CS_Sink, CS_Status*: ignore: true - CS_Sink, wpi::SmallVectorImpl&, CS_Status*: + CS_Sink, wpi::util::SmallVectorImpl&, CS_Status*: ignore: true SetSinkEnabled: ignore: true @@ -241,7 +241,7 @@ functions: GetNetworkInterfaces: ignore: true classes: - cs::UsbCameraInfo: + wpi::cs::UsbCameraInfo: attributes: dev: path: @@ -249,7 +249,7 @@ classes: otherPaths: vendorId: productId: - cs::VideoMode: + wpi::cs::VideoMode: force_no_trampoline: true ignored_bases: - CS_VideoMode @@ -268,7 +268,7 @@ classes: .def_readwrite("width", &VideoMode::width) .def_readwrite("height", &VideoMode::height) .def_readwrite("fps", &VideoMode::fps) - cs::RawEvent: + wpi::cs::RawEvent: attributes: kind: ignore: true diff --git a/subprojects/robotpy-cscore/semiwrap/cscore_cv.yml b/subprojects/robotpy-cscore/semiwrap/cscore_cv.yml index 90339a716..581bafd6f 100644 --- a/subprojects/robotpy-cscore/semiwrap/cscore_cv.yml +++ b/subprojects/robotpy-cscore/semiwrap/cscore_cv.yml @@ -23,7 +23,7 @@ functions: GrabSinkFrameTimeout: ignore: true classes: - cs::CvSource: + wpi::cs::CvSource: doc: A source for user code to provide OpenCV images as video frames. force_no_trampoline: true methods: @@ -34,7 +34,7 @@ classes: std::string_view, const VideoMode&: std::string_view, VideoMode::PixelFormat, int, int, int: PutFrame: - cs::CvSink: + wpi::cs::CvSink: doc: A sink for user code to accept video frames as OpenCV images. force_no_trampoline: true methods: @@ -47,14 +47,14 @@ classes: ignore: true GrabFrame: cpp_code: | - [](cs::CvSink &self, cv::Mat& image, double timeout) -> std::tuple { + [](wpi::cs::CvSink &self, cv::Mat& image, double timeout) -> std::tuple { py::gil_scoped_release unlock; auto result = self.GrabFrame(image, timeout); return std::make_tuple(result, image); } GrabFrameNoTimeout: cpp_code: | - [](cs::CvSink &self, cv::Mat& image) -> std::tuple { + [](wpi::cs::CvSink &self, cv::Mat& image) -> std::tuple { py::gil_scoped_release unlock; auto result = self.GrabFrameNoTimeout(image); return std::make_tuple(result, image); diff --git a/subprojects/robotpy-cscore/semiwrap/cscore_oo.yml b/subprojects/robotpy-cscore/semiwrap/cscore_oo.yml index e04b6281e..709f6dd33 100644 --- a/subprojects/robotpy-cscore/semiwrap/cscore_oo.yml +++ b/subprojects/robotpy-cscore/semiwrap/cscore_oo.yml @@ -1,6 +1,6 @@ classes: - cs::VideoProperty: + wpi::cs::VideoProperty: enums: Kind: methods: @@ -20,11 +20,11 @@ classes: GetString: overloads: '[const]': - wpi::SmallVectorImpl& [const]: + wpi::util::SmallVectorImpl& [const]: SetString: GetChoices: GetLastStatus: - cs::VideoSource: + wpi::cs::VideoSource: enums: Kind: ConnectionStrategy: @@ -52,7 +52,7 @@ classes: SetConfigJson: overloads: std::string_view: - const wpi::json&: + const wpi::util::json&: GetConfigJson: GetConfigJsonObject: GetActualFPS: @@ -61,7 +61,7 @@ classes: GetLastStatus: EnumerateSinks: EnumerateSources: - cs::VideoCamera: + wpi::cs::VideoCamera: force_no_trampoline: true enums: WhiteBalance: @@ -78,7 +78,7 @@ classes: SetExposureAuto: SetExposureHoldCurrent: SetExposureManual: - cs::UsbCamera: + wpi::cs::UsbCamera: force_no_trampoline: true methods: UsbCamera: @@ -91,10 +91,10 @@ classes: GetPath: GetInfo: SetConnectVerbose: - cs::HttpCamera: + wpi::cs::HttpCamera: force_no_trampoline: true constants: - - cs::HttpCamera::HttpCameraKind::kUnknown + - wpi::cs::HttpCamera::HttpCameraKind::kUnknown enums: HttpCameraKind: methods: @@ -113,7 +113,7 @@ classes: std::initializer_list: ignore: true GetUrls: - cs::AxisCamera: + wpi::cs::AxisCamera: force_no_trampoline: true methods: AxisCamera: @@ -124,7 +124,7 @@ classes: std::string_view, std::span: std::string_view, std::initializer_list: ignore: true - cs::ImageSource: + wpi::cs::ImageSource: force_no_trampoline: true methods: NotifyError: @@ -140,7 +140,7 @@ classes: const VideoProperty&, std::initializer_list: ignore: true ImageSource: - cs::VideoSink: + wpi::cs::VideoSink: enums: Kind: methods: @@ -155,7 +155,7 @@ classes: SetConfigJson: overloads: std::string_view: - const wpi::json&: + const wpi::util::json&: GetConfigJson: GetConfigJsonObject: SetSource: @@ -163,7 +163,7 @@ classes: GetSourceProperty: GetLastStatus: EnumerateSinks: - cs::MjpegServer: + wpi::cs::MjpegServer: force_no_trampoline: true methods: MjpegServer: @@ -177,20 +177,20 @@ classes: SetFPS: SetCompression: SetDefaultCompression: - cs::ImageSink: + wpi::cs::ImageSink: force_no_trampoline: true methods: SetDescription: GetError: SetEnabled: ImageSink: - cs::VideoEvent: + wpi::cs::VideoEvent: force_no_trampoline: true methods: GetSource: GetSink: GetProperty: - cs::VideoListener: + wpi::cs::VideoListener: methods: VideoListener: overloads: diff --git a/subprojects/robotpy-halsim-gui/halsim_gui/_ext/main.cpp b/subprojects/robotpy-halsim-gui/halsim_gui/_ext/main.cpp index 0bd2bb437..7399541df 100644 --- a/subprojects/robotpy-halsim-gui/halsim_gui/_ext/main.cpp +++ b/subprojects/robotpy-halsim-gui/halsim_gui/_ext/main.cpp @@ -1,8 +1,8 @@ #include -#include -#include +#include +#include SEMIWRAP_PYBIND11_MODULE(m) { diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index b5d1f5e30..67e6a4ea6 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -95,7 +95,9 @@ scan_headers_ignore = [ "gch/*", "sleipnir/*", "type_casters/*", + "unsupported/*", "wpi/units/*", + "wpimath/protobuf/*", "wpi/math/util/MathShared.hpp", From 405d89f459c3804309ab7de85d0350d64ebf4cff Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 12 Nov 2025 21:44:32 -0500 Subject: [PATCH 4/4] Update maven coordinates --- subprojects/robotpy-cscore/pyproject.toml | 26 +++++++++---------- .../robotpy-halsim-ds-socket/pyproject.toml | 2 +- subprojects/robotpy-halsim-gui/pyproject.toml | 2 +- subprojects/robotpy-halsim-ws/pyproject.toml | 4 +-- .../robotpy-native-apriltag/pyproject.toml | 2 +- .../robotpy-native-datalog/pyproject.toml | 2 +- .../robotpy-native-ntcore/pyproject.toml | 2 +- .../robotpy-native-romi/pyproject.toml | 2 +- .../robotpy-native-wpihal/pyproject.toml | 2 +- .../robotpy-native-wpilib/pyproject.toml | 2 +- .../robotpy-native-wpimath/pyproject.toml | 2 +- .../robotpy-native-wpinet/pyproject.toml | 2 +- .../robotpy-native-wpiutil/pyproject.toml | 2 +- subprojects/robotpy-native-xrp/pyproject.toml | 2 +- subprojects/robotpy-xrp/pyproject.toml | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index eacb3e2d5..9eafdf782 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -42,7 +42,7 @@ version_file = "cscore/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cscore-cpp" -group_id = "edu.wpi.first.cscore" +group_id = "org.wpilib.cscore" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" @@ -51,7 +51,7 @@ extract_to = "lib" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cameraserver-cpp" -group_id = "edu.wpi.first.cameraserver" +group_id = "org.wpilib.cameraserver" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" @@ -80,14 +80,14 @@ update_init = [ scan_headers_ignore = [ # Only wrapping the C++ API - "cscore.h", - "cscore_c.h", - "cscore_raw.h", + "wpi/cs/cscore.h", + "wpi/cs/cscore_c.h", + "wpi/cs/cscore_raw.h", # Not needed - "cameraserver/CameraServerShared.h", - "vision/VisionPipeline.h", - "vision/VisionRunner.h", + "wpi/cameraserver/CameraServerShared.hpp", + "wpi/vision/VisionPipeline.hpp", + "wpi/vision/VisionRunner.hpp", # Not wrapping OpenCV or cvnp "cvnp/*", @@ -104,13 +104,13 @@ includes = [ [tool.semiwrap.extension_modules."cscore._cscore".headers] # cameraserver -CameraServer = "cameraserver/CameraServer.h" +CameraServer = "wpi/cameraserver/CameraServer.hpp" # cscore -cscore_cpp = "cscore_cpp.h" -cscore_oo = "cscore_oo.h" -cscore_cv = "cscore_cv.h" -cscore_runloop = "cscore_runloop.h" +cscore_cpp = "wpi/cs/cscore_cpp.hpp" +cscore_oo = "wpi/cs/cscore_oo.hpp" +cscore_cv = "wpi/cs/cscore_cv.hpp" +cscore_runloop = "wpi/cs/cscore_runloop.hpp" [tool.semiwrap.export_type_casters.cscore-casters] pypackage = "cscore" diff --git a/subprojects/robotpy-halsim-ds-socket/pyproject.toml b/subprojects/robotpy-halsim-ds-socket/pyproject.toml index 4c0a9e74c..78df3baff 100644 --- a/subprojects/robotpy-halsim-ds-socket/pyproject.toml +++ b/subprojects/robotpy-halsim-ds-socket/pyproject.toml @@ -27,7 +27,7 @@ version_file = "halsim_ds_socket/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ds_socket" -group_id = "edu.wpi.first.halsim" +group_id = "org.wpilib.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" use_headers = false diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index 8fe00ad56..8952a6d9e 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -35,7 +35,7 @@ version_file = "halsim_gui/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_gui" -group_id = "edu.wpi.first.halsim" +group_id = "org.wpilib.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" use_headers = true diff --git a/subprojects/robotpy-halsim-ws/pyproject.toml b/subprojects/robotpy-halsim-ws/pyproject.toml index e4f01ae7e..a26d1a465 100644 --- a/subprojects/robotpy-halsim-ws/pyproject.toml +++ b/subprojects/robotpy-halsim-ws/pyproject.toml @@ -32,7 +32,7 @@ version_file = "halsim_ws/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_server" -group_id = "edu.wpi.first.halsim" +group_id = "org.wpilib.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" use_headers = false @@ -42,7 +42,7 @@ libs = ["halsim_ws_server"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_client" -group_id = "edu.wpi.first.halsim" +group_id = "org.wpilib.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" use_headers = false diff --git a/subprojects/robotpy-native-apriltag/pyproject.toml b/subprojects/robotpy-native-apriltag/pyproject.toml index 467bffbfd..be32c4e15 100644 --- a/subprojects/robotpy-native-apriltag/pyproject.toml +++ b/subprojects/robotpy-native-apriltag/pyproject.toml @@ -24,7 +24,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "apriltag-cpp" -group_id = "edu.wpi.first.apriltag" +group_id = "org.wpilib.apriltag" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-datalog/pyproject.toml b/subprojects/robotpy-native-datalog/pyproject.toml index 8ba7c6e3b..175c320cf 100644 --- a/subprojects/robotpy-native-datalog/pyproject.toml +++ b/subprojects/robotpy-native-datalog/pyproject.toml @@ -23,7 +23,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "datalog-cpp" -group_id = "edu.wpi.first.datalog" +group_id = "org.wpilib.datalog" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-ntcore/pyproject.toml b/subprojects/robotpy-native-ntcore/pyproject.toml index 85f078b32..5c8675cca 100644 --- a/subprojects/robotpy-native-ntcore/pyproject.toml +++ b/subprojects/robotpy-native-ntcore/pyproject.toml @@ -26,7 +26,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "ntcore-cpp" -group_id = "edu.wpi.first.ntcore" +group_id = "org.wpilib.ntcore" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-romi/pyproject.toml b/subprojects/robotpy-native-romi/pyproject.toml index 81fd44c92..604997b61 100644 --- a/subprojects/robotpy-native-romi/pyproject.toml +++ b/subprojects/robotpy-native-romi/pyproject.toml @@ -22,7 +22,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "romiVendordep-cpp" -group_id = "edu.wpi.first.romiVendordep" +group_id = "org.wpilib.romiVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-wpihal/pyproject.toml b/subprojects/robotpy-native-wpihal/pyproject.toml index ac96d28c6..c6b0f2678 100644 --- a/subprojects/robotpy-native-wpihal/pyproject.toml +++ b/subprojects/robotpy-native-wpihal/pyproject.toml @@ -24,7 +24,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "hal-cpp" -group_id = "edu.wpi.first.hal" +group_id = "org.wpilib.hal" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-wpilib/pyproject.toml b/subprojects/robotpy-native-wpilib/pyproject.toml index 45f0b97c2..04a44d3da 100644 --- a/subprojects/robotpy-native-wpilib/pyproject.toml +++ b/subprojects/robotpy-native-wpilib/pyproject.toml @@ -30,7 +30,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpilibc-cpp" -group_id = "edu.wpi.first.wpilibc" +group_id = "org.wpilib.wpilibc" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-wpimath/pyproject.toml b/subprojects/robotpy-native-wpimath/pyproject.toml index e536249e7..a3621b748 100644 --- a/subprojects/robotpy-native-wpimath/pyproject.toml +++ b/subprojects/robotpy-native-wpimath/pyproject.toml @@ -22,7 +22,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpimath-cpp" -group_id = "edu.wpi.first.wpimath" +group_id = "org.wpilib.wpimath" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-wpinet/pyproject.toml b/subprojects/robotpy-native-wpinet/pyproject.toml index a872d4147..b28d17ec9 100644 --- a/subprojects/robotpy-native-wpinet/pyproject.toml +++ b/subprojects/robotpy-native-wpinet/pyproject.toml @@ -22,7 +22,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpinet-cpp" -group_id = "edu.wpi.first.wpinet" +group_id = "org.wpilib.wpinet" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-wpiutil/pyproject.toml b/subprojects/robotpy-native-wpiutil/pyproject.toml index c001763b0..c7ebf48b1 100644 --- a/subprojects/robotpy-native-wpiutil/pyproject.toml +++ b/subprojects/robotpy-native-wpiutil/pyproject.toml @@ -21,7 +21,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpiutil-cpp" -group_id = "edu.wpi.first.wpiutil" +group_id = "org.wpilib.wpiutil" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-native-xrp/pyproject.toml b/subprojects/robotpy-native-xrp/pyproject.toml index fe341f4d7..1051c2143 100644 --- a/subprojects/robotpy-native-xrp/pyproject.toml +++ b/subprojects/robotpy-native-xrp/pyproject.toml @@ -22,7 +22,7 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "xrpVendordep-cpp" -group_id = "edu.wpi.first.xrpVendordep" +group_id = "org.wpilib.xrpVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index a14c344e6..ea39a15a4 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -32,7 +32,7 @@ version_file = "xrp/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_xrp" -group_id = "edu.wpi.first.halsim" +group_id = "org.wpilib.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" version = "2027.0.0-alpha-3-86-g418b381" use_headers = false