diff --git a/aslayout.json b/aslayout.json index 70c092f..358cf72 100644 --- a/aslayout.json +++ b/aslayout.json @@ -23,19 +23,17 @@ "/SwerveDrive/DesiredStates/0/angle", "/SwerveDrive/CurrentStates/0/angle", "/photonvision/fl_cam", - "/SwerveDrive/PoseEstimatorPose", "/Vision", "/Vision/fl_camPoseEstimation", "/Vision/fl_camPoseEstimation/translation", "/Vision/fl_camPoseEstimation/rotation", "/NoteVisualizer/LaunchedNotes", - "/SwerveDrive", - "/SwerveDrive/CurrentStates", - "/SwerveDrive/DesiredStates" + "/Looptime", + "/SwerveDrive" ] }, "tabs": { - "selected": 5, + "selected": 1, "tabs": [ { "type": 0, @@ -89,6 +87,43 @@ }, "title": "Line Graph" }, + { + "type": 1, + "legendHeight": 0.3, + "legends": { + "left": { + "lockedRange": null, + "unitConversion": { + "type": null, + "factor": 1 + }, + "fields": [ + { + "key": "NT:/SwerveDrive/OdomUpdateRate", + "color": "#2b66a2", + "show": true + }, + { + "key": "NT:/Looptime/RobotPeriodicLoopRate", + "color": "#e5b31b", + "show": true + } + ] + }, + "discrete": { + "fields": [] + }, + "right": { + "lockedRange": null, + "unitConversion": { + "type": null, + "factor": 1 + }, + "fields": [] + } + }, + "title": "LoopTimes" + }, { "type": 4, "fields": [ @@ -195,14 +230,14 @@ "cameraIndex": -2, "orbitFov": 75, "cameraPosition": [ - 0.0948801836520725, - 3.2238861086067025, - 0.2469499751943985 + -1.254779207666439, + 1.1543753381354955, + -1.363798873502108 ], "cameraTarget": [ - 0.094882990675214, - 0.41078572113049105, - 0.24694978849037907 + -0.5847603655034967, + 0.03279712077260952, + 0.10329671958816641 ] }, "title": "3D Field" @@ -281,30 +316,25 @@ "title": "Swerve" }, { - "type": 1, - "legendHeight": 0.3, - "legends": { - "left": { - "lockedRange": null, - "unitConversion": { - "type": null, - "factor": 1 - }, - "fields": [] - }, - "discrete": { - "fields": [] - }, - "right": { - "lockedRange": null, - "unitConversion": { - "type": null, - "factor": 1 - }, - "fields": [] - } + "type": 8, + "uuid": "w26fbqu418htpvs39zw8oddzts9aym4o", + "fields": [], + "listFields": [], + "options": { + "ids": [ + 0, + 1, + 2 + ], + "layouts": [ + "Xbox Controller (White)", + "Xbox Controller (Blue)", + "None" + ] }, - "title": "Line Graph" + "configHidden": false, + "visualizer": null, + "title": "Joysticks" } ] } diff --git a/src/main/deploy/commit.txt b/src/main/deploy/commit.txt index 454be0e..921f0f6 100644 --- a/src/main/deploy/commit.txt +++ b/src/main/deploy/commit.txt @@ -1 +1 @@ -6a1814f \ No newline at end of file +980210a \ No newline at end of file diff --git a/src/main/include/Robot.h b/src/main/include/Robot.h index 9330216..c9ce867 100644 --- a/src/main/include/Robot.h +++ b/src/main/include/Robot.h @@ -43,7 +43,7 @@ class Robot : public frc::TimedRobot { units::second_t lastTotalLoopTime; nt::DoublePublisher loopTimePub{nt::NetworkTableInstance::GetDefault() - .GetTable("Metadata") + .GetTable("Looptime") ->GetDoubleTopic("RobotPeriodicLoopRate") .Publish()}; };