Skip to content

Commit

Permalink
changed voltage to speed cause nathan
Browse files Browse the repository at this point in the history
  • Loading branch information
Dark-IsHere committed Feb 4, 2024
1 parent 0b163e5 commit 7c28149
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions src/main/java/frc/robot/commands/SetShooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@

public class SetShooter extends Command {
private final ArnavShooter s_ArnavShooter;
double finalVoltage;
double finalspeed;

public SetShooter(ArnavShooter.ShooterStates state) { //change from off or max speed
s_ArnavShooter = ArnavShooter.getInstance();
finalVoltage = state.getValue();
finalspeed = state.getValue();
addRequirements(s_ArnavShooter);
}

public SetShooter(double difference) { //increase or decrease speed. Makes sure not to increase above max or decrease below 0
s_ArnavShooter = ArnavShooter.getInstance();

double addedVoltage = s_ArnavShooter.getVoltage() + difference;
double addedspeed = s_ArnavShooter.getspeed() + difference;

if(addedVoltage <= 1 && addedVoltage >= 0) {
finalVoltage = addedVoltage;
if(addedspeed <= 1 && addedspeed >= 0) {
finalspeed = addedspeed;
}

addRequirements(s_ArnavShooter);
Expand All @@ -34,7 +34,7 @@ public void initialize() {

@Override
public void execute() {
s_ArnavShooter.setVoltage(finalVoltage);
s_ArnavShooter.setspeed(finalspeed);
}

@Override
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/frc/robot/subsystems/ArnavShooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,29 @@ public ArnavShooter() {
public enum ShooterStates {
MAX(1),
OFF(0);
private double voltage;
private double speed;

public double getValue() {
return voltage;
return speed;
}

ShooterStates(double voltage) {
this.voltage = voltage;
ShooterStates(double speed) {
this.speed = speed;
}

}

public void setVoltage(ShooterStates state) { //change state
shooterLeaderM.set(state.voltage);
public void setspeed(ShooterStates state) { //change state
shooterLeaderM.set(state.speed);
currentSpeed = state.getValue();
}

public void setVoltage(double newVoltage) { //change specific voltage
shooterFollowerM.set(newVoltage);
currentSpeed = newVoltage;
public void setspeed(double newspeed) { //change specific speed
shooterFollowerM.set(newspeed);
currentSpeed = newspeed;
}

public double getVoltage() { //gets specific voltage (i hope)
public double getspeed() { //gets specific speed (i hope)
return currentSpeed;
}

Expand Down

0 comments on commit 7c28149

Please sign in to comment.