commit f28f342af3d99faf95225120c631a5fd66acd3a1
author Jim Ostrowski <yimmy13@gmail.com> Sat Oct 28 14:45:32 2023 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Sat Oct 28 14:45:32 2023 -0700
tree dc1a60cf844e762c01e5701d5fc00e43a66ded8e
parent 53b85ec6ad950cb6bcd57f471ba4aa4d6fa4a45f
parent 2be78e3eae78616657c47e0e25a25d29463d2b05

Merge "Add AprilTag support to charuco_lib and improve multi-camera cal code"

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 0c98e3f..49586b6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -734,9 +734,9 @@
     deps = ["@//third_party/allwpilib/wpimath"],
 )
 """,
-    sha256 = "3c4da9f46c751d4981697da26d3c8680f40c87090782f5adf63412e34508f372",
+    sha256 = "84b5b18ab6a7e10b88dd7b3c11a903830d90666dcfe99bb6eb7faeb0eb5645f6",
     urls = [
-        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/api-cpp/23.2.2/api-cpp-23.2.2-headers.zip",
+        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/api-cpp/23.10.0-alpha-1/api-cpp-23.10.0-alpha-1-headers.zip",
     ],
 )
 
@@ -758,9 +758,9 @@
     target_compatible_with = ['@//tools/platforms/hardware:roborio'],
 )
 """,
-    sha256 = "8391cbd24582c951a8fdbcff533243be718fc54e091c068d5441bb0c18ff822c",
+    sha256 = "a7646f9d1078fcafef21ddd02a82bc5b5de74dab4c02e6081ec7bab379dc5cdd",
     urls = [
-        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/api-cpp/23.2.2/api-cpp-23.2.2-linuxathena.zip",
+        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/api-cpp/23.10.0-alpha-1/api-cpp-23.10.0-alpha-1-linuxathena.zip",
     ],
 )
 
@@ -773,9 +773,9 @@
     hdrs = glob(['ctre/**/*.h', 'ctre/**/*.hpp']),
 )
 """,
-    sha256 = "33781c9db0a204e257928351c700295aec2bf6e2abb6a49ef237a95e98442a18",
+    sha256 = "fe09ec0e093114dcf45795c497e35073c66ab4d2ecb427f5940ce05e24dcc498",
     urls = [
-        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/tools/23.2.2/tools-23.2.2-headers.zip",
+        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/tools/23.10.0-alpha-1/tools-23.10.0-alpha-1-headers.zip",
     ],
 )
 
@@ -797,9 +797,9 @@
     target_compatible_with = ['@//tools/platforms/hardware:roborio'],
 )
 """,
-    sha256 = "75ec607f81ab470bc7c01fda2b8ca7b71b7dc3378b370f806f8646db27600504",
+    sha256 = "3a2fa4b4c6ce221d3f65daebaa9e8fc0e4ff025971fc6a2e8d386809ca0f11c7",
     urls = [
-        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/tools/23.2.2/tools-23.2.2-linuxathena.zip",
+        "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/tools/23.10.0-alpha-1/tools-23.10.0-alpha-1-linuxathena.zip",
     ],
 )
 

y2023_bot3/control_loops/superstructure/superstructure_goal.fbs

diff --git a/y2023_bot3/control_loops/superstructure/superstructure_goal.fbs b/y2023_bot3/control_loops/superstructure/superstructure_goal.fbs
index 5659e1f..27a302c 100644
--- a/y2023_bot3/control_loops/superstructure/superstructure_goal.fbs
+++ b/y2023_bot3/control_loops/superstructure/superstructure_goal.fbs
@@ -3,12 +3,13 @@
 namespace y2023_bot3.control_loops.superstructure;
 
 enum PivotGoal: ubyte {
-  PICKUP_FRONT = 0,
-  PICKUP_BACK = 1,
-  SCORE_LOW_FRONT = 2,
-  SCORE_LOW_BACK = 3,
-  SCORE_MID_FRONT = 4,
-  SCORE_MID_BACK = 5,
+  NEUTRAL = 0,
+  PICKUP_FRONT = 1,
+  PICKUP_BACK = 2,
+  SCORE_LOW_FRONT = 3,
+  SCORE_LOW_BACK = 4,
+  SCORE_MID_FRONT = 5,
+  SCORE_MID_BACK = 6,
 }
 
 enum RollerGoal: ubyte {