Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal,wpilib] Rename RuntimeType constants to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-14 10:33:36 -07:00
parent 227f01f3bd
commit f6fdae3212
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hal/src/main/native/cpp/jni/HALUtil.cpp
View File

@@ -32,13 +32,13 @@ using namespace wpi::util::java;
#define kRIOStatusResourceNotInitialized -52010
static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO ==
HAL_Runtime_RoboRIO);
static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO2 ==
HAL_Runtime_RoboRIO2);
HAL_RUNTIME_ROBORIO);
static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO_2 ==
HAL_RUNTIME_ROBORIO_2);
static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_SIMULATION ==
HAL_Runtime_Simulation);
HAL_RUNTIME_SIMULATION);
static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_SYSTEMCORE ==
HAL_Runtime_Systemcore);
HAL_RUNTIME_SYSTEMCORE);
static JavaVM* jvm = nullptr;
static JException illegalArgExCls;

8
hal/src/main/native/include/wpi/hal/HAL.h
View File

@@ -26,13 +26,13 @@
*/
HAL_ENUM(HAL_RuntimeType) {
/** roboRIO 1.0 */
HAL_Runtime_RoboRIO,
HAL_RUNTIME_ROBORIO,
/** roboRIO 2.0 */
HAL_Runtime_RoboRIO2,
HAL_RUNTIME_ROBORIO_2,
/** Simulation runtime */
HAL_Runtime_Simulation,
HAL_RUNTIME_SIMULATION,
/** Systemcore */
HAL_Runtime_Systemcore,
HAL_RUNTIME_SYSTEMCORE,
};
#ifdef __cplusplus

2
hal/src/main/native/sim/HAL.cpp
View File

@@ -54,7 +54,7 @@ class SimPeriodicCallbackRegistry : public impl::SimCallbackRegistryBase {
};
} // namespace
static HAL_RuntimeType runtimeType{HAL_Runtime_Simulation};
static HAL_RuntimeType runtimeType{HAL_RUNTIME_SIMULATION};
static wpi::util::spinlock gOnShutdownMutex;
static std::vector<std::pair<void*, void (*)(void*)>> gOnShutdown;
static SimPeriodicCallbackRegistry gSimPeriodicBefore;

2
hal/src/main/native/systemcore/HAL.cpp
View File

@@ -155,7 +155,7 @@ const char* HAL_GetErrorMessage(int32_t code) {
}
}
static HAL_RuntimeType runtimeType = HAL_Runtime_Systemcore;
static HAL_RuntimeType runtimeType = HAL_RUNTIME_SYSTEMCORE;
HAL_RuntimeType HAL_GetRuntimeType(void) {
return runtimeType;