package org.frc1675.commands;

import edu.wpi.first.wpilibj.command.Command;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import org.frc1675.OI;
import org.frc1675.subsystems.Jaw;
import org.frc1675.subsystems.Puncher;
import org.frc1675.subsystems.Roller;
import org.frc1675.subsystems.Shoulder;

/**

 * The base for all commands. All atomic commands should subclass CommandBase.
 * CommandBase stores creates and stores each control system. To access a
 * subsystem elsewhere in your code in your code use CommandBase.exampleSubsystem
 * @author Author
 */
public abstract class CommandBase extends Command {

    public static OI oi;
    
    // Create a single static instance of all of the subsystems
    public static Jaw jaw = new Jaw();
    //public static Puncher puncher = new Puncher();
    public static Roller rollerClaw = new Roller();
    //public static Shoulder shoulder = new Shoulder();

    public static void init() {
        // This MUST be here. If the OI creates Commands (which it very likely
        // will), constructing it during the construction of CommandBase (from
        // which commands extend), subsystems are not guaranteed to be
        // yet. Thus, their requires() statements may grab null pointers. Bad
        // news. Don't move it.
        oi = new OI();
    }

    public CommandBase(String name) {
        super(name);
    }

    public CommandBase() {
        super();
    }
}

@@ -22,19 +22,17 @@
 ommands;
-%0D%0A%0D
+%0A
 %0Aimport 
@@ -69,17 +69,16 @@
 Command;
-%0D
 %0Aimport 
@@ -129,17 +129,16 @@
 shboard;
-%0D
 %0Aimport 
@@ -152,17 +152,16 @@
 1675.OI;
-%0D
 %0Aimport 
@@ -187,17 +187,16 @@
 ems.Jaw;
-%0D
 %0Aimport 
@@ -226,17 +226,16 @@
 Puncher;
-%0D
 %0Aimport 
@@ -264,17 +264,16 @@
 .Roller;
-%0D
 %0Aimport 
@@ -308,18 +308,14 @@
 der;
-%0D%0A%0D
+%0A
 %0A/**
-%0D%0A%0D
+%0A
 %0A * 
@@ -389,17 +389,16 @@
 andBase.
-%0D
 %0A * Comm
@@ -463,17 +463,16 @@
 access a
-%0D
 %0A * subs
@@ -545,17 +545,16 @@
 ubsystem
-%0D
 %0A * @aut
@@ -567,14 +567,12 @@
 thor
-%0D
 %0A */
-%0D
 %0Apub
@@ -619,19 +619,17 @@
 ommand %7B
-%0D%0A%0D
+%0A
 %0A    pub
@@ -649,15 +649,13 @@
  oi;
-%0D
 %0A    
-%0D
 %0A   
@@ -714,17 +714,16 @@
 bsystems
-%0D
 %0A    pub
@@ -753,17 +753,16 @@
 w Jaw();
-%0D
 %0A    //p
@@ -802,25 +802,24 @@
 w Puncher();
-%0D
 %0A    public 
@@ -854,25 +854,24 @@
 ew Roller();
-%0D
 %0A    //publi
@@ -914,19 +914,17 @@
 ulder();
-%0D%0A%0D
+%0A
 %0A    pub
@@ -943,25 +943,24 @@
 oid init() %7B
-%0D
 %0A        // 
@@ -1026,17 +1026,16 @@
 y likely
-%0D
 %0A       
@@ -1105,17 +1105,16 @@
 se (from
-%0D
 %0A       
@@ -1176,17 +1176,16 @@
 ed to be
-%0D
 %0A       
@@ -1254,17 +1254,16 @@
 ers. Bad
-%0D
 %0A       
@@ -1286,17 +1286,16 @@
 move it.
-%0D
 %0A       
@@ -1309,26 +1309,23 @@
 ew OI();
-%0D
 %0A    %7D
-%0D%0A%0D
+%0A
 %0A    pub
@@ -1354,17 +1354,16 @@
  name) %7B
-%0D
 %0A       
@@ -1379,18 +1379,15 @@
 me);
-%0D
 %0A    %7D
-%0D%0A%0D
+%0A
 %0A   
@@ -1409,17 +1409,16 @@
 Base() %7B
-%0D
 %0A       
@@ -1430,16 +1430,13 @@
 r();
-%0D
 %0A    %7D
-%0D
 %0A%7D
-%0D
 %0A

Revert "Resolved merge conflicts"