Merge branch '1' of https://github.com/HarryWang163/FRC6494_2026Regional into 1

2026-03-02 23:07:46 +08:00
parent 9538052697 711eec2a41
commit 85c7cb9fb3
3 changed files with 4 additions and 4 deletions
@@ -25,12 +25,12 @@ public class ClimberControls {
            //climber.climbUp();
                // 优先级：如果同时按，优先上升（你也可以反过来）
                if(controller.y().getAsBoolean()&&controller.x().getAsBoolean()){
-                    climber.zeroEncoder();
+                    climber.climbDownNonStop();
                }
                else if (controller.y().getAsBoolean()) {
                    climber.climbUp();
                } else if (controller.x().getAsBoolean()) {
-                    climber.climbDownNonStop();
+                    climber.climbDown();
                } else {
                    // 松开：记录当前位置 + 锁死
                    climber.captureHoldPosition();