Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced Talon motor controller in DifferentialDrive class docs with Spark (#868)

Browse Source
This commit is contained in:
Tyler Veness
2018-01-03 18:27:34 -08:00
committed by Peter Johnson
parent bb38ef5642
commit 1f4822f332
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wpilibc/src/main/native/include/Drive/DifferentialDrive.h
View File

@@ -28,12 +28,12 @@ class SpeedController;
* @code{.cpp}
* class Robot {
* public:
* frc::Talon m_frontLeft{1};
* frc::Talon m_rearLeft{2};
* frc::Spark m_frontLeft{1};
* frc::Spark m_rearLeft{2};
* frc::SpeedControllerGroup m_left{m_frontLeft, m_rearLeft};
*
* frc::Talon m_frontRight{3};
* frc::Talon m_rearRight{4};
* frc::Spark m_frontRight{3};
* frc::Spark m_rearRight{4};
* frc::SpeedControllerGroup m_right{m_frontRight, m_rearRight};
*
* frc::DifferentialDrive m_drive{m_left, m_right};
@@ -44,14 +44,14 @@ class SpeedController;
* @code{.cpp}
* class Robot {
* public:
* frc::Talon m_frontLeft{1};
* frc::Talon m_midLeft{2};
* frc::Talon m_rearLeft{3};
* frc::Spark m_frontLeft{1};
* frc::Spark m_midLeft{2};
* frc::Spark m_rearLeft{3};
* frc::SpeedControllerGroup m_left{m_frontLeft, m_midLeft, m_rearLeft};
*
* frc::Talon m_frontRight{4};
* frc::Talon m_midRight{5};
* frc::Talon m_rearRight{6};
* frc::Spark m_frontRight{4};
* frc::Spark m_midRight{5};
* frc::Spark m_rearRight{6};
* frc::SpeedControllerGroup m_right{m_frontRight, m_midRight, m_rearRight};
*
* frc::DifferentialDrive m_drive{m_left, m_right};

20
wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
View File

@@ -25,12 +25,12 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
* <p>Four motor drivetrain:
* <pre><code>
* public class Robot {
* Talon m_frontLeft = new Talon(1);
* Talon m_rearLeft = new Talon(2);
* Spark m_frontLeft = new Spark(1);
* Spark m_rearLeft = new Spark(2);
* SpeedControllerGroup m_left = new SpeedControllerGroup(m_frontLeft, m_rearLeft);
*
* Talon m_frontRight = new Talon(3);
* Talon m_rearRight = new Talon(4);
* Spark m_frontRight = new Spark(3);
* Spark m_rearRight = new Spark(4);
* SpeedControllerGroup m_right = new SpeedControllerGroup(m_frontRight, m_rearRight);
*
* DifferentialDrive m_drive = new DifferentialDrive(m_left, m_right);
@@ -40,14 +40,14 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
* <p>Six motor drivetrain:
* <pre><code>
* public class Robot {
* Talon m_frontLeft = new Talon(1);
* Talon m_midLeft = new Talon(2);
* Talon m_rearLeft = new Talon(3);
* Spark m_frontLeft = new Spark(1);
* Spark m_midLeft = new Spark(2);
* Spark m_rearLeft = new Spark(3);
* SpeedControllerGroup m_left = new SpeedControllerGroup(m_frontLeft, m_midLeft, m_rearLeft);
*
* Talon m_frontRight = new Talon(4);
* Talon m_midRight = new Talon(5);
* Talon m_rearRight = new Talon(6);
* Spark m_frontRight = new Spark(4);
* Spark m_midRight = new Spark(5);
* Spark m_rearRight = new Spark(6);
* SpeedControllerGroup m_right = new SpeedControllerGroup(m_frontRight, m_midRight, m_rearRight);
*
* DifferentialDrive m_drive = new DifferentialDrive(m_left, m_right);