From c800a9a4689a8bb43b6b98edd5e3defce6ef4534 Mon Sep 17 00:00:00 2001 From: Ethan Frank Date: Thu, 3 Nov 2022 19:57:30 -0400 Subject: [PATCH 1/3] Fix sim versionEntry NT table path --- photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java index b277387897..15be85e83e 100644 --- a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java +++ b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java @@ -61,7 +61,7 @@ public SimPhotonCamera(NetworkTableInstance instance, String cameraName) { targetAreaEntry = rootTable.getEntry("targetAreaEntry"); targetSkewEntry = rootTable.getEntry("targetSkewEntry"); targetPoseEntry = rootTable.getEntry("targetPoseEntry"); - versionEntry = rootTable.getEntry("versionEntry"); + versionEntry = mainTable.getEntry("version"); // Sets the version string so that it will always match the current version versionEntry.setString(PhotonVersion.versionString); From 0ec37e218e2829ef1b80c76af18a7274a7ad88ba Mon Sep 17 00:00:00 2001 From: Ethan Frank Date: Mon, 7 Nov 2022 14:02:01 -0500 Subject: [PATCH 2/3] Fix compile issue that mainTable is not accessible form SimPhotonCamera --- .../src/main/java/org/photonvision/SimPhotonCamera.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java index 15be85e83e..9c871120d8 100644 --- a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java +++ b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java @@ -61,7 +61,9 @@ public SimPhotonCamera(NetworkTableInstance instance, String cameraName) { targetAreaEntry = rootTable.getEntry("targetAreaEntry"); targetSkewEntry = rootTable.getEntry("targetSkewEntry"); targetPoseEntry = rootTable.getEntry("targetPoseEntry"); - versionEntry = mainTable.getEntry("version"); + + // The versionEntry is stored under the main table of /photonvision + versionEntry = instance.getTable("photonvision").getEntry("version"); // Sets the version string so that it will always match the current version versionEntry.setString(PhotonVersion.versionString); From 8086d3d21e92781b3126c0f5f9214865a32a3588 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 10 Nov 2022 21:50:02 -0500 Subject: [PATCH 3/3] Fix format --- photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java index 9c871120d8..c0b201d536 100644 --- a/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java +++ b/photon-lib/src/main/java/org/photonvision/SimPhotonCamera.java @@ -61,7 +61,7 @@ public SimPhotonCamera(NetworkTableInstance instance, String cameraName) { targetAreaEntry = rootTable.getEntry("targetAreaEntry"); targetSkewEntry = rootTable.getEntry("targetSkewEntry"); targetPoseEntry = rootTable.getEntry("targetPoseEntry"); - + // The versionEntry is stored under the main table of /photonvision versionEntry = instance.getTable("photonvision").getEntry("version");