Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Linted code
Browse files Browse the repository at this point in the history
  • Loading branch information
xavier committed Nov 23, 2024
1 parent 17050e3 commit 1d02372
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 62 deletions.
22 changes: 10 additions & 12 deletions src/main/java/com/team766/robot/rookie_bot/OI.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,22 @@ public void run(final Context context) {
context.waitFor(() -> RobotProvider.instance.hasNewDriverStationData());
if (joystick0.getButtonPressed(4)) {
context.startAsync(new PIDElevator(true));

}
if (joystick0.getButtonPressed(2)) {
context.startAsync(new PIDElevator(false));

}
if (joystick0.getButtonPressed(7)) {
Robot.intake.setintakePower(1, 1);

} if (joystick0.getButtonReleased(7)) {
Robot.intake.setintakePower(0, 0);

} if (joystick0.getButtonPressed(8)) {
Robot.intake.setintakePower(-1,-1);

} if (joystick0.getButtonReleased(8)) {
Robot.intake.setintakePower(0,0);
}
if (joystick0.getButtonReleased(7)) {
Robot.intake.setintakePower(0, 0);
}
if (joystick0.getButtonPressed(8)) {
Robot.intake.setintakePower(-1, -1);
}
if (joystick0.getButtonReleased(8)) {
Robot.intake.setintakePower(0, 0);
}
}

}
}
4 changes: 1 addition & 3 deletions src/main/java/com/team766/robot/rookie_bot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class Robot implements RobotConfigurator {
public static Drive drive;
public static Elevator elevator;
public static Intake intake;

@Override
public void initializeMechanisms() {
// Initialize mechanisms here
Expand All @@ -27,7 +28,4 @@ public Procedure createOI() {
public AutonomousMode[] getAutonomousModes() {
return AutonomousModes.AUTONOMOUS_MODES;
}



}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.team766.robot.rookie_bot.mechanisms;

import com.team766.hal.RobotProvider;
import com.team766.hal.MotorController;
import com.team766.framework.Mechanism;
import com.team766.hal.EncoderReader;
import com.team766.hal.MotorController;
import com.team766.hal.RobotProvider;

public class Elevator extends Mechanism {
private MotorController m_elevator;
Expand All @@ -15,15 +15,15 @@ public Elevator() {
resetEncoder();
}

public void move(double power){
public void move(double power) {
m_elevator.set(power);
}

public double getElevatorDistance(){
public double getElevatorDistance() {
return m_elevatorEncoder.getDistance();
}

public void resetEncoder(){
public void resetEncoder() {
m_elevatorEncoder.reset();
}
}
21 changes: 10 additions & 11 deletions src/main/java/com/team766/robot/rookie_bot/mechanisms/Intake.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
public class Intake extends Mechanism {
private MotorController leftMotor;
private MotorController rightMotor;

public Intake() {
leftMotor = RobotProvider.instance.getMotor("intake.leftMotor");
rightMotor = RobotProvider.instance.getMotor("intake.rightMotor");
}

public void setintakePower(double leftPower, double rightPower) {
checkContextOwnership();
leftMotor.set(leftPower);
rightMotor.set(rightPower);
}
public Intake() {
leftMotor = RobotProvider.instance.getMotor("intake.leftMotor");
rightMotor = RobotProvider.instance.getMotor("intake.rightMotor");
}

}
public void setintakePower(double leftPower, double rightPower) {
checkContextOwnership();
leftMotor.set(leftPower);
rightMotor.set(rightPower);
}
}
Original file line number Diff line number Diff line change
@@ -1,37 +1,42 @@
package com.team766.robot.rookie_bot.procedures;
import com.team766.framework.Procedure;

import com.team766.controllers.PIDController;
import com.team766.framework.Context;
import com.team766.framework.Procedure;
import com.team766.robot.rookie_bot.Robot;

public class PIDElevator extends Procedure {
double setpoint;
PIDController controller;

public PIDElevator(boolean top) {
if (top) {
setpoint = 400;

} else {
setpoint = 0;
}

}

public void run(Context context) {
context.takeOwnership(Robot.elevator);
Robot.elevator.resetEncoder(); //clear encoder

controller = new PIDController(0, 0, 0, 0, 1, 0.01); // values a P I D, min. max. and threshold
controller.setSetpoint(setpoint); //tell our PID contoller our setpoint

while (!controller.isDone()) { //stop loop when we get to setpoint
controller.calculate(Robot.elevator.getElevatorDistance()); //pass the feedback into the PID
double motor_effort = controller.getOutput(); //get the PID controller output for this cycle
Robot.elevator.move(motor_effort); //MOVE THE ELEVATOR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1 (that 1 was a typo)
}

Robot.elevator.move(0); //Make sure that the dang elevator stopped moving!!!!!!
context.yield();
public class PIDElevator extends Procedure {
double setpoint;
PIDController controller;

public PIDElevator(boolean top) {
if (top) {
setpoint = 400;

} else {
setpoint = 0;
}
}
}

public void run(Context context) {
context.takeOwnership(Robot.elevator);
Robot.elevator.resetEncoder(); // clear encoder

controller =
new PIDController(0, 0, 0, 0, 1, 0.01); // values a P I D, min. max. and threshold
controller.setSetpoint(setpoint); // tell our PID contoller our setpoint

while (!controller.isDone()) { // stop loop when we get to setpoint
controller.calculate(
Robot.elevator.getElevatorDistance()); // pass the feedback into the PID
double motor_effort =
controller.getOutput(); // get the PID controller output for this cycle
Robot.elevator.move(motor_effort); // MOVE THE
// ELEVATOR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
// (that 1 was a typo)
}

Robot.elevator.move(0); // Make sure that the dang elevator stopped moving!!!!!!
context.yield();
}
}

0 comments on commit 1d02372

Please sign in to comment.