Merge branch 'main' into Doxygen1.12

.github/workflows/comment-command.yml

@@ -43,7 +43,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Install wpiformat
-        run: pip3 install wpiformat==2024.39
+        run: pip3 install wpiformat==2024.40
       - name: Run wpiformat
         run: wpiformat
       - name: Run spotlessApply

.github/workflows/lint-format.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           python-version: '3.10'
       - name: Install wpiformat
-        run: pip3 install wpiformat==2024.39
+        run: pip3 install wpiformat==2024.40
       - name: Run
         run: wpiformat
       - name: Check output
@@ -66,7 +66,7 @@ jobs:
         with:
           python-version: '3.10'
       - name: Install wpiformat
-        run: pip3 install wpiformat==2024.39
+        run: pip3 install wpiformat==2024.40
       - name: Create compile_commands.json
         run: |
           ./gradlew generateCompileCommands -Ptoolchain-optional-roboRio

.github/workflows/upstream-utils.yml

@@ -34,92 +34,92 @@ jobs:
         run: |
           cd upstream_utils
           ./apriltag.py clone
-          ./apriltag.py copy-upstream-to-thirdparty
+          ./apriltag.py copy-src
       - name: Run eigen.py
         run: |
           cd upstream_utils
           ./eigen.py clone
-          ./eigen.py copy-upstream-to-thirdparty
+          ./eigen.py copy-src
       - name: Run fmt.py
         run: |
           cd upstream_utils
           ./fmt.py clone
-          ./fmt.py copy-upstream-to-thirdparty
+          ./fmt.py copy-src
       - name: Run gcem.py
         run: |
           cd upstream_utils
           ./gcem.py clone
-          ./gcem.py copy-upstream-to-thirdparty
+          ./gcem.py copy-src
       - name: Run gl3w.py
         run: |
           cd upstream_utils
           ./gl3w.py clone
-          ./gl3w.py copy-upstream-to-thirdparty
+          ./gl3w.py copy-src
       - name: Run glfw.py
         run: |
           cd upstream_utils
           ./glfw.py clone
-          ./glfw.py copy-upstream-to-thirdparty
+          ./glfw.py copy-src
       - name: Run googletest.py
         run: |
           cd upstream_utils
           ./googletest.py clone
-          ./googletest.py copy-upstream-to-thirdparty
+          ./googletest.py copy-src
       - name: Run imgui.py
         run: |
           cd upstream_utils
           ./imgui.py clone
-          ./imgui.py copy-upstream-to-thirdparty
+          ./imgui.py copy-src
       - name: Run implot.py
         run: |
           cd upstream_utils
           ./implot.py clone
-          ./implot.py copy-upstream-to-thirdparty
+          ./implot.py copy-src
       - name: Run json.py
         run: |
           cd upstream_utils
           ./json.py clone
-          ./json.py copy-upstream-to-thirdparty
+          ./json.py copy-src
       - name: Run libuv.py
         run: |
           cd upstream_utils
           ./libuv.py clone
-          ./libuv.py copy-upstream-to-thirdparty
+          ./libuv.py copy-src
       - name: Run llvm.py
         run: |
           cd upstream_utils
           ./llvm.py clone
-          ./llvm.py copy-upstream-to-thirdparty
+          ./llvm.py copy-src
       - name: Run mpack.py
         run: |
           cd upstream_utils
           ./mpack.py clone
-          ./mpack.py copy-upstream-to-thirdparty
+          ./mpack.py copy-src
       - name: Run stack_walker.py
         run: |
           cd upstream_utils
           ./stack_walker.py clone
-          ./stack_walker.py copy-upstream-to-thirdparty
+          ./stack_walker.py copy-src
       - name: Run memory.py
         run: |
           cd upstream_utils
           ./memory.py clone
-          ./memory.py copy-upstream-to-thirdparty
+          ./memory.py copy-src
       - name: Run protobuf.py
         run: |
           cd upstream_utils
           ./protobuf.py clone
-          ./protobuf.py copy-upstream-to-thirdparty
+          ./protobuf.py copy-src
       - name: Run sleipnir.py
         run: |
           cd upstream_utils
           ./sleipnir.py clone
-          ./sleipnir.py copy-upstream-to-thirdparty
+          ./sleipnir.py copy-src
       - name: Run stb.py
         run: |
           cd upstream_utils
           ./stb.py clone
-          ./stb.py copy-upstream-to-thirdparty
+          ./stb.py copy-src
       - name: Add untracked files to index so they count as changes
         run: git add -A
       - name: Check output

.gitignore

@@ -249,3 +249,6 @@ imgui.ini
 /bazel-*
 user.bazelrc
 coverage_report/
+
+# ctest
+/Testing/

upstream_utils/README.md

@@ -37,7 +37,7 @@ Update the `upstream_utils` patch files and the tag in the script.
 
 Copy the updated upstream files into the thirdparty files within allwpilib.
 ```bash
-./<lib>.py copy-upstream-to-thirdparty
+./<lib>.py copy-src
 ```
 
 ## Adding patch to thirdparty library
@@ -78,5 +78,5 @@ Update the `upstream_utils` patch files.
 
 Rerun `<lib>.py` to reimport the thirdparty files.
 ```bash
-./<lib>.py copy-upstream-to-thirdparty
+./<lib>.py copy-src
 ```

upstream_utils/upstream_utils.py

@@ -65,12 +65,12 @@ def get_repo_root():
 
     An empty string is returned if no repository root was found.
     """
-    current_dir = os.path.abspath(os.getcwd())
-    while current_dir != os.path.dirname(current_dir):
-        if os.path.exists(current_dir + os.sep + ".git"):
-            return current_dir
-        current_dir = os.path.dirname(current_dir)
-    return ""
+    return subprocess.run(
+        ["git", "rev-parse", "--show-toplevel"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.DEVNULL,
+        encoding="ascii",
+    ).stdout.rstrip()
 
 
 def walk_if(top, pred):
@@ -564,7 +564,7 @@ def main(self, argv=sys.argv[1:]):
         )
 
         subparsers.add_parser(
-            "copy-upstream-to-thirdparty",
+            "copy-src",
             help="Copies files from the upstream repository into the thirdparty directory in allwpilib",
         )
 
@@ -581,5 +581,5 @@ def main(self, argv=sys.argv[1:]):
             self.rebase(args.new_tag)
         elif args.subcommand == "format-patch":
             self.format_patch()
-        elif args.subcommand == "copy-upstream-to-thirdparty":
+        elif args.subcommand == "copy-src":
             self.copy_upstream_to_thirdparty()

wpilibc/src/main/native/include/frc/smartdashboard/FieldObject2d.h

@@ -85,7 +85,6 @@ class FieldObject2d {
   /**
    * Get multiple poses.
    *
-   * @param obj Object entry
    * @return vector of 2D poses
    */
   std::vector<Pose2d> GetPoses() const;