Merge remote-tracking branch 'origin/intake' into intake

blair-robot-project · Jan 25, 2024 · 9f27657 · 9f27657
2 parents c3df006 + bbac7ca
commit 9f27657
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/main/kotlin/frc/team449/robot2024/subsystems/Intake.kt b/src/main/kotlin/frc/team449/robot2024/subsystems/Intake.kt
@@ -0,0 +1,4 @@
+package frc.team449.robot2024.subsystems
+class Intake {
+
+}
diff --git a/src/main/kotlin/frc/team449/robot2024/subsystems/ProtoUndertaker.kt b/src/main/kotlin/frc/team449/robot2024/subsystems/ProtoUndertaker.kt
@@ -12,7 +12,7 @@ class ProtoUndertaker(
   private val motor: WrappedMotor
 ) : SubsystemBase() {
 
-  fun intake(): Command {
+  fun intake(): Command { // lalalallal lalalallal allalalalalla
     return this.runOnce {
       motor.setVoltage(ProtoIntakeConstants.INTAKE_VOLTAGE)
     }

diff --git a/src/main/kotlin/frc/team449/system/motor/WrappedMotor.kt b/src/main/kotlin/frc/team449/system/motor/WrappedMotor.kt
@@ -14,6 +14,7 @@ class WrappedMotor(
   val busVoltage: DoubleSupplier? = null,
   val outputCurrent: DoubleSupplier? = null
 ) : MotorController by motor {
+
   /**
    * The last set voltage for this motor (through [setVoltage] or [set])
    */