From 1f4822f33278edbbe4d166b7b9baa0bade8c1c4d Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Wed, 3 Jan 2018 18:27:34 -0800
Subject: [PATCH] Replaced Talon motor controller in DifferentialDrive class
 docs with Spark (#868)

---
 .../native/include/Drive/DifferentialDrive.h  | 20 +++++++++----------
 .../wpilibj/drive/DifferentialDrive.java      | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/wpilibc/src/main/native/include/Drive/DifferentialDrive.h b/wpilibc/src/main/native/include/Drive/DifferentialDrive.h
index 81463a9afe..afbdb66af7 100644
--- a/wpilibc/src/main/native/include/Drive/DifferentialDrive.h
+++ b/wpilibc/src/main/native/include/Drive/DifferentialDrive.h
@@ -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};
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
index c0ae514ce3..74ff519c4e 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
@@ -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);