Merge branch 'main' into 2027

wpical/src/main/native/cpp/WPIcal.cpp

@@ -19,10 +19,11 @@
 #include <fmt/format.h>
 #include <imgui.h>
 #include <portable-file-dialogs.h>
-#include <tagpose.h>
 #include <wpi/json.h>
 #include <wpigui.h>
 
+#include "tagpose.h"
+
 namespace gui = wpi::gui;
 
 const char* GetWPILibVersion();
@@ -140,7 +141,7 @@ static bool EmitEntryTarget(int tag_id, std::string& file) {
   if (ImGui::BeginDragDropTarget()) {
     if (const ImGuiPayload* payload =
             ImGui::AcceptDragDropPayload("FieldCalibration")) {
-      file = *(std::string*)payload->Data;
+      file = *static_cast<std::string*>(payload->Data);
       rv = true;
     }
     ImGui::EndDragDropTarget();

wpical/src/main/native/cpp/tagpose.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <tagpose.h>
+#include "tagpose.h"
+
 #include <wpi/deprecated.h>
 
 WPI_IGNORE_DEPRECATED

wpical/src/main/native/include/fieldmap.h

@@ -7,9 +7,10 @@
 #include <cmath>
 #include <map>
 
-#include <tagpose.h>
 #include <wpi/json.h>
 
+#include "tagpose.h"
+
 class Fieldmap {
  public:
   Fieldmap() = default;

wpical/src/main/native/include/fmap.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <fieldmap.h>
-
-#include <tagpose.h>
 #include <wpi/json.h>
 
+#include "fieldmap.h"
+#include "tagpose.h"
+
 namespace fmap {
 wpi::json singleTag(int tag, const tag::Pose& tagpose);
 wpi::json convertfmap(const wpi::json& json);