@@ -345,20 +345,27 @@ public Command scoreEjectCommand(SuperstructureState stagingState, Superstructur
345345 });
346346 }
347347
348- // Temporary values
349- public Command autoScoreCommand () {
348+ // Dealgify
349+
350+ public Command dealgifyLowCommand (Supplier <Boolean > override ) {
351+ return dealgifyCommand (SuperstructureConstants .STAGE_LOW_DEALGIFY_STATE , SuperstructureConstants .REMOVE_LOW_DEALGIFY_STATE ,
352+ SuperstructureConstants .CORAL_STOWED_STATE , override );
353+ }
354+
355+ public Command dealgifyHighCommand (Supplier <Boolean > override ) {
356+ return dealgifyCommand (SuperstructureConstants .STAGE_HIGH_DEALGIFY_STATE , SuperstructureConstants .REMOVE_HIGH_DEALGIFY_STATE ,
357+ SuperstructureConstants .CORAL_STOWED_STATE , override );
358+ }
359+
360+ public Command dealgifyCommand (SuperstructureState stagingState , SuperstructureState removingState ,
361+ SuperstructureState stowedState , Supplier <Boolean > override ) {
350362 return Commands .sequence (
351- Commands .runOnce (() -> setState (SuperstructureConstants .STAGE_L1_STATE ),
352- elevator , arm , wrist , intake ),
353- Commands .waitUntil (() -> isAtTargetState ()),
354- Commands .run (() -> {
355- setState (SuperstructureConstants .EJECT_L1_STATE );
356- led .flashAllPixels (LedConstants .YELLOW , 5 );
357- },
358- elevator , arm , wrist , intake , led )
363+ Commands .runOnce (() -> setState (stagingState ), elevator , arm , wrist , intake ),
364+ Commands .waitUntil (() -> override .get ()),
365+ Commands .run (() -> setState (removingState ), elevator , arm , wrist , intake )
359366 )
360367 .finallyDo (() -> {
361- setState (SuperstructureConstants . CORAL_STOWED_STATE );
368+ setState (stowedState );
362369 });
363370 }
364371
0 commit comments