Replace roborio macros/paths with systemcore macros/paths

virtuald · virtuald · commit 6cd9be6d5a65 · 2025-07-23T11:53:38.000-04:00
diff --git a/subprojects/robotpy-cscore/cscore/src/main.cpp b/subprojects/robotpy-cscore/cscore/src/main.cpp
@@ -3,7 +3,7 @@
 
 #include "cscore_cpp.h"
 
-#ifdef __FRC_ROBORIO__
+#ifdef __FRC_SYSTEMCORE__
 extern "C" {
     void WPI_Impl_SetupNowUseDefaultOnRio(void);
 }
@@ -23,7 +23,7 @@ SEMIWRAP_PYBIND11_MODULE(m) {
     });
     m.add_object("_cleanup", cleanup);
 
-    #ifdef __FRC_ROBORIO__
+    #ifdef __FRC_SYSTEMCORE__
     m.def("_setupWpiNow", WPI_Impl_SetupNowUseDefaultOnRio);
     #endif
 }
diff --git a/subprojects/robotpy-hal/hal/simulation/main.cpp b/subprojects/robotpy-hal/hal/simulation/main.cpp
@@ -22,7 +22,7 @@ SEMIWRAP_PYBIND11_MODULE(m) {
   m.def(
       "resetGlobalHandles",
       []() {
-#ifndef __FRC_ROBORIO__
+#ifndef __FRC_SYSTEMCORE__
         HALSIM_ResetGlobalHandles();
 #endif
       },
diff --git a/subprojects/robotpy-hal/hal/simulation/resethandles.cpp b/subprojects/robotpy-hal/hal/simulation/resethandles.cpp
@@ -1,6 +1,6 @@
 
 
-#ifndef __FRC_ROBORIO__
+#ifndef __FRC_SYSTEMCORE__
 #include <hal/Notifier.h>
 #include <hal/handles/HandlesInternal.h>
 #include <hal/simulation/NotifierData.h>
diff --git a/subprojects/robotpy-hal/hal/src/hal.cpp b/subprojects/robotpy-hal/hal/src/hal.cpp
@@ -60,8 +60,8 @@ SEMIWRAP_PYBIND11_MODULE(m) {
 
   initWrapper(m);
 
-#ifdef __FRC_ROBORIO__
-  m.attr("__halplatform__") = "roboRIO";
+#ifdef __FRC_SYSTEMCORE__
+  m.attr("__halplatform__") = "Systemcore";
   m.attr("__hal_simulation__") = false;
 #else
   m.attr("__halplatform__") = "sim";
diff --git a/subprojects/robotpy-hal/semiwrap/DutyCycle.yml b/subprojects/robotpy-hal/semiwrap/DutyCycle.yml
@@ -7,7 +7,7 @@ functions:
   HAL_InitializeDutyCycle:
   HAL_FreeDutyCycle:
   HAL_SetDutyCycleSimDevice:
-    ifndef: __FRC_ROBORIO__
+    ifndef: __FRC_SYSTEMCORE__
   HAL_GetDutyCycleFrequency:
   HAL_GetDutyCycleOutput:
   HAL_GetDutyCycleHighTime:
diff --git a/subprojects/robotpy-hal/semiwrap/Extensions.yml b/subprojects/robotpy-hal/semiwrap/Extensions.yml
@@ -5,14 +5,14 @@ strip_prefixes:
 
 functions:
   HAL_LoadOneExtension:
-    ifndef: __FRC_ROBORIO__
+    ifndef: __FRC_SYSTEMCORE__
   HAL_LoadExtensions:
-    ifndef: __FRC_ROBORIO__
+    ifndef: __FRC_SYSTEMCORE__
   HAL_RegisterExtension:
     ignore: true
   HAL_RegisterExtensionListener:
     ignore: true
   HAL_SetShowExtensionsNotFoundMessages:
-    ifndef: __FRC_ROBORIO__
+    ifndef: __FRC_SYSTEMCORE__
   HAL_OnShutdown:
     ignore: true
diff --git a/subprojects/robotpy-hal/semiwrap/PowerDistribution.yml b/subprojects/robotpy-hal/semiwrap/PowerDistribution.yml
@@ -27,13 +27,13 @@ functions:
   HAL_GetPowerDistributionFaults:
   HAL_GetPowerDistributionStickyFaults:
   HAL_StartPowerDistributionStream:
-    ifdef: __FRC_ROBORIO__
+    ifdef: __FRC_SYSTEMCORE__
   HAL_GetPowerDistributionStreamData:
-    ifdef: __FRC_ROBORIO__
+    ifdef: __FRC_SYSTEMCORE__
   HAL_FreePowerDistributionStreamData:
-    ifdef: __FRC_ROBORIO__
+    ifdef: __FRC_SYSTEMCORE__
   HAL_StopPowerDistributionStream:
-    ifdef: __FRC_ROBORIO__
+    ifdef: __FRC_SYSTEMCORE__
 classes:
   HAL_PowerDistributionVersion:
     attributes:
diff --git a/subprojects/robotpy-hal/semiwrap/SimDevice.yml b/subprojects/robotpy-hal/semiwrap/SimDevice.yml
@@ -263,7 +263,7 @@ inline_code: |
       return (bool)self;
     })
     .def_property_readonly("name", [](const hal::SimDevice &self) -> py::str {
-      #ifdef __FRC_ROBORIO__
+      #ifdef __FRC_SYSTEMCORE__
         return "<invalid>";
       #else
         if (!self) {
@@ -279,7 +279,7 @@ inline_code: |
       #endif
     })
     .def("__repr__", [](const hal::SimDevice &self) -> py::str {
-      #ifdef __FRC_ROBORIO__
+      #ifdef __FRC_SYSTEMCORE__
         return "<SimDevice (invalid)>";
       #else
         if (!self) {
@@ -312,7 +312,7 @@ inline_code: |
   cls_SimEnum
     .def_property("value", &SimEnum::Get, &SimEnum::Set)
     .def("__repr__", [](const SimEnum &self) -> py::str {
-      #ifdef __FRC_ROBORIO__
+      #ifdef __FRC_SYSTEMCORE__
         return "<SimEnum (invalid)>";
       #else
         if (self) {
diff --git a/subprojects/robotpy-wpilib/wpilib/_impl/start.py b/subprojects/robotpy-wpilib/wpilib/_impl/start.py
@@ -191,7 +191,7 @@ def _start(self, robot_cls: wpilib.RobotBase) -> bool:
         msub = ntcore.MultiSubscriber(inst, [""])
 
         if not isSimulation:
-            inst.startServer("/home/lvuser/networktables.ini")
+            inst.startServer("/home/systemcore/networktables.ini")
         else:
             inst.startServer()
 
diff --git a/subprojects/robotpy-wpilib/wpilib/cameraserver.py b/subprojects/robotpy-wpilib/wpilib/cameraserver.py
@@ -73,15 +73,15 @@ def launch(cls, vision_py: Optional[str] = None) -> None:
 
             if vision_py:
                 if not vision_py.startswith("/"):
-                    vision_py = "/home/lvuser/py/" + vision_py
+                    vision_py = "/home/systemcore/py/" + vision_py
                 args.append(vision_py)
                 hal.report(hal.tResourceType.kResourceType_PCVideoServer, 0x51)
             else:
                 hal.report(hal.tResourceType.kResourceType_PCVideoServer, 0x52)
 
             # We open a pipe to it so that when this process exits, it dies
             proc = subprocess.Popen(
-                args, close_fds=True, stdin=subprocess.PIPE, cwd="/home/lvuser/py"
+                args, close_fds=True, stdin=subprocess.PIPE, cwd="/home/systemcore/py"
             )
             th = threading.Thread(target=cls._monitor_child, args=(proc,))
             th.daemon = True
diff --git a/subprojects/robotpy-wpilib/wpilib/deployinfo.py b/subprojects/robotpy-wpilib/wpilib/deployinfo.py
@@ -27,7 +27,7 @@ def getDeployData() -> typing.Optional[typing.Dict[str, str]]:
         return None
 
     try:
-        with open("/home/lvuser/py/deploy.json") as fp:
+        with open("/home/systemcore/py/deploy.json") as fp:
             return json.load(fp)
     except FileNotFoundError:
         return {}
diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp b/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp
@@ -1,7 +1,7 @@
 
 #include "semiwrap_init.wpilib.simulation._simulation.hpp"
 
-#ifndef __FRC_ROBORIO__
+#ifndef __FRC_SYSTEMCORE__
 
 namespace frc::impl {
 void ResetSmartDashboardInstance();
diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h b/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.h
@@ -6,17 +6,17 @@
 namespace robotpy::filesystem {
 
 /**
- * Obtains the operating directory of the program. On the roboRIO, this
- * is /home/lvuser/py. In simulation, it is the location of robot.py
+ * Obtains the operating directory of the program. On the robot, this
+ * is /home/systemcore/py. In simulation, it is the location of robot.py
  *
  * @return The result of the operating directory lookup.
  */
 std::string GetOperatingDirectory();
 
 /**
  * Obtains the deploy directory of the program, which is the remote location
- * the deploy directory is deployed to by default. On the roboRIO, this is
- * /home/lvuser/py/deploy. In simulation, it is where the simulation was launched
+ * the deploy directory is deployed to by default. On the robot, this is
+ * /home/systemcore/py/deploy. In simulation, it is where the simulation was launched
  * from, in the subdirectory "deploy" (`dirname(robot.py)`/deploy).
  *
  * @return The result of the operating directory lookup
diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.inc b/subprojects/robotpy-wpilib/wpilib/src/rpy/Filesystem.inc
@@ -30,8 +30,8 @@ static fs::path getMainPath() {
   if (locals.contains("main_path")) {
     return fs::path(py::cast<std::string>(locals["main_path"]));
   } else {
-#ifdef __FRC_ROBORIO__
-    return fs::path("/home/lvuser/py");
+#ifdef __FRC_SYSTEMCORE__
+    return fs::path("/home/systemcore/py");
 #else
     return fs::current_path();
 #endif
diff --git a/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp b/subprojects/robotpy-wpiutil/wpiutil/src/main.cpp
@@ -7,7 +7,7 @@ void cleanup_stack_trace_hook();
 void setup_safethread_gil();
 void cleanup_safethread_gil();
 
-#ifndef __FRC_ROBORIO__
+#ifndef __FRC_SYSTEMCORE__
 
 namespace wpi::impl {
 void ResetSendableRegistry();

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "cscore_cpp.h"`
`5`	`5`
`6`		`-#ifdef __FRC_ROBORIO__`
	`6`	`+#ifdef __FRC_SYSTEMCORE__`
`7`	`7`	`extern "C" {`
`8`	`8`	`void WPI_Impl_SetupNowUseDefaultOnRio(void);`
`9`	`9`	`}`
`@@ -23,7 +23,7 @@ SEMIWRAP_PYBIND11_MODULE(m) {`
`23`	`23`	`});`
`24`	`24`	`m.add_object("_cleanup", cleanup);`
`25`	`25`
`26`		`- #ifdef __FRC_ROBORIO__`
	`26`	`+ #ifdef __FRC_SYSTEMCORE__`
`27`	`27`	`m.def("_setupWpiNow", WPI_Impl_SetupNowUseDefaultOnRio);`
`28`	`28`	`#endif`
`29`	`29`	`}`