From 1412f363d645705c75c2fc1171f051abcf1df80d Mon Sep 17 00:00:00 2001 From: Alex Schokking Date: Sat, 10 Oct 2026 10:55:17 -0700 Subject: [PATCH 1/3] Remove the Swerve tab from the AdvantageScope layout The shared layout should cover what every student uses, and swerve is only the final, optional Advanced challenge. That challenge already walks students through building a Swerve tab themselves. The tab was also broken. It read RealOutputs/DriveSubsystem/CurrentSwerveState and .../DesiredSwerveState, but the swerve code logs from SwerveDriveSubsystem (DriveSubsystem is the tank drive) and records DesiredSwerveStates, plural, so it never showed any data. The tab sat after the default selected tab (index 2, "3d view"), so removing it does not change which tab opens first. Co-Authored-By: Claude Opus 5.5 --- AdvantageScope_layout.json | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/AdvantageScope_layout.json b/AdvantageScope_layout.json index ee9f54c..c70c245 100644 --- a/AdvantageScope_layout.json +++ b/AdvantageScope_layout.json @@ -194,41 +194,6 @@ "renderer": null, "controlsHeight": 85 }, - { - "type": 9, - "title": "Swerve", - "controller": { - "sources": [ - { - "type": "states", - "logKey": "NT:/AdvantageKit/RealOutputs/DriveSubsystem/CurrentSwerveState", - "logType": "SwerveModuleState[]", - "visible": true, - "options": { - "color": "#ff0000", - "arrangement": "0,1,2,3" - } - }, - { - "type": "states", - "logKey": "NT:/AdvantageKit/RealOutputs/DriveSubsystem/DesiredSwerveState", - "logType": "SwerveModuleState[]", - "visible": true, - "options": { - "color": "#0000ff", - "arrangement": "0,1,2,3" - } - } - ], - "maxSpeed": 3.4, - "sizeX": 0.65, - "sizeY": 0.65, - "orientation": 1 - }, - "controllerUUID": "8tvgr5720hvoti5us5umldp8v3hirq1e", - "renderer": null, - "controlsHeight": 200 - }, { "type": 4, "title": "Table", From ab833a4d244c85581eec3f8e57f6323039ffffbb Mon Sep 17 00:00:00 2001 From: Alex Schokking Date: Sat, 10 Oct 2026 11:05:36 -0700 Subject: [PATCH 2/3] Trim the layout's sidebar state to what the drive curriculum uses sidebar.expanded records which folders were open in AdvantageScope's sidebar when the layout was exported. This one was exported from a 2025 competition robot session, so 82 of its 89 entries named subsystems XbotEdu doesn't have: elevator, coral and algae arms, AprilTag vision, a filter subsystem, and the competition robot's swerve modules. Kept the 7 that apply to the drive challenges: PoseSubsystem, the scheduler (which the Table tab reads), the Simulator folder (LinearEngine logs Simulator/LinearEngine/*), and the top-level AdvantageKit folders. The DriveSubsystem entries were removed too even though XbotEdu has a DriveSubsystem: they were swerve-module paths (RearRightDrive/SteeringEncoder) and PositionPID/HeadingPID from the competition drive, while XbotEdu's tank DriveSubsystem has two motors and no PIDs. Only the expanded list changes; the tabs are untouched. Co-Authored-By: Claude Opus 5.5 --- AdvantageScope_layout.json | 82 -------------------------------------- 1 file changed, 82 deletions(-) diff --git a/AdvantageScope_layout.json b/AdvantageScope_layout.json index c70c245..61fa69b 100644 --- a/AdvantageScope_layout.json +++ b/AdvantageScope_layout.json @@ -9,93 +9,11 @@ "sidebar": { "width": 447, "expanded": [ - "/SwerveDriveSubsystem/DrivePID", - "/SwerveSteeringSubsystem/SteeringPID", - "/AdvantageKit/RealOutputs/Simulator/FieldSimulation", - "/Preferences/CoralArmPivotMaintainerCommand/PositionalPID", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft", - "/AdvantageKit/RealOutputs/AlignToReefWithAprilTagCommand/TargetReefFace", - "/AdvantageKit/RealOutputs/AlignToReefWithAprilTagCommand/ChosenTag/translation", - "/AdvantageKit/RealOutputs/PoseSubsystem/CameraPose", - "/AdvantageKit/RealOutputs/AlignToTagLocalMovement", - "/AdvantageKit/RealOutputs/AlignToTagGlobalMovement", - "/AdvantageKit/RealOutputs/AlignToTagGlobalMovement/DriveTarget", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearRight", - "/photonvision/Apriltag_RearLeft_Camera", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft/LatestTargetObservation", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft/LatestTargetObservation/cameraToTarget/translation", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft/PoseObservations", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft/PoseObservations/0", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearLeft/LatestTargetObservation/cameraToTarget", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearRight/LatestTargetObservation", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearRight/LatestTargetObservation/cameraToTarget", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagRearRight/LatestTargetObservation/cameraToTarget/translation", "/SmartDashboard/Scheduler", - "/Preferences/ElevatorMaintainerCommand/trapezoidMotion", - "/Preferences/CoralArmMaintainerCommand/trapezoidMotion", - "/AdvantageKit/ElevatorMotorCANMotorController", - "/Preferences/SwerveDriveSubsystem/DrivePID", - "/AdvantageKit/ArmPivotMotorCANMotorController", - "/AdvantageKit/AlgaeArmSubsystem/Dio9DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio8DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio7DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio6DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio5DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio3DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio4DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio2DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio1DigitalInput", - "/AdvantageKit/AlgaeArmSubsystem/Dio0DigitalInput", - "/AdvantageKit/AlgaeArmPivotMotor/CANMotorController", - "/Preferences/AlgaeArmMaintainerCommand/trapezoidMotion", - "/Preferences/SwerveSteeringSubsystem/SteeringPID", - "/AdvantageKit/ElevatorMotor/CANMotorController", - "/AdvantageKit/DriveSubsystem/RearRightDrive/Steering", - "/AdvantageKit/DriveSubsystem/RearRightDrive/SteeringEncoder", - "/AdvantageKit/DriveSubsystem/RearRightDrive/SteeringEncoder/CANCoder", - "/AdvantageKit/DriveSubsystem/RearRightDrive/SteeringEncoder/AbsoluteEncoder", - "/AdvantageKit/RealOutputs/SwerveSteeringSubsystem/RearRightDrive", - "/AdvantageKit/DriveSubsystem/RearRightDrive/Steering/CANMotorController", - "/AdvantageKit/ArmPivotMotor/CANMotorController", - "/AdvantageKit/RealOutputs/SwerveDriveWithJoysticksCommand/RawTranslationIntent", - "/AdvantageKit/RealOutputs/SwerveDriveWithJoysticksCommand/ScaledTranslationIntent", - "/AdvantageKit/AlgaeArmSubsystem/AlgaeArmBottomSensorDigitalInput", - "/AdvantageKit/RealOutputs/FilterSubsystem", - "/Preferences/FilterSubsystem", - "/Preferences/FilterSubsystem/ComplimentaryFilter", - "/RealOutputs", - "/RealOutputs/ElevatorSubsystem", - "/RealOutputs/ElevatorMaintainerCommand", - "/ElevatorMotorPID", - "/ElevatorMotor", - "/ElevatorMotor/CANMotorController", - "/AdvantageKit/RealOutputs/CalibrateDriveCommand", - "/AdvantageKit/RealOutputs/ElevatorMaintainerCommand", - "/Preferences/SwerveDriveSubsystem", - "/Preferences/DriveSubsystem/PositionPID", - "/Preferences/DriveSubsystem/HeadingPID", - "/AdvantageKit/RealOutputs/PoseSubsystem/RobotPose/translation", - "/AdvantageKit/RealOutputs/AlignCameraToAprilTagCalculator/AprilTagData", - "/AdvantageKit/RealOutputs/AlignCameraToAprilTagCalculator/TargetLocationOnField", - "/AdvantageKit/RealOutputs/AlignCameraToAprilTagCalculator/TargetLocationOnField/translation", "/AdvantageKit", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft/TagPoses/0/translation", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft/TagPoses/0/rotation", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft/TagIds", - "/AdvantageKit/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft/LatestTargetObservation", "/AdvantageKit/PoseSubsystem", "/Preferences/PoseSubsystem", "/AdvantageKit/RealOutputs", - "/AdvantageKit/RealOutputs/PoseSubsystem/CameraPose/0", - "/AdvantageKit/RealOutputs/PoseSubsystem/CameraPose/1", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontLeft/TagPoses", - "/AdvantageKit/RealOutputs/AprilTagVisionSubsystemExtended/Cameras/AprilTagFrontRight", "/AdvantageKit/RealOutputs/Simulator", "/AdvantageKit/RealOutputs/PoseSubsystem" ] From f0428f49e6be79764ea1d6c118e5a666779bd5fb Mon Sep 17 00:00:00 2001 From: Alex Schokking Date: Sat, 10 Oct 2026 11:23:31 -0700 Subject: [PATCH 3/3] Replace the AdvantageScope layout with a fresh 2026 export The committed layout was saved by AdvantageScope 4.1.1 (July 2025). Opened in the WPILib 2026 build it triggers an "old layout" warning and only partially imports: of its five tabs, only 2d top view survived, so the Console, Joysticks and Table tabs never reached students. This is a fresh export from AdvantageScope 26.0.0, set up and tested against the XbotEdu simulator: - 2d top view and 3D Field, both reading PoseSubsystem/Location - the 2026 field ("FRC:2026 Field") instead of the 2025 Reefscape field - sidebar state limited to drive-relevant folders Supersedes the hand edits in the previous two commits on this branch. Co-Authored-By: Claude Opus 5.5 --- AdvantageScope_layout.json | 92 +++++++++++++------------------------- 1 file changed, 32 insertions(+), 60 deletions(-) diff --git a/AdvantageScope_layout.json b/AdvantageScope_layout.json index 61fa69b..d76ccf1 100644 --- a/AdvantageScope_layout.json +++ b/AdvantageScope_layout.json @@ -1,13 +1,13 @@ { "hubs": [ { - "x": 2183, - "y": 122, - "width": 1944, - "height": 1056, + "x": -7, + "y": -7, + "width": 1142, + "height": 718, "state": { "sidebar": { - "width": 447, + "width": 256, "expanded": [ "/SmartDashboard/Scheduler", "/AdvantageKit", @@ -15,7 +15,8 @@ "/Preferences/PoseSubsystem", "/AdvantageKit/RealOutputs", "/AdvantageKit/RealOutputs/Simulator", - "/AdvantageKit/RealOutputs/PoseSubsystem" + "/AdvantageKit/RealOutputs/PoseSubsystem", + "/AdvantageKit/DriveSubsystem" ] }, "tabs": { @@ -26,7 +27,7 @@ "title": "", "controller": null, "controllerUUID": "oz1a35znw28xtm7shst2zd8rkn9xlbx4", - "renderer": "#/", + "renderer": "", "controlsHeight": 0 }, { @@ -40,21 +41,28 @@ "logType": "Pose2d", "visible": true, "options": {} + }, + { + "type": "ghost", + "logKey": "NT:/AdvantageKit/RealOutputs/PoseSubsystem/Location", + "logType": "Pose2d", + "visible": true, + "options": { + "color": "#00ff00" + } } ], - "game": "2025 Field (Welded)", - "bumpers": "auto", - "origin": "blue", + "field": "FRC:2026 Field", "orientation": 0, - "size": 30 + "size": "large" }, "controllerUUID": "icj9qq9dlv43tplcxoxfazr6gi5tdgwy", "renderer": null, - "controlsHeight": 99 + "controlsHeight": 200 }, { "type": 3, - "title": "3d view", + "title": "3D Field", "controller": { "sources": [ { @@ -63,64 +71,28 @@ "logType": "Pose2d", "visible": true, "options": { - "model": "2025 KitBot" + "model": "2026 KitBot" } } ], - "game": "2025 Field (Welded)", - "origin": "blue" + "game": "FRC:2026 Field" }, - "controllerUUID": "ox2te7k1ktj76khhhqyowcgkihnqvl8g", + "controllerUUID": "5hk1ijjl6higzxcz0erog8m8qlqlvkic", "renderer": { "cameraIndex": -1, "orbitFov": 50, "cameraPosition": [ - 7.5749910818581405, - 2.1568059323597595, - -9.217981603122656 + -0.2861734932165839, + 8.202202910015949, + -1.7584505739210674 ], "cameraTarget": [ - 4.66037246179174, - -1.205771551013326, - -3.2358013142366957 + -0.4770464230520336, + 1.9548798934435963, + 0.6668199511616478 ] }, - "controlsHeight": 239 - }, - { - "type": 5, - "title": "Console", - "controller": "NT:/AdvantageKit/RealOutputs/Console", - "controllerUUID": "ozof9k4e8dl2luiuh9xhhj8v9gctlo86", - "renderer": { - "highlight": false - }, - "controlsHeight": 0 - }, - { - "type": 8, - "title": "Joysticks", - "controller": [ - "Xbox Controller (White)", - "None", - "None", - "None", - "None", - "None" - ], - "controllerUUID": "1u4q4rm90j9iqu5413ggj7ujvehxj98t", - "renderer": null, - "controlsHeight": 85 - }, - { - "type": 4, - "title": "Table", - "controller": [ - "NT:/SmartDashboard/Scheduler/Names" - ], - "controllerUUID": "yzrep59pzgsyuq2yd9m13gexfoe5h440", - "renderer": null, - "controlsHeight": 0 + "controlsHeight": 200 } ] } @@ -128,5 +100,5 @@ } ], "satellites": [], - "version": "4.1.1" + "version": "26.0.0" }