robotpy · auscompgeek · Dec 27, 2022 · Dec 27, 2022
diff --git a/ctre/__init__.py b/ctre/__init__.py
@@ -2,29 +2,17 @@
 
 # autogenerated by 'robotpy-build create-imports ctre'
 from ._ctre import (
-    AbsoluteSensorRange,
     BaseMotorController,
     BaseMotorControllerConfiguration,
     BaseMotorControllerUtil,
     BasePIDSetConfiguration,
-    BasePigeon,
-    BasePigeonConfigUtils,
-    BasePigeonConfiguration,
-    BasePigeonSimCollection,
     BaseTalon,
     BaseTalonConfigUtil,
     BaseTalonConfiguration,
     BaseTalonPIDSetConfigUtil,
     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,38 +92,23 @@
     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",
     "BaseTalonPIDSetConfigUtil",
     "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,13 +188,14 @@
     "VictorSPXPIDSetConfiguration",
     "VictorSPXSimCollection",
     "WPI_BaseMotorController",
-    "WPI_CANCoder",
-    "WPI_Pigeon2",
-    "WPI_PigeonIMU",
     "WPI_TalonFX",
     "WPI_TalonSRX",
     "WPI_VictorSPX",
 ]
 
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,7 @@ extra_includes:
 
 classes:
   BasePigeonSimCollection:
+    subpackage: sensors
     methods:
       BasePigeonSimCollection:
       SetRawHeading:

diff --git 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
@@ -2,6 +2,7 @@
 
 classes:
   CANCoderFaults:
+    subpackage: sensors
     shared_ptr: true
     attributes:
       HardwareFault:

diff --git 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
@@ -2,3 +2,4 @@
 
 enums:
   CANCoderStatusFrame:
+    subpackage: sensors
diff --git 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
@@ -2,3 +2,4 @@
 
 enums:
   MagnetFieldStrength:
+    subpackage: sensors
diff --git 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
@@ -2,6 +2,7 @@
 
 classes:
   Pigeon2_Faults:
+    subpackage: sensors
     attributes:
       HardwareFault:
       APIError:

diff --git a/gen/Pigeon2_StickyFaults.yml b/gen/Pigeon2_StickyFaults.yml
@@ -2,6 +2,7 @@
 
 classes:
   Pigeon2_StickyFaults:
+    subpackage: sensors
     attributes:
       HardwareFault:
       APIError:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ and we'll try to address the problem.

		ctre
		ctre.led
		ctre.sensors
Original file line number	Diff line number	Diff line change
Expand Up		@@ -138,3 +138,4 @@

		gen_package(root, "ctre")
		gen_package(root, "ctre.led")
		gen_package(root, "ctre.sensors")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		enums:
		CANCoderStatusFrame:
		subpackage: sensors