From e04f4ba3462f9b34ce21820c43feb101ced0a4c9 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 22 Jul 2016 16:35:32 -0400
Subject: [PATCH] Use proper case with EncoderBase and DriveBase

---
 .../usfirst/frc/team2059/robot/commands/CommandBase.java  | 8 ++++----
 .../usfirst/frc/team2059/robot/commands/LogEncoder.java   | 4 ++--
 .../usfirst/frc/team2059/robot/commands/ResetEncoder.java | 4 ++--
 .../usfirst/frc/team2059/robot/subsystems/Drivebase.java  | 2 +-
 .../frc/team2059/robot/subsystems/Encoderbase.java        | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/org/usfirst/frc/team2059/robot/commands/CommandBase.java b/src/org/usfirst/frc/team2059/robot/commands/CommandBase.java
index 10b734e..574964b 100644
--- a/src/org/usfirst/frc/team2059/robot/commands/CommandBase.java
+++ b/src/org/usfirst/frc/team2059/robot/commands/CommandBase.java
@@ -1,9 +1,9 @@
 package org.usfirst.frc.team2059.robot.commands;
-import org.usfirst.frc.team2059.robot.subsystems.Drivebase;
-import org.usfirst.frc.team2059.robot.subsystems.Encoderbase;
+import org.usfirst.frc.team2059.robot.subsystems.DriveBase;
+import org.usfirst.frc.team2059.robot.subsystems.EncoderBase;
 import edu.wpi.first.wpilibj.command.Command;
 public abstract class CommandBase extends Command {
-  protected static Encoderbase encoderbase = new Encoderbase();
-  protected static Drivebase drivebase = new Drivebase();
+  protected static EncoderBase encoderBase = new EncoderBase();
+  protected static DriveBase driveBase = new DriveBase();
 }
 // vim: sw=2:ts=2:sts=2
diff --git a/src/org/usfirst/frc/team2059/robot/commands/LogEncoder.java b/src/org/usfirst/frc/team2059/robot/commands/LogEncoder.java
index 53188df..53fa4a8 100644
--- a/src/org/usfirst/frc/team2059/robot/commands/LogEncoder.java
+++ b/src/org/usfirst/frc/team2059/robot/commands/LogEncoder.java
@@ -3,7 +3,7 @@ import org.usfirst.frc.team2059.robot.commands.CommandBase;
 import org.usfirst.frc.team2059.robot.structs.EncoderValues;
 public class LogEncoder  extends CommandBase {
   public LogEncoder() {
-    requires(encoderbase);
+    requires(encoderBase);
   }
   protected void initialize() {
   }
@@ -13,7 +13,7 @@ public class LogEncoder  extends CommandBase {
     return true;
   }
   protected void execute() {
-    EncoderValues values = encoderbase.getValues();
+    EncoderValues values = encoderBase.getValues();
     System.out.println("==== Encoder log ====");
     System.out.println("Count     : " + values.getCount());
     System.out.println("Distance  : " + values.getDistance());
diff --git a/src/org/usfirst/frc/team2059/robot/commands/ResetEncoder.java b/src/org/usfirst/frc/team2059/robot/commands/ResetEncoder.java
index 9ad30fa..9ec547a 100644
--- a/src/org/usfirst/frc/team2059/robot/commands/ResetEncoder.java
+++ b/src/org/usfirst/frc/team2059/robot/commands/ResetEncoder.java
@@ -2,7 +2,7 @@ package org.usfirst.frc.team2059.robot.commands;
 import org.usfirst.frc.team2059.robot.commands.CommandBase;
 public class ResetEncoder extends CommandBase {
   public ResetEncoder() {
-    requires(encoderbase);
+    requires(encoderBase);
   }
   protected void initialize() {
   }
@@ -10,7 +10,7 @@ public class ResetEncoder extends CommandBase {
     return true;
   }
   protected void execute() {
-    encoderbase.resetEncoder();
+    encoderBase.resetEncoder();
   }
   protected void end() {
   }
diff --git a/src/org/usfirst/frc/team2059/robot/subsystems/Drivebase.java b/src/org/usfirst/frc/team2059/robot/subsystems/Drivebase.java
index d5964d3..722b67d 100644
--- a/src/org/usfirst/frc/team2059/robot/subsystems/Drivebase.java
+++ b/src/org/usfirst/frc/team2059/robot/subsystems/Drivebase.java
@@ -3,7 +3,7 @@ import org.usfirst.frc.team2059.robot.RobotMap;
 import org.usfirst.frc.team2059.robot.commands.Drive;
 import edu.wpi.first.wpilibj.command.Subsystem;
 import edu.wpi.first.wpilibj.CANTalon;
-public class Drivebase extends Subsystem {
+public class DriveBase extends Subsystem {
   CANTalon leftMotorOne = new CANTalon(RobotMap.driveLeftMotorOne);
   CANTalon leftMotorTwo = new CANTalon(RobotMap.driveLeftMotorTwo);
   CANTalon rightMotorOne = new CANTalon(RobotMap.driveRightMotorOne);
diff --git a/src/org/usfirst/frc/team2059/robot/subsystems/Encoderbase.java b/src/org/usfirst/frc/team2059/robot/subsystems/Encoderbase.java
index 0ae8cae..5beb9c7 100644
--- a/src/org/usfirst/frc/team2059/robot/subsystems/Encoderbase.java
+++ b/src/org/usfirst/frc/team2059/robot/subsystems/Encoderbase.java
@@ -4,7 +4,7 @@ import org.usfirst.frc.team2059.robot.commands.Drive;
 import edu.wpi.first.wpilibj.command.Subsystem;
 import edu.wpi.first.wpilibj.Encoder;
 import org.usfirst.frc.team2059.robot.structs.EncoderValues;
-public class Encoderbase extends Subsystem {
+public class EncoderBase extends Subsystem {
   Encoder enc = new Encoder(0, 1, false, Encoder.EncodingType.k4X);
   public void initDefaultCommand() {
     //TODO: Not sure if we need a default command, not settingo one