Merge pull request #73 from auscompgeek/move-talon-enums

Move TalonSRX-specific enums from base to TalonSRX
robotpy · Dec 4, 2018 · 9d79ad5 · 9d79ad5
2 parents acb40bd + 3b44792
commit 9d79ad5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ctre/basemotorcontroller.py b/ctre/basemotorcontroller.py
@@ -29,10 +29,8 @@
     DemandType,
     ErrorCode,
     Faults,
-    FeedbackDevice,
     FollowerType,
     LimitSwitchNormal,
-    LimitSwitchSource,
     MotController,
     MotionProfileStatus,
     NeutralMode,
@@ -41,7 +39,6 @@
     RemoteLimitSwitchSource,
     RemoteSensorSource,
     StatusFrame,
-    StatusFrameEnhanced,
     StickyFaults,
     VelocityMeasPeriod,
 )
@@ -55,16 +52,13 @@ class BaseMotorController(MotController):
 
     ControlMode = ControlMode
     DemandType = DemandType
-    FeedbackDevice = FeedbackDevice
     LimitSwitchNormal = LimitSwitchNormal
-    LimitSwitchSource = LimitSwitchSource
     NeutralMode = NeutralMode
     ParamEnum = ParamEnum
     RemoteFeedbackDevice = RemoteFeedbackDevice
     RemoteLimitSwitchSource = RemoteLimitSwitchSource
     RemoteSensorSource = RemoteSensorSource
     StatusFrame = StatusFrame
-    StatusFrameEnhanced = StatusFrameEnhanced
     VelocityMeasPeriod = VelocityMeasPeriod
 
     def __init__(self, arbId: int) -> None:

diff --git a/ctre/talonsrx.py b/ctre/talonsrx.py
@@ -24,6 +24,11 @@
 import hal
 
 from .basemotorcontroller import BaseMotorController
+from ._impl import (
+    FeedbackDevice,
+    LimitSwitchSource,
+    StatusFrameEnhanced,
+)
 
 
 __all__ = ['TalonSRX']
@@ -35,6 +40,10 @@ class TalonSRX(BaseMotorController):
     We don't recommend using this directly. Use :class:`.WPI_TalonSRX` instead.
     """
 
+    FeedbackDevice = FeedbackDevice
+    LimitSwitchSource = LimitSwitchSource
+    StatusFrameEnhanced = StatusFrameEnhanced
+
     def __init__(self, deviceNumber: int) -> None:
         super().__init__(deviceNumber | 0x02040000)
         hal.report(hal.UsageReporting.kResourceType_CANTalonSRX, deviceNumber + 1)
diff --git a/docs/api_mot.rst b/docs/api_mot.rst
@@ -10,6 +10,7 @@ TalonSRX
 
 .. automodule:: ctre.talonsrx
     :members:
+    :undoc-members:
     :show-inheritance:
 
 VictorSPX