From 6c8eac395b4ddeced85ca30c17e8e913fb1a0d5a Mon Sep 17 00:00:00 2001 From: Wu-Fan-529 <3681247216@qq.com> Date: Sun, 31 May 2026 03:31:11 +0800 Subject: [PATCH 1/2] qf --- robot.tldr | 144 +++++++++--------- .../frc/robot/subsystems/StateMachine.java | 2 - 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/robot.tldr b/robot.tldr index bcc3c80..f756549 100644 --- a/robot.tldr +++ b/robot.tldr @@ -1021,7 +1021,7 @@ "content": [ { "type": "text", - "text": "PrepOutpost" + "text": "PrepCorner" } ] } @@ -1527,9 +1527,9 @@ "typeName": "shape" }, { - "x": 1437.7135323324935, - "y": 609.7763774002664, - "z": 0.5118547064274089, + "x": 2622.341679669581, + "y": 552.5721428142112, + "z": 0.1697572539181728, "meta": {}, "id": "camera:page:page", "typeName": "camera" @@ -2479,9 +2479,9 @@ "typeName": "shape" }, { - "x": 35.6185390788759, - "y": -388.77198142774375, - "z": 0.45999600772910526, + "x": 206.3569147328484, + "y": 1852.994123336534, + "z": 0.12395093385564669, "meta": {}, "id": "camera:page:grvVnvcP2QYOnDHPI3N7D", "typeName": "camera" @@ -4102,7 +4102,7 @@ "content": [ { "type": "text", - "text": "PrepDepot" + "text": "PrepTrench" } ] } @@ -4754,55 +4754,6 @@ }, "typeName": "binding" }, - { - "x": 1491.9403107486967, - "y": 801.9492269705042, - "rotation": 0, - "isLocked": false, - "opacity": 1, - "meta": {}, - "id": "shape:umL1XwXpphIIVogXlqhur", - "type": "geo", - "props": { - "w": 199, - "h": 64, - "geo": "rectangle", - "dash": "solid", - "growY": 26, - "url": "", - "scale": 1, - "color": "black", - "labelColor": "black", - "fill": "semi", - "size": "m", - "font": "mono", - "align": "middle", - "verticalAlign": "middle", - "richText": { - "type": "doc", - "attrs": { - "dir": "auto" - }, - "content": [ - { - "type": "paragraph", - "attrs": { - "dir": "auto" - }, - "content": [ - { - "type": "text", - "text": "PrepOpponentToAlliance" - } - ] - } - ] - } - }, - "parentId": "page:Wfhj8q2d0tvavwNlrwo_4", - "index": "a93veXnV", - "typeName": "shape" - }, { "meta": {}, "id": "binding:gvJ-9TZwEf1N2PqRgz7Mv", @@ -5196,6 +5147,55 @@ "index": "a6LP3oUG", "typeName": "shape" }, + { + "x": 229.156591592332, + "y": 556.6181109224157, + "rotation": 0, + "isLocked": false, + "opacity": 1, + "meta": {}, + "id": "shape:oWbO0p3d5-Do7I6M4YhSN", + "type": "geo", + "props": { + "w": 340.95818501915346, + "h": 91.375, + "geo": "rectangle", + "dash": "solid", + "growY": 0, + "url": "", + "scale": 1, + "color": "black", + "labelColor": "black", + "fill": "semi", + "size": "m", + "font": "mono", + "align": "middle", + "verticalAlign": "middle", + "richText": { + "type": "doc", + "attrs": { + "dir": "auto" + }, + "content": [ + { + "type": "paragraph", + "attrs": { + "dir": "auto" + }, + "content": [ + { + "type": "text", + "text": "PrepOpponentToAllience" + } + ] + } + ] + } + }, + "parentId": "shape:uGRWI4m6QItFOSMyV6rxb", + "index": "aIXuxUml", + "typeName": "shape" + }, { "meta": {}, "id": "page:grvVnvcP2QYOnDHPI3N7D", @@ -5290,7 +5290,7 @@ "content": [ { "type": "text", - "text": "PrepNeautralToAlliance" + "text": "PrepTower" } ] } @@ -6186,7 +6186,7 @@ "content": [ { "type": "text", - "text": "PrepTrench" + "text": "PrepHub" } ] } @@ -6253,7 +6253,7 @@ "content": [ { "type": "text", - "text": "PrepDepot" + "text": "PrepCorner" } ] } @@ -6551,10 +6551,12 @@ "typeName": "binding" }, { - "editingShapeId": null, + "editingShapeId": "shape:iv5HxmgE8cO6VlR2ztcz_", "croppingShapeId": null, - "selectedShapeIds": [], - "hoveredShapeId": null, + "selectedShapeIds": [ + "shape:iv5HxmgE8cO6VlR2ztcz_" + ], + "hoveredShapeId": "shape:VVsLcsMmoUoFc0sDMQsVV", "erasingShapeIds": [], "hintingShapeIds": [], "focusedGroupId": null, @@ -6654,7 +6656,7 @@ "content": [ { "type": "text", - "text": "PrepOutpost" + "text": "PrepHub" } ] } @@ -6725,13 +6727,13 @@ "rotation": 0 }, "isFocusMode": false, - "exportBackground": false, + "exportBackground": true, "isDebugMode": false, "isToolLocked": false, "screenBounds": { "x": 0, "y": 0, - "w": 1148, + "w": 660, "h": 614 }, "insets": [ @@ -6749,7 +6751,7 @@ "isFocused": true, "devicePixelRatio": 1, "isCoarsePointer": false, - "isHoveringCanvas": true, + "isHoveringCanvas": false, "openMenus": [], "isChangingStyle": false, "isReadonly": false, @@ -6842,7 +6844,7 @@ "content": [ { "type": "text", - "text": "PrepNonOutpost" + "text": "PrepTower" } ] } @@ -7569,9 +7571,9 @@ "typeName": "binding" }, { - "x": -1270.9068628616665, - "y": 108.77784649388366, - "z": 0.460400531117024, + "x": -2733.4690724786497, + "y": -205.34068450972168, + "z": 0.6471544470914002, "meta": {}, "id": "camera:page:Wfhj8q2d0tvavwNlrwo_4", "typeName": "camera" diff --git a/src/main/java/frc/robot/subsystems/StateMachine.java b/src/main/java/frc/robot/subsystems/StateMachine.java index 8957ebd..d7a1e0e 100644 --- a/src/main/java/frc/robot/subsystems/StateMachine.java +++ b/src/main/java/frc/robot/subsystems/StateMachine.java @@ -46,11 +46,9 @@ public enum RobotState { NONE, INTAKING, PREP_CORNER, - PREP_DEPOT, PREP_HUB, PREP_TRENCH, PREP_ANYWHERE, - PREP_NON_OUTPOST, PREP_TOWER, PREP_NEUTRAL_TO_ALLIANCE, PREP_OPPONENT_TO_ALLIANCE, From 4aa103d1ab2cdc5ae156b08bb3cac6bc00d6db9b Mon Sep 17 00:00:00 2001 From: Wu-Fan-529 <3681247216@qq.com> Date: Sun, 31 May 2026 03:47:55 +0800 Subject: [PATCH 2/2] rename --- .../states/{PrepNonOutpost.java => PrepCorner.java} | 13 ++++++++----- .../states/{PrepDepot.java => PrepHub.java} | 4 ++-- .../states/{PrepOutpost.java => PrepTower.java} | 13 ++++++++----- 3 files changed, 18 insertions(+), 12 deletions(-) rename src/main/java/frc/robot/commands/states/{PrepNonOutpost.java => PrepCorner.java} (80%) rename src/main/java/frc/robot/commands/states/{PrepDepot.java => PrepHub.java} (92%) rename src/main/java/frc/robot/commands/states/{PrepOutpost.java => PrepTower.java} (80%) diff --git a/src/main/java/frc/robot/commands/states/PrepNonOutpost.java b/src/main/java/frc/robot/commands/states/PrepCorner.java similarity index 80% rename from src/main/java/frc/robot/commands/states/PrepNonOutpost.java rename to src/main/java/frc/robot/commands/states/PrepCorner.java index c0626a2..9eac9f6 100644 --- a/src/main/java/frc/robot/commands/states/PrepNonOutpost.java +++ b/src/main/java/frc/robot/commands/states/PrepCorner.java @@ -6,23 +6,26 @@ import edu.wpi.first.wpilibj2.command.Command; -public class PrepNonOutpost extends Command { +public class PrepCorner extends Command { /** Creates a new PrepNonOutpost. */ - public PrepNonOutpost() { + public PrepCorner() { // Use addRequirements() here to declare subsystem dependencies. } // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + } // Called every time the scheduler runs while the command is scheduled. @Override - public void execute() {} + public void execute() { + } // Called once the command ends or is interrupted. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + } // Returns true when the command should end. @Override diff --git a/src/main/java/frc/robot/commands/states/PrepDepot.java b/src/main/java/frc/robot/commands/states/PrepHub.java similarity index 92% rename from src/main/java/frc/robot/commands/states/PrepDepot.java rename to src/main/java/frc/robot/commands/states/PrepHub.java index 7b3aa7c..31c794b 100644 --- a/src/main/java/frc/robot/commands/states/PrepDepot.java +++ b/src/main/java/frc/robot/commands/states/PrepHub.java @@ -6,9 +6,9 @@ import edu.wpi.first.wpilibj2.command.Command; -public class PrepDepot extends Command { +public class PrepHub extends Command { /** Creates a new PrepDepot. */ - public PrepDepot() { + public PrepHub() { // Use addRequirements() here to declare subsystem dependencies. } diff --git a/src/main/java/frc/robot/commands/states/PrepOutpost.java b/src/main/java/frc/robot/commands/states/PrepTower.java similarity index 80% rename from src/main/java/frc/robot/commands/states/PrepOutpost.java rename to src/main/java/frc/robot/commands/states/PrepTower.java index a1795ac..5b100fb 100644 --- a/src/main/java/frc/robot/commands/states/PrepOutpost.java +++ b/src/main/java/frc/robot/commands/states/PrepTower.java @@ -6,23 +6,26 @@ import edu.wpi.first.wpilibj2.command.Command; -public class PrepOutpost extends Command { +public class PrepTower extends Command { /** Creates a new PrepOutpost. */ - public PrepOutpost() { + public PrepTower() { // Use addRequirements() here to declare subsystem dependencies. } // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + } // Called every time the scheduler runs while the command is scheduled. @Override - public void execute() {} + public void execute() { + } // Called once the command ends or is interrupted. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + } // Returns true when the command should end. @Override