Skip to content

Commit

Permalink
Merge pull request #71 from auscompgeek/mot-docs
Browse files Browse the repository at this point in the history
Consolidate motor controller docs
  • Loading branch information
virtuald committed Dec 1, 2018
2 parents b8c9c3d + 2381912 commit 7dba327
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 29 deletions.
3 changes: 1 addition & 2 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ refer to the `CTRE software guide <https://github.com/CrossTheRoadElec/Phoenix-D

api_canifier
api_pigeonimu
api_talonsrx
api_victorspx
api_mot
api_misc
32 changes: 32 additions & 0 deletions docs/api_mot.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Motor Controllers
=================

TalonSRX
--------

.. autoclass:: ctre.WPI_TalonSRX
:members:
:show-inheritance:

.. automodule:: ctre.talonsrx
:members:
:show-inheritance:

VictorSPX
---------

.. autoclass:: ctre.WPI_VictorSPX
:members:
:show-inheritance:

.. automodule:: ctre.victorspx
:members:
:show-inheritance:

BaseMotorController
-------------------

.. automodule:: ctre.basemotorcontroller
:members:
:inherited-members:
:undoc-members:
14 changes: 0 additions & 14 deletions docs/api_talonsrx.rst

This file was deleted.

13 changes: 0 additions & 13 deletions docs/api_victorspx.rst

This file was deleted.

0 comments on commit 7dba327

Please sign in to comment.