Team4388/2019-Hit-or-Miss
1
0
Fork 0
mirror of https://github.com/Team4388/2019-Hit-or-Miss.git synced 2026-06-09 08:38:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge edits

Browse Source
This commit is contained in:
HFocus
2019-03-18 17:08:49 -06:00
parent da59a5f681
commit e418c5b943
2 changed files with 1 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2019robot/src/main/java/org/usfirst/frc4388/robot/commands/SetMMAndPID.java
-39
View File
@@ -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.
}
}
2019robot/src/main/java/org/usfirst/frc4388/robot/commands/StowArm.java
+1 -2
View File
@@ -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());