diff --git a/ctre/__init__.py b/ctre/__init__.py index 473e8cb..a977294 100644 --- a/ctre/__init__.py +++ b/ctre/__init__.py @@ -2,15 +2,10 @@ # autogenerated by 'robotpy-build create-imports ctre' from ._ctre import ( - AbsoluteSensorRange, BaseMotorController, BaseMotorControllerConfiguration, BaseMotorControllerUtil, BasePIDSetConfiguration, - BasePigeon, - BasePigeonConfigUtils, - BasePigeonConfiguration, - BasePigeonSimCollection, BaseTalon, BaseTalonConfigUtil, BaseTalonConfiguration, @@ -18,13 +13,6 @@ BaseTalonPIDSetConfiguration, BufferedTrajectoryPointStream, CANBusAddressable, - CANCoder, - CANCoderConfigUtils, - CANCoderConfiguration, - CANCoderFaults, - CANCoderSimCollection, - CANCoderStatusFrame, - CANCoderStickyFaults, CANifier, CANifierConfigUtils, CANifierConfiguration, @@ -57,33 +45,17 @@ LimitSwitchNormal, LimitSwitchRoutines, LimitSwitchSource, - MagnetFieldStrength, MotionProfileStatus, MotorCommutation, MovingAverage, NeutralMode, Orchestra, ParamEnum, - Pigeon2, - Pigeon2ConfigUtils, - Pigeon2Configuration, - Pigeon2_Faults, - Pigeon2_StickyFaults, - PigeonIMU, - PigeonIMUConfigUtils, - PigeonIMUConfiguration, - PigeonIMU_ControlFrame, - PigeonIMU_Faults, - PigeonIMU_StatusFrame, - PigeonIMU_StickyFaults, RemoteFeedbackDevice, RemoteLimitSwitchSource, RemoteSensorSource, SensorCollection, - SensorInitializationStrategy, SensorTerm, - SensorTimeBase, - SensorVelocityMeasPeriod, SetValueMotionProfile, SlotConfigUtil, SlotConfiguration, @@ -120,24 +92,16 @@ VictorSPXPIDSetConfiguration, VictorSPXSimCollection, WPI_BaseMotorController, - WPI_CANCoder, - WPI_Pigeon2, - WPI_PigeonIMU, WPI_TalonFX, WPI_TalonSRX, WPI_VictorSPX, ) __all__ = [ - "AbsoluteSensorRange", "BaseMotorController", "BaseMotorControllerConfiguration", "BaseMotorControllerUtil", "BasePIDSetConfiguration", - "BasePigeon", - "BasePigeonConfigUtils", - "BasePigeonConfiguration", - "BasePigeonSimCollection", "BaseTalon", "BaseTalonConfigUtil", "BaseTalonConfiguration", @@ -145,13 +109,6 @@ "BaseTalonPIDSetConfiguration", "BufferedTrajectoryPointStream", "CANBusAddressable", - "CANCoder", - "CANCoderConfigUtils", - "CANCoderConfiguration", - "CANCoderFaults", - "CANCoderSimCollection", - "CANCoderStatusFrame", - "CANCoderStickyFaults", "CANifier", "CANifierConfigUtils", "CANifierConfiguration", @@ -184,33 +141,17 @@ "LimitSwitchNormal", "LimitSwitchRoutines", "LimitSwitchSource", - "MagnetFieldStrength", "MotionProfileStatus", "MotorCommutation", "MovingAverage", "NeutralMode", "Orchestra", "ParamEnum", - "Pigeon2", - "Pigeon2ConfigUtils", - "Pigeon2Configuration", - "Pigeon2_Faults", - "Pigeon2_StickyFaults", - "PigeonIMU", - "PigeonIMUConfigUtils", - "PigeonIMUConfiguration", - "PigeonIMU_ControlFrame", - "PigeonIMU_Faults", - "PigeonIMU_StatusFrame", - "PigeonIMU_StickyFaults", "RemoteFeedbackDevice", "RemoteLimitSwitchSource", "RemoteSensorSource", "SensorCollection", - "SensorInitializationStrategy", "SensorTerm", - "SensorTimeBase", - "SensorVelocityMeasPeriod", "SetValueMotionProfile", "SlotConfigUtil", "SlotConfiguration", @@ -247,9 +188,6 @@ "VictorSPXPIDSetConfiguration", "VictorSPXSimCollection", "WPI_BaseMotorController", - "WPI_CANCoder", - "WPI_Pigeon2", - "WPI_PigeonIMU", "WPI_TalonFX", "WPI_TalonSRX", "WPI_VictorSPX", @@ -257,3 +195,7 @@ from .version import version as __version__ + +# backwards compat +# TODO: remove in 2024 +from .sensors import * diff --git a/ctre/sensors.py b/ctre/sensors.py new file mode 100644 index 0000000..fa2bcde --- /dev/null +++ b/ctre/sensors.py @@ -0,0 +1,70 @@ +# autogenerated by 'robotpy-build create-imports ctre ctre._ctre.sensors' +from ._ctre.sensors import ( + AbsoluteSensorRange, + AxisDirection, + BasePigeon, + BasePigeonConfigUtils, + BasePigeonConfiguration, + BasePigeonSimCollection, + CANCoder, + CANCoderConfigUtils, + CANCoderConfiguration, + CANCoderFaults, + CANCoderSimCollection, + CANCoderStatusFrame, + CANCoderStickyFaults, + MagnetFieldStrength, + Pigeon2, + Pigeon2ConfigUtils, + Pigeon2Configuration, + Pigeon2_Faults, + Pigeon2_StickyFaults, + PigeonIMU, + PigeonIMUConfigUtils, + PigeonIMUConfiguration, + PigeonIMU_ControlFrame, + PigeonIMU_Faults, + PigeonIMU_StatusFrame, + PigeonIMU_StickyFaults, + SensorInitializationStrategy, + SensorTimeBase, + SensorVelocityMeasPeriod, + WPI_CANCoder, + WPI_Pigeon2, + WPI_PigeonIMU, +) + +__all__ = [ + "AbsoluteSensorRange", + "AxisDirection", + "BasePigeon", + "BasePigeonConfigUtils", + "BasePigeonConfiguration", + "BasePigeonSimCollection", + "CANCoder", + "CANCoderConfigUtils", + "CANCoderConfiguration", + "CANCoderFaults", + "CANCoderSimCollection", + "CANCoderStatusFrame", + "CANCoderStickyFaults", + "MagnetFieldStrength", + "Pigeon2", + "Pigeon2ConfigUtils", + "Pigeon2Configuration", + "Pigeon2_Faults", + "Pigeon2_StickyFaults", + "PigeonIMU", + "PigeonIMUConfigUtils", + "PigeonIMUConfiguration", + "PigeonIMU_ControlFrame", + "PigeonIMU_Faults", + "PigeonIMU_StatusFrame", + "PigeonIMU_StickyFaults", + "SensorInitializationStrategy", + "SensorTimeBase", + "SensorVelocityMeasPeriod", + "WPI_CANCoder", + "WPI_Pigeon2", + "WPI_PigeonIMU", +] diff --git a/docs/api.rst b/docs/api.rst index 858a148..aeaa97b 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -19,3 +19,4 @@ and we'll try to address the problem. ctre ctre.led + ctre.sensors diff --git a/docs/conf.py b/docs/conf.py index cec78b9..7b240a1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -138,3 +138,4 @@ gen_package(root, "ctre") gen_package(root, "ctre.led") +gen_package(root, "ctre.sensors") diff --git a/gen/AbsoluteSensorRange.yml b/gen/AbsoluteSensorRange.yml index 592b598..74e8d97 100644 --- a/gen/AbsoluteSensorRange.yml +++ b/gen/AbsoluteSensorRange.yml @@ -2,8 +2,10 @@ enums: AbsoluteSensorRange: + subpackage: sensors classes: AbsoluteSensorRangeRoutines: + subpackage: sensors ignore: true # enum toString only shared_ptr: false methods: diff --git a/gen/BasePigeon.yml b/gen/BasePigeon.yml index 908d1c6..61ecf15 100644 --- a/gen/BasePigeon.yml +++ b/gen/BasePigeon.yml @@ -5,6 +5,7 @@ extra_includes: classes: BasePigeonConfiguration: + subpackage: sensors typealias: - ctre::phoenix::CustomParamConfiguration force_depends: @@ -19,10 +20,12 @@ classes: "": std::string: BasePigeonConfigUtils: + subpackage: sensors methods: CustomParam0Different: CustomParam1Different: BasePigeon: + subpackage: sensors typealias: - ctre::phoenix::ParamEnum - ctre::phoenix::CANBusAddressable diff --git a/gen/BasePigeonSimCollection.yml b/gen/BasePigeonSimCollection.yml index fee6343..da66f00 100644 --- a/gen/BasePigeonSimCollection.yml +++ b/gen/BasePigeonSimCollection.yml @@ -5,6 +5,7 @@ extra_includes: classes: BasePigeonSimCollection: + subpackage: sensors methods: BasePigeonSimCollection: SetRawHeading: diff --git a/gen/CANCoder.yml b/gen/CANCoder.yml index ac7d199..69ea599 100644 --- a/gen/CANCoder.yml +++ b/gen/CANCoder.yml @@ -2,6 +2,7 @@ classes: CANCoderConfiguration: + subpackage: sensors force_no_trampoline: true base_qualnames: CustomParamConfiguration: ctre::phoenix::CustomParamConfiguration @@ -23,6 +24,7 @@ classes: rename: __str__ std::string: CANCoderConfigUtils: + subpackage: sensors force_no_trampoline: true base_qualnames: CustomParamConfigUtil: ctre::phoenix::CustomParamConfigUtil @@ -37,6 +39,7 @@ classes: UnitStringDifferent: SensorTimeBaseDifferent: CANCoder: + subpackage: sensors shared_ptr: true force_no_trampoline: true typealias: diff --git a/gen/CANCoderFaults.yml b/gen/CANCoderFaults.yml index 33fbd18..9d10d49 100644 --- a/gen/CANCoderFaults.yml +++ b/gen/CANCoderFaults.yml @@ -2,6 +2,7 @@ classes: CANCoderFaults: + subpackage: sensors shared_ptr: true attributes: HardwareFault: diff --git a/gen/CANCoderSimCollection.yml b/gen/CANCoderSimCollection.yml index 1735d6f..df32029 100644 --- a/gen/CANCoderSimCollection.yml +++ b/gen/CANCoderSimCollection.yml @@ -5,6 +5,7 @@ extra_includes: classes: CANCoderSimCollection: + subpackage: sensors methods: CANCoderSimCollection: SetBusVoltage: diff --git a/gen/CANCoderStatusFrame.yml b/gen/CANCoderStatusFrame.yml index e5fe1ea..01b2710 100644 --- a/gen/CANCoderStatusFrame.yml +++ b/gen/CANCoderStatusFrame.yml @@ -2,3 +2,4 @@ enums: CANCoderStatusFrame: + subpackage: sensors diff --git a/gen/CANCoderStickyFaults.yml b/gen/CANCoderStickyFaults.yml index 1bb0b98..5a42b7a 100644 --- a/gen/CANCoderStickyFaults.yml +++ b/gen/CANCoderStickyFaults.yml @@ -2,6 +2,7 @@ classes: CANCoderStickyFaults: + subpackage: sensors shared_ptr: true attributes: HardwareFault: diff --git a/gen/MagnetFieldStrength.yml b/gen/MagnetFieldStrength.yml index 91e4d9c..44aa658 100644 --- a/gen/MagnetFieldStrength.yml +++ b/gen/MagnetFieldStrength.yml @@ -2,3 +2,4 @@ enums: MagnetFieldStrength: + subpackage: sensors diff --git a/gen/Pigeon2.yml b/gen/Pigeon2.yml index eba0f21..c0f5d49 100644 --- a/gen/Pigeon2.yml +++ b/gen/Pigeon2.yml @@ -2,9 +2,11 @@ enums: AxisDirection: + subpackage: sensors classes: Pigeon2Configuration: + subpackage: sensors typealias: - ctre::phoenix::CustomParamConfiguration force_no_trampoline: true @@ -17,6 +19,7 @@ classes: "": std::string: Pigeon2ConfigUtils: + subpackage: sensors force_no_trampoline: true methods: MountPoseYawDifferent: @@ -31,6 +34,7 @@ classes: CustomParam0Different: CustomParam1Different: Pigeon2: + subpackage: sensors force_no_trampoline: true typealias: - ctre::phoenix::ErrorCode diff --git a/gen/Pigeon2_Faults.yml b/gen/Pigeon2_Faults.yml index eeaa1cf..c2aad19 100644 --- a/gen/Pigeon2_Faults.yml +++ b/gen/Pigeon2_Faults.yml @@ -2,6 +2,7 @@ classes: Pigeon2_Faults: + subpackage: sensors attributes: HardwareFault: APIError: diff --git a/gen/Pigeon2_StickyFaults.yml b/gen/Pigeon2_StickyFaults.yml index 61e4b10..6c25133 100644 --- a/gen/Pigeon2_StickyFaults.yml +++ b/gen/Pigeon2_StickyFaults.yml @@ -2,6 +2,7 @@ classes: Pigeon2_StickyFaults: + subpackage: sensors attributes: HardwareFault: APIError: diff --git a/gen/PigeonIMU.yml b/gen/PigeonIMU.yml index 2359555..0a54f97 100644 --- a/gen/PigeonIMU.yml +++ b/gen/PigeonIMU.yml @@ -5,6 +5,7 @@ extra_includes: classes: PigeonIMUConfiguration: + subpackage: sensors shared_ptr: true force_no_trampoline: true methods: @@ -15,12 +16,14 @@ classes: rename: __str__ std::string: PigeonIMUConfigUtils: + subpackage: sensors shared_ptr: true force_no_trampoline: true methods: CustomParam0Different: CustomParam1Different: PigeonIMU: + subpackage: sensors shared_ptr: true force_no_trampoline: true typealias: diff --git a/gen/PigeonIMU_ControlFrame.yml b/gen/PigeonIMU_ControlFrame.yml index cff7623..77909f6 100644 --- a/gen/PigeonIMU_ControlFrame.yml +++ b/gen/PigeonIMU_ControlFrame.yml @@ -2,3 +2,4 @@ enums: PigeonIMU_ControlFrame: + subpackage: sensors diff --git a/gen/PigeonIMU_Faults.yml b/gen/PigeonIMU_Faults.yml index 1106d27..cca8356 100644 --- a/gen/PigeonIMU_Faults.yml +++ b/gen/PigeonIMU_Faults.yml @@ -2,6 +2,7 @@ classes: PigeonIMU_Faults: + subpackage: sensors shared_ptr: true methods: HasAnyFault: diff --git a/gen/PigeonIMU_StatusFrame.yml b/gen/PigeonIMU_StatusFrame.yml index 2c8c590..6394641 100644 --- a/gen/PigeonIMU_StatusFrame.yml +++ b/gen/PigeonIMU_StatusFrame.yml @@ -2,3 +2,4 @@ enums: PigeonIMU_StatusFrame: + subpackage: sensors diff --git a/gen/PigeonIMU_StickyFaults.yml b/gen/PigeonIMU_StickyFaults.yml index 4481d62..912fa20 100644 --- a/gen/PigeonIMU_StickyFaults.yml +++ b/gen/PigeonIMU_StickyFaults.yml @@ -2,6 +2,7 @@ classes: PigeonIMU_StickyFaults: + subpackage: sensors shared_ptr: true methods: HasAnyFault: diff --git a/gen/SensorInitializationStrategy.yml b/gen/SensorInitializationStrategy.yml index a8b3c43..68baefc 100644 --- a/gen/SensorInitializationStrategy.yml +++ b/gen/SensorInitializationStrategy.yml @@ -2,8 +2,10 @@ enums: SensorInitializationStrategy: + subpackage: sensors classes: SensorInitializationStrategyRoutines: + subpackage: sensors ignore: true # enum toString only shared_ptr: false methods: diff --git a/gen/SensorTimeBase.yml b/gen/SensorTimeBase.yml index a1a0c17..f385677 100644 --- a/gen/SensorTimeBase.yml +++ b/gen/SensorTimeBase.yml @@ -2,8 +2,10 @@ enums: SensorTimeBase: + subpackage: sensors classes: SensorTimeBaseRoutines: + subpackage: sensors ignore: true # enum toString only shared_ptr: false methods: diff --git a/gen/SensorVelocityMeasPeriod.yml b/gen/SensorVelocityMeasPeriod.yml index 232fa98..9afc887 100644 --- a/gen/SensorVelocityMeasPeriod.yml +++ b/gen/SensorVelocityMeasPeriod.yml @@ -2,8 +2,10 @@ enums: SensorVelocityMeasPeriod: + subpackage: sensors classes: SensorVelocityMeasPeriodRoutines: + subpackage: sensors ignore: true # enum toString only shared_ptr: false methods: diff --git a/gen/WPI_CANCoder.yml b/gen/WPI_CANCoder.yml index dfc7d50..96b434e 100644 --- a/gen/WPI_CANCoder.yml +++ b/gen/WPI_CANCoder.yml @@ -5,6 +5,7 @@ extra_includes: classes: WPI_CANCoder: + subpackage: sensors force_no_trampoline: true ignored_bases: - wpi::SendableHelper diff --git a/gen/WPI_Pigeon2.yml b/gen/WPI_Pigeon2.yml index bdb8e18..8ee66c5 100644 --- a/gen/WPI_Pigeon2.yml +++ b/gen/WPI_Pigeon2.yml @@ -5,6 +5,7 @@ extra_includes: classes: WPI_Pigeon2: + subpackage: sensors force_no_trampoline: true ignored_bases: - wpi::SendableHelper diff --git a/gen/WPI_PigeonIMU.yml b/gen/WPI_PigeonIMU.yml index c504f34..ff09ef1 100644 --- a/gen/WPI_PigeonIMU.yml +++ b/gen/WPI_PigeonIMU.yml @@ -5,6 +5,7 @@ extra_includes: classes: WPI_PigeonIMU: + subpackage: sensors force_no_trampoline: true ignored_bases: - wpi::SendableHelper