From 418b3814bc3b98294d96bc5a175499307d36974f Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 10 Nov 2025 21:18:58 -0500 Subject: [PATCH] Change SystemCore to Systemcore (#8359) --- .github/workflows/gradle.yml | 2 +- .github/workflows/sentinel-build.yml | 2 +- CONTRIBUTING.md | 2 +- README.md | 2 +- developerRobot/build.gradle | 4 ++-- .../main/java/org/wpilib/hardware/hal/HALUtil.java | 2 +- hal/src/main/native/cpp/jni/HALUtil.cpp | 2 +- hal/src/main/native/include/wpi/hal/HALBase.h | 4 ++-- hal/src/main/native/systemcore/HAL.cpp | 2 +- wpilibc/src/main/native/cppcs/RobotBase.cpp | 4 ++-- .../native/include/wpi/hardware/imu/OnboardIMU.hpp | 12 ++++++------ .../main/native/include/wpi/system/RuntimeType.hpp | 2 +- .../main/java/org/wpilib/framework/RobotBase.java | 2 +- .../java/org/wpilib/hardware/imu/OnboardIMU.java | 12 ++++++------ .../src/main/java/org/wpilib/system/RuntimeType.java | 6 +++--- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c1779f45ec..2688362f74 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,7 +20,7 @@ jobs: matrix: include: - container: wpilib/systemcore-cross-ubuntu:2027-24.04 - artifact-name: SystemCore + artifact-name: Systemcore build-options: "-Ponlylinuxsystemcore" - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04 artifact-name: Arm32 diff --git a/.github/workflows/sentinel-build.yml b/.github/workflows/sentinel-build.yml index 8b8fc9b40e..04ca3d84af 100644 --- a/.github/workflows/sentinel-build.yml +++ b/.github/workflows/sentinel-build.yml @@ -24,7 +24,7 @@ jobs: matrix: include: - container: wpilib/systemcore-cross-ubuntu:2027-24.04 - artifact-name: SystemCore + artifact-name: Systemcore build-options: "-Ponlylinuxsystemcore" - container: wpilib/raspbian-cross-ubuntu:2027-bookworm-24.04 artifact-name: Arm32 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ca8d049d2..e752645e10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,7 +57,7 @@ While the library should be fully formatted according to the styles, additional Changes should be submitted as a Pull Request against the main branch of WPILib. For most changes, commits will be squashed upon merge. For particularly large changes, multiple commits are ok, but assume one commit unless asked otherwise. We may ask you to break a PR into multiple standalone PRs or commits for rebase within one PR to separate unrelated changes. No change will be merged unless it is up to date with the current main branch. We do this to make sure that the git history isn't too cluttered. -Particularly large and/or breaking changes should be targeted to the 2027 branch, which targets the [SystemCore Robot Controller](https://community.firstinspires.org/introducing-the-future-mobile-robot-controller). The intent is minimize changes for 2026, to allow development to focus on preparing for 2027. +Particularly large and/or breaking changes should be targeted to the 2027 branch, which targets the [Systemcore Robot Controller](https://community.firstinspires.org/introducing-the-future-mobile-robot-controller). The intent is minimize changes for 2026, to allow development to focus on preparing for 2027. ### Merge Process diff --git a/README.md b/README.md index be812467fe..abfcc6dec6 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Using Gradle makes building WPILib very straightforward. It only has a few depen - If the WPILib installer was used, this toolchain is already installed - Raspberry Pi toolchain (optional) - Run `./gradlew installArm32Toolchain` after cloning this repository -- SystemCore toolchain (required for SystemCore development) +- Systemcore toolchain (required for Systemcore development) - Run `./gradlew installSystemCoreToolchain` after cloning this repository - If the WPILib installer was used, this toolchain is already installed diff --git a/developerRobot/build.gradle b/developerRobot/build.gradle index 36b55b7ec3..a7e0f592bf 100644 --- a/developerRobot/build.gradle +++ b/developerRobot/build.gradle @@ -308,7 +308,7 @@ model { } } - installSystemCore(Task) { + installSystemcore(Task) { $.binaries.each { if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'developerRobotCpp') { dependsOn it.tasks.install @@ -316,7 +316,7 @@ model { } } - installSystemCoreStatic(Task) { + installSystemcoreStatic(Task) { $.binaries.each { if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'developerRobotCppStatic') { dependsOn it.tasks.install diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java index 0de79909a2..db2eb1d678 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java @@ -43,7 +43,7 @@ public final class HALUtil extends JNIWrapper { /** Simulation runtime. */ public static final int RUNTIME_SIMULATION = 2; - /** SystemCore. */ + /** Systemcore. */ public static final int RUNTIME_SYSTEMCORE = 3; /** diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index 3e0c71c581..65af623615 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -37,7 +37,7 @@ static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO2 == static_assert(org_wpilib_hardware_hal_HALUtil_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; diff --git a/hal/src/main/native/include/wpi/hal/HALBase.h b/hal/src/main/native/include/wpi/hal/HALBase.h index 107878e6e9..94a37d5d49 100644 --- a/hal/src/main/native/include/wpi/hal/HALBase.h +++ b/hal/src/main/native/include/wpi/hal/HALBase.h @@ -33,8 +33,8 @@ HAL_ENUM(HAL_RuntimeType) { HAL_Runtime_RoboRIO2, /** Simulation runtime */ HAL_Runtime_Simulation, - /** SystemCore */ - HAL_Runtime_SystemCore, + /** Systemcore */ + HAL_Runtime_Systemcore, }; #ifdef __cplusplus diff --git a/hal/src/main/native/systemcore/HAL.cpp b/hal/src/main/native/systemcore/HAL.cpp index 74c7feefb9..e1a96cf153 100644 --- a/hal/src/main/native/systemcore/HAL.cpp +++ b/hal/src/main/native/systemcore/HAL.cpp @@ -164,7 +164,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; diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index c585ddac77..9ea748caf8 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -33,8 +33,8 @@ static_assert(wpi::RuntimeType::kRoboRIO2 == static_cast(HAL_Runtime_RoboRIO2)); static_assert(wpi::RuntimeType::kSimulation == static_cast(HAL_Runtime_Simulation)); -static_assert(wpi::RuntimeType::kSystemCore == - static_cast(HAL_Runtime_SystemCore)); +static_assert(wpi::RuntimeType::kSystemcore == + static_cast(HAL_Runtime_Systemcore)); using SetCameraServerSharedFP = void (*)(wpi::CameraServerShared*); diff --git a/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp b/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp index 94143fad90..74e08a0d02 100644 --- a/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp +++ b/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp @@ -13,27 +13,27 @@ namespace wpi { /** - * SystemCore onboard IMU + * Systemcore onboard IMU */ class OnboardIMU { public: /** - * A mount orientation of SystemCore + * A mount orientation of Systemcore */ enum MountOrientation { /** Flat (mounted parallel to the ground). */ kFlat, - /** Landscape (vertically mounted with long edge of SystemCore parallel to + /** Landscape (vertically mounted with long edge of Systemcore parallel to the ground). */ kLandscape, - /** Portrait (vertically mounted with the short edge of SystemCore parallel + /** Portrait (vertically mounted with the short edge of Systemcore parallel to the ground). */ kPortrait }; /** - * Constructs a handle to the SystemCore onboard IMU. - * @param mountOrientation the mount orientation of SystemCore to determine + * Constructs a handle to the Systemcore onboard IMU. + * @param mountOrientation the mount orientation of Systemcore to determine * yaw. */ explicit OnboardIMU(MountOrientation mountOrientation); diff --git a/wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp b/wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp index 6e1c2131b2..b69796d872 100644 --- a/wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp +++ b/wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp @@ -15,6 +15,6 @@ enum RuntimeType { kRoboRIO2, /// Simulation runtime. kSimulation, - kSystemCore + kSystemcore }; } // namespace wpi diff --git a/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java b/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java index 15bb8a772e..2762048234 100644 --- a/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java @@ -172,7 +172,7 @@ public abstract class RobotBase implements AutoCloseable { */ public static boolean isReal() { RuntimeType runtimeType = getRuntimeType(); - return runtimeType == RuntimeType.kSystemCore; + return runtimeType == RuntimeType.kSystemcore; } /** diff --git a/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java b/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java index bef61971e9..9035a5ae86 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java @@ -9,22 +9,22 @@ import org.wpilib.math.geometry.Quaternion; import org.wpilib.math.geometry.Rotation2d; import org.wpilib.math.geometry.Rotation3d; -/** SystemCore onboard IMU. */ +/** Systemcore onboard IMU. */ public class OnboardIMU { - /** A mount orientation of SystemCore. */ + /** A mount orientation of Systemcore. */ public enum MountOrientation { /** Flat (mounted parallel to the ground). */ kFlat, - /** Landscape (vertically mounted with long edge of SystemCore parallel to the ground). */ + /** Landscape (vertically mounted with long edge of Systemcore parallel to the ground). */ kLandscape, - /** Portrait (vertically mounted with the short edge of SystemCore parallel to the ground). */ + /** Portrait (vertically mounted with the short edge of Systemcore parallel to the ground). */ kPortrait } /** - * Constructs a handle to the SystemCore onboard IMU. + * Constructs a handle to the Systemcore onboard IMU. * - * @param mountOrientation the mount orientation of SystemCore to determine yaw. + * @param mountOrientation the mount orientation of Systemcore to determine yaw. */ public OnboardIMU(MountOrientation mountOrientation) { m_mountOrientation = mountOrientation; diff --git a/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java b/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java index 02fe797aee..b67616e67e 100644 --- a/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java +++ b/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java @@ -14,8 +14,8 @@ public enum RuntimeType { kRoboRIO2(HALUtil.RUNTIME_ROBORIO2), /** Simulation runtime. */ kSimulation(HALUtil.RUNTIME_SIMULATION), - /** SystemCore. */ - kSystemCore(HALUtil.RUNTIME_SYSTEMCORE); + /** Systemcore. */ + kSystemcore(HALUtil.RUNTIME_SYSTEMCORE); /** RuntimeType value. */ public final int value; @@ -34,7 +34,7 @@ public enum RuntimeType { return switch (type) { case HALUtil.RUNTIME_ROBORIO -> RuntimeType.kRoboRIO; case HALUtil.RUNTIME_ROBORIO2 -> RuntimeType.kRoboRIO2; - case HALUtil.RUNTIME_SYSTEMCORE -> RuntimeType.kSystemCore; + case HALUtil.RUNTIME_SYSTEMCORE -> RuntimeType.kSystemcore; default -> RuntimeType.kSimulation; }; }