From e418c5b943fd1bb299775805d5b308aaa0b054bf Mon Sep 17 00:00:00 2001
From: HFocus <keenandbuckley@gmail.com>
Date: Mon, 18 Mar 2019 17:08:49 -0600
Subject: [PATCH] Merge edits

---
 .../frc4388/robot/commands/SetMMAndPID.java   | 39 -------------------
 .../frc4388/robot/commands/StowArm.java       |  3 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 2019robot/src/main/java/org/usfirst/frc4388/robot/commands/SetMMAndPID.java

diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/SetMMAndPID.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/SetMMAndPID.java
deleted file mode 100644
index e67d86c..0000000
--- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/SetMMAndPID.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
-/* Open Source Software - may be modified and shared by FRC teams. The code   */
-/* must be accompanied by the FIRST BSD license file in the root directory of */
-/* the project.                                                               */
-/*----------------------------------------------------------------------------*/
-
-package org.usfirst.frc4388.robot.commands;
-
-import org.usfirst.frc4388.robot.subsystems.Arm.ArmControlMode;
-import org.usfirst.frc4388.robot.subsystems.Wrist.WristControlMode;
-
-import edu.wpi.first.wpilibj.command.CommandGroup;
-
-public class SetMMAndPID extends CommandGroup {
-  /**
-   * Add your docs here.
-   */
-  public SetMMAndPID() {
-    addSequential(new ArmSetMode(ArmControlMode.MOTION_MAGIC));
-    addParallel(new WristSetMode(WristControlMode.JOYSTICK_PID));
-    // Add Commands here:
-    // e.g. addSequential(new Command1());
-    // addSequential(new Command2());
-    // these will run in order.
-
-    // To run multiple commands at the same time,
-    // use addParallel()
-    // e.g. addParallel(new Command1());
-    // addSequential(new Command2());
-    // Command1 and Command2 will run in parallel.
-
-    // A command group will require all of the subsystems that each member
-    // would require.
-    // e.g. if Command1 requires chassis, and Command2 requires arm,
-    // a CommandGroup containing them would require both the chassis and the
-    // arm.
-  }
-}
diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/StowArm.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/StowArm.java
index 4465ea7..526bc8c 100644
--- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/StowArm.java
+++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/StowArm.java
@@ -18,8 +18,7 @@ public class StowArm extends CommandGroup {
     addSequential(new HatchFlip(false));
     addParallel(new WristPlacement(true));
     addParallel(new WristSetPositionPID(110), 2);
-    addSequential(new ArmSetPositionMM(420), 4);
-    addSequential(new ArmSetPositionMM(5));
+    addSequential(new ArmSetPositionMM(10));
     // Add Commands here:
     // e.g. addSequential(new Command1());
     // addSequential(new Command2());