From 4d74ea62785da80825a1976fcacbe61968794cbd Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 2 Jun 2025 16:41:47 -0700 Subject: [PATCH] [wpilib] Remove version writes (#8003) This will use a much different mechanism in the future. --- wpilibc/src/main/native/cpp/PneumaticHub.cpp | 21 ------------- wpilibc/src/main/native/cppcs/RobotBase.cpp | 11 ------- .../edu/wpi/first/wpilibj/PneumaticHub.java | 31 ------------------- .../java/edu/wpi/first/wpilibj/RobotBase.java | 25 --------------- 4 files changed, 88 deletions(-) diff --git a/wpilibc/src/main/native/cpp/PneumaticHub.cpp b/wpilibc/src/main/native/cpp/PneumaticHub.cpp index c7b8d43f25..2bdd10e22e 100644 --- a/wpilibc/src/main/native/cpp/PneumaticHub.cpp +++ b/wpilibc/src/main/native/cpp/PneumaticHub.cpp @@ -70,27 +70,6 @@ class PneumaticHub::DataStore { auto version = m_moduleObject.GetVersion(); - if (version.FirmwareMajor > 0 && RobotBase::IsReal()) { - // Write PH firmware version to roboRIO - std::FILE* file = nullptr; - file = std::fopen( - fmt::format("/tmp/frc_versions/REV_PH_{:0>2}_WPILib_Version.ini", - module) - .c_str(), - "w"); - if (file != nullptr) { - std::fputs("[Version]\n", file); - std::fputs(fmt::format("model=REV PH\n").c_str(), file); - std::fputs(fmt::format("deviceID={:x}\n", (0x9052600 | module)).c_str(), - file); - std::fputs(fmt::format("currentVersion={}.{}.{}", version.FirmwareMajor, - version.FirmwareMinor, version.FirmwareFix) - .c_str(), - file); - std::fclose(file); - } - } - // Check PH firmware version if (version.FirmwareMajor > 0 && version.FirmwareMajor < 22) { throw FRC_MakeError( diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index 197aba4adc..f4d8600356 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -216,17 +216,6 @@ RobotBase::RobotBase() { SmartDashboard::init(); - if constexpr (!IsSimulation()) { - std::FILE* file = nullptr; - file = std::fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w"); - - if (file != nullptr) { - std::fputs("C++ ", file); - std::fputs(GetWPILibVersion(), file); - std::fclose(file); - } - } - // Call DriverStation::RefreshData() to kick things off DriverStation::RefreshData(); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java index 09fe5b55ae..afd2b0f5a0 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java @@ -10,11 +10,6 @@ import edu.wpi.first.hal.REVPHFaults; import edu.wpi.first.hal.REVPHJNI; import edu.wpi.first.hal.REVPHStickyFaults; import edu.wpi.first.hal.REVPHVersion; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.HashMap; import java.util.Map; @@ -40,32 +35,6 @@ public class PneumaticHub implements PneumaticsBase { final String fwVersion = version.firmwareMajor + "." + version.firmwareMinor + "." + version.firmwareFix; - if (version.firmwareMajor > 0 && RobotBase.isReal()) { - // Write PH firmware version to roboRIO - final String fileName = "REV_PH_" + String.format("%02d", module) + "_WPILib_Version.ini"; - final File file = new File("/tmp/frc_versions/" + fileName); - try { - if (file.exists() && !file.delete()) { - throw new IOException("Failed to delete " + fileName); - } - - if (!file.createNewFile()) { - throw new IOException("Failed to create new " + fileName); - } - - try (OutputStream output = Files.newOutputStream(file.toPath())) { - output.write("[Version]\n".getBytes(StandardCharsets.UTF_8)); - output.write("model=REV PH\n".getBytes(StandardCharsets.UTF_8)); - output.write( - ("deviceID=" + Integer.toHexString(0x9052600 | module) + "\n") - .getBytes(StandardCharsets.UTF_8)); - output.write(("currentVersion=" + fwVersion).getBytes(StandardCharsets.UTF_8)); - } - } catch (IOException ex) { - DriverStation.reportError("Could not write " + fileName + ": " + ex, ex.getStackTrace()); - } - } - // Check PH firmware version if (version.firmwareMajor > 0 && version.firmwareMajor < 22) { throw new IllegalStateException( diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 9664db456d..661547e64c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -15,11 +15,6 @@ import edu.wpi.first.networktables.NetworkTableEvent; import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.util.WPIUtilJNI; import edu.wpi.first.wpilibj.util.WPILibVersion; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; @@ -297,26 +292,6 @@ public abstract class RobotBase implements AutoCloseable { m_robotCopy = robot; m_runMutex.unlock(); - if (!isSimulation()) { - final File file = new File("/tmp/frc_versions/FRC_Lib_Version.ini"); - try { - if (file.exists() && !file.delete()) { - throw new IOException("Failed to delete FRC_Lib_Version.ini"); - } - - if (!file.createNewFile()) { - throw new IOException("Failed to create new FRC_Lib_Version.ini"); - } - - try (OutputStream output = Files.newOutputStream(file.toPath())) { - output.write("Java ".getBytes(StandardCharsets.UTF_8)); - output.write(WPILibVersion.Version.getBytes(StandardCharsets.UTF_8)); - } - } catch (IOException ex) { - DriverStation.reportError("Could not write FRC_Lib_Version.ini: " + ex, ex.getStackTrace()); - } - } - boolean errorOnExit = false; try { robot.startCompetition();