Skip to content

Commit

Permalink
push
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeful committed Sep 16, 2024
1 parent 2ea8ffb commit a582ff8
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 50 deletions.
88 changes: 44 additions & 44 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,47 +106,47 @@ tasks.withType(JavaCompile) {
options.compilerArgs.add '-XDstringConcat=inline'
}

// Spotless formatting
project.compileJava.dependsOn(spotlessApply)
spotless {
java {
target fileTree('.') {
include '**/*.java'
exclude '**/build/**', '**/build-*/**'
}
toggleOffOn()
googleJavaFormat()
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
}
groovyGradle {
target fileTree('.') {
include '**/*.gradle'
exclude '**/build/**', '**/build-*/**'
}
greclipse()
indentWithSpaces(4)
trimTrailingWhitespace()
endWithNewline()
}
format 'xml', {
target fileTree('.') {
include '**/*.xml'
exclude '**/build/**', '**/build-*/**'
}
eclipseWtp('xml')
trimTrailingWhitespace()
indentWithSpaces(2)
endWithNewline()
}
format 'misc', {
target fileTree('.') {
include '**/*.md', '**/.gitignore'
exclude '**/build/**', '**/build-*/**'
}
trimTrailingWhitespace()
indentWithSpaces(2)
endWithNewline()
}
}
// // Spotless formatting
// project.compileJava.dependsOn(spotlessApply)
// spotless {
// java {
// target fileTree('.') {
// include '**/*.java'
// exclude '**/build/**', '**/build-*/**'
// }
// toggleOffOn()
// googleJavaFormat()
// removeUnusedImports()
// trimTrailingWhitespace()
// endWithNewline()
// }
// groovyGradle {
// target fileTree('.') {
// include '**/*.gradle'
// exclude '**/build/**', '**/build-*/**'
// }
// greclipse()
// indentWithSpaces(4)
// trimTrailingWhitespace()
// endWithNewline()
// }
// format 'xml', {
// target fileTree('.') {
// include '**/*.xml'
// exclude '**/build/**', '**/build-*/**'
// }
// eclipseWtp('xml')
// trimTrailingWhitespace()
// indentWithSpaces(2)
// endWithNewline()
// }
// format 'misc', {
// target fileTree('.') {
// include '**/*.md', '**/.gitignore'
// exclude '**/build/**', '**/build-*/**'
// }
// trimTrailingWhitespace()
// indentWithSpaces(2)
// endWithNewline()
// }
// }
9 changes: 5 additions & 4 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class RobotContainer {
private final IntakeSubsystem intakeSubsystem;
private final PivotSubsystem pivotSubsystem;
private final LEDSubsystem ledSubsystem;

private final MaxCarsonLearningExperience MaxCarsonLearningExperience;
private final SendableChooser<Command> autoChooser;

public RobotContainer() {
Expand All @@ -66,7 +66,7 @@ public RobotContainer() {
intakeSubsystem = new IntakeSubsystem();
pivotSubsystem = new PivotSubsystem();
ledSubsystem = new LEDSubsystem();

MaxCarsonLearningExperience = new MaxCarsonLearningExperience();
autoChooser = new SendableChooser<Command>();
autoChooser.setDefaultOption(
"red 4note",
Expand Down Expand Up @@ -196,8 +196,9 @@ public void teleopInit() {
SmarterDashboardRegistry.initialize();
shooterSubsystem.setFlywheelNeutral();
shooterSubsystem.setRollerSpeed(0);
intakeSubsystem.setFlapperSpeed(0);
intakeSubsystem.setIntakeSpeed(0);
//*intakeSubsystem.setFlapperSpeed(0);
//*intakeSubsystem.setIntakeSpeed(0);
MaxCarsonLearningExperience.setSpeed(0.5);
pivotSubsystem.setPivotAngle(PivotConstants.PIVOT_INTAKE_ANGLE);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ public MaxCarsonLearningExperience() {
rightIntakeMotor.getConfigurator(motorConfigs);
flapperMotor.getConfigurator(motorConfigs);

public setSpeed(){
leftIntakeMotor
public setSpeed(double speed){
leftIntakeMotor.set(speed);
rightIntakeMotor.set(speed);
flapperMotor.set(speed);
}


Expand Down

0 comments on commit a582ff8

Please sign in to comment.