Skip to content

Commit

Permalink
Fixed the mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
Floofyer committed Jan 24, 2024
1 parent d7f5a07 commit 9f3d8b1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 51 deletions.
36 changes: 0 additions & 36 deletions Intake.java

This file was deleted.

10 changes: 5 additions & 5 deletions src/main/java/org/robolancers321/BuildConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ public final class BuildConstants {
public static final String MAVEN_GROUP = "";
public static final String MAVEN_NAME = "321-Crescendo-2024";
public static final String VERSION = "unspecified";
public static final int GIT_REVISION = 6;
public static final String GIT_SHA = "6377635d69d5713f8f8b5400fc7a136abe5c431e";
public static final String GIT_DATE = "2024-01-21 18:36:14 EST";
public static final int GIT_REVISION = 9;
public static final String GIT_SHA = "d7f5a071320caae2dbf837f6d4b8063c990ef911";
public static final String GIT_DATE = "2024-01-24 17:03:30 EST";
public static final String GIT_BRANCH = "dev-intake";
public static final String BUILD_DATE = "2024-01-24 08:18:40 EST";
public static final long BUILD_UNIX_TIME = 1706102320667L;
public static final String BUILD_DATE = "2024-01-24 17:22:28 EST";
public static final long BUILD_UNIX_TIME = 1706134948601L;
public static final int DIRTY = 0;

private BuildConstants(){}
Expand Down
18 changes: 8 additions & 10 deletions src/main/java/org/robolancers321/subsystem/Intake.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,34 @@

import com.revrobotics.CANSparkLowLevel.MotorType;
import com.revrobotics.CANSparkMax;
import com.revrobotics.SparkPIDController;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.SubsystemBase;

public class Intake extends SubsystemBase {

public CANSparkMax intakemotor;
SparkPIDController IntakePIDController;
public CANSparkMax intakeMotor;

public int kport = 0;
public int kPort = 0;
public double power = 0;

public void intake() {
public void Intake() {

this.intakemotor = new CANSparkMax(kport, MotorType.kBrushless);
this.intakemotor.setSmartCurrentLimit(20);
this.intakeMotor = new CANSparkMax(kPort, MotorType.kBrushless);
this.intakeMotor.setSmartCurrentLimit(20);
}

public Command in(double power) {

return runOnce(() -> intakemotor.set(power));
return runOnce(() -> intakeMotor.set(power));
}

public Command out(double power) {

return runOnce(() -> intakemotor.set(-power));
return runOnce(() -> intakeMotor.set(-power));
}

public Command off(double power) {

return runOnce(() -> intakemotor.set(0));
return runOnce(() -> intakeMotor.set(0));
}
}

0 comments on commit 9f3d8b1

Please sign in to comment.