SCRIPT: wpiformat

2026-06-30 02:31:44 +00:00 · 2025-11-07 19:57:55 -05:00
parent c48b722dac
commit 1e7604f81c
1218 changed files with 2709 additions and 3267 deletions
--- a/hal/src/main/native/sim/AddressableLED.cpp
+++ b/hal/src/main/native/sim/AddressableLED.cpp
@@ -10,10 +10,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/AddressableLEDDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/AddressableLEDDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/AnalogInput.cpp
+++ b/hal/src/main/native/sim/AnalogInput.cpp
@@ -8,8 +8,8 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/AnalogInDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/CANAPI.cpp
+++ b/hal/src/main/native/sim/CANAPI.cpp
@@ -7,15 +7,14 @@
 #include <ctime>
 #include <memory>

-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "HALInitializer.h"
 #include "PortsInternal.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"

 using namespace hal;

--- a/hal/src/main/native/sim/CTREPCM.cpp
+++ b/hal/src/main/native/sim/CTREPCM.cpp
@@ -9,9 +9,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/CTREPCMDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/CTREPCMDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/DIO.cpp
+++ b/hal/src/main/native/sim/DIO.cpp
@@ -8,10 +8,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
-#include "wpi/hal/handles/LimitedHandleResource.h"
 #include "mockdata/DIODataInternal.h"
 #include "mockdata/DigitalPWMDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"

 using namespace hal;

--- a/hal/src/main/native/sim/DriverStation.cpp
+++ b/hal/src/main/native/sim/DriverStation.cpp
@@ -15,15 +15,15 @@
 #include <string>

 #include <fmt/format.h>
-#include "wpi/util/EventVector.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"

 #include "HALInitializer.h"
+#include "mockdata/DriverStationDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/simulation/MockHooks.h"
-#include "mockdata/DriverStationDataInternal.h"
+#include "wpi/util/EventVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"

 static wpi::mutex msgMutex;
 static std::atomic<HALSIM_SendErrorHandler> sendErrorHandler{nullptr};
--- a/hal/src/main/native/sim/DutyCycle.cpp
+++ b/hal/src/main/native/sim/DutyCycle.cpp
@@ -9,10 +9,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/DutyCycleDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/DutyCycleDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/Encoder.cpp
+++ b/hal/src/main/native/sim/Encoder.cpp
@@ -10,10 +10,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/EncoderDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/LimitedHandleResource.h"
-#include "mockdata/EncoderDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/HAL.cpp
+++ b/hal/src/main/native/sim/HAL.cpp
@@ -9,9 +9,6 @@
 #include <utility>
 #include <vector>

-#include "wpi/util/mutex.hpp"
-#include "wpi/util/spinlock.hpp"
-
 #ifdef _WIN32
 #include <Windows.h>
 #pragma comment(lib, "Winmm.lib")
@@ -26,12 +23,14 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
 #include "ErrorsInternal.h"
 #include "HALInitializer.h"
 #include "MockHooksInternal.h"
+#include "mockdata/RoboRioDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Extensions.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
-#include "mockdata/RoboRioDataInternal.h"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/spinlock.hpp"

 using namespace hal;

--- a/hal/src/main/native/sim/MockHooks.cpp
+++ b/hal/src/main/native/sim/MockHooks.cpp
@@ -8,12 +8,11 @@
 #include <cstdio>
 #include <thread>

-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "MockHooksInternal.h"
 #include "NotifierInternal.h"
 #include "wpi/hal/simulation/NotifierData.h"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"

 static std::atomic<bool> programStarted{false};

--- a/hal/src/main/native/sim/Notifier.cpp
+++ b/hal/src/main/native/sim/Notifier.cpp
@@ -12,11 +12,6 @@
 #include <string>
 #include <utility>

-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "HALInitializer.h"
 #include "NotifierInternal.h"
 #include "wpi/hal/Errors.h"
@@ -24,6 +19,10 @@
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifierData.h"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"

 namespace {
 struct Notifier {
--- a/hal/src/main/native/sim/PWM.cpp
+++ b/hal/src/main/native/sim/PWM.cpp
@@ -12,8 +12,8 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/PWMDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/PowerDistribution.cpp
+++ b/hal/src/main/native/sim/PowerDistribution.cpp
@@ -10,9 +10,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/PowerDistributionDataInternal.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
-#include "mockdata/PowerDistributionDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/REVPH.cpp
+++ b/hal/src/main/native/sim/REVPH.cpp
@@ -9,9 +9,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/REVPHDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/REVPHDataInternal.h"

 using namespace hal;

--- a/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
@@ -6,11 +6,10 @@

 #include <vector>

-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/AddressableLEDData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"

 namespace hal {
 class AddressableLEDData {
--- a/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
@@ -6,11 +6,10 @@

 #include <memory>

-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"

 namespace hal {

--- a/hal/src/main/native/sim/mockdata/Reset.cpp
+++ b/hal/src/main/native/sim/mockdata/Reset.cpp
@@ -2,6 +2,7 @@
 // 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 "../PortsInternal.h"
 #include "wpi/hal/simulation/AddressableLEDData.h"
 #include "wpi/hal/simulation/AnalogInData.h"
 #include "wpi/hal/simulation/CTREPCMData.h"
@@ -18,8 +19,6 @@
 #include "wpi/hal/simulation/RoboRioData.h"
 #include "wpi/hal/simulation/SimDeviceData.h"

-#include "../PortsInternal.h"
-
 extern "C" void HALSIM_ResetAllSimData(void) {
  for (int32_t i = 0; i < hal::kNumAddressableLEDs; i++) {
    HALSIM_ResetAddressableLEDData(i);
--- a/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
@@ -7,10 +7,9 @@
 #include <cstddef>
 #include <string>

-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/RoboRioData.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"

 namespace hal {
 class RoboRioData {
--- a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
+++ b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
@@ -8,9 +8,8 @@
 #include <memory>
 #include <utility>

-#include "wpi/util/StringExtras.hpp"
-
 #include "SimDeviceDataInternal.h"
+#include "wpi/util/StringExtras.hpp"

 using namespace hal;

--- a/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
@@ -11,15 +11,14 @@
 #include <utility>
 #include <vector>

+#include "wpi/hal/Value.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/UidVector.hpp"
 #include "wpi/util/spinlock.hpp"

-#include "wpi/hal/Value.h"
-#include "wpi/hal/simulation/SimCallbackRegistry.h"
-#include "wpi/hal/simulation/SimDeviceData.h"
-
 namespace hal {

 namespace impl {