mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-21 01:01:41 +00:00
Remove PhotonJNICommon in favor of CombinedRuntimeLoader (#2223)
## Description PhotonJNICommon is just our implementation of combined runtime loader, which we don't really need. This removes it and just uses CombinedRuntimeLoader directly. This also fixes the issues introduced in #2219, which lead to some of our JNIs not loading. ## Meta Merge checklist: - [x] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [ ] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2025.3.2 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [x] If this PR addresses a bug, a regression test for it is added --------- Co-authored-by: Matt M <matthew.morley.ca@gmail.com>
This commit is contained in:
@@ -27,65 +27,50 @@ import java.util.function.Supplier;
|
||||
@SuppressWarnings("unused")
|
||||
public enum Platform {
|
||||
// WPILib Supported (JNI)
|
||||
WINDOWS_64("Windows x64", Platform::getUnknownModel, "winx64", false, OSType.WINDOWS, true),
|
||||
LINUX_32("Linux x86", Platform::getUnknownModel, "linuxx64", false, OSType.LINUX, true),
|
||||
LINUX_64("Linux x64", Platform::getUnknownModel, "linuxx64", false, OSType.LINUX, true),
|
||||
WINDOWS_64("Windows x64", Platform::getUnknownModel, false, OSType.WINDOWS, true),
|
||||
LINUX_32("Linux x86", Platform::getUnknownModel, false, OSType.LINUX, true),
|
||||
LINUX_64("Linux x64", Platform::getUnknownModel, false, OSType.LINUX, true),
|
||||
LINUX_RASPBIAN32(
|
||||
"Linux Raspbian 32-bit",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm32",
|
||||
true,
|
||||
OSType.LINUX,
|
||||
true), // Raspberry Pi 3/4 with a 32-bit image
|
||||
LINUX_RASPBIAN64(
|
||||
"Linux Raspbian 64-bit",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm64",
|
||||
true,
|
||||
OSType.LINUX,
|
||||
true), // Raspberry Pi 3/4 with a 64-bit image
|
||||
LINUX_RK3588_64(
|
||||
"Linux AARCH 64-bit with RK3588",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm64",
|
||||
false,
|
||||
OSType.LINUX,
|
||||
true),
|
||||
LINUX_QCS6490(
|
||||
"Linux AARCH 64-bit with QCS6490",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm64",
|
||||
false,
|
||||
OSType.LINUX,
|
||||
true), // QCS6490 SBCs
|
||||
LINUX_AARCH64(
|
||||
"Linux AARCH64",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm64",
|
||||
false,
|
||||
OSType.LINUX,
|
||||
true), // Jetson Nano, Jetson TX2
|
||||
|
||||
// PhotonVision Supported (Manual build/install)
|
||||
LINUX_ARM64(
|
||||
"Linux ARM64",
|
||||
Platform::getLinuxDeviceTreeModel,
|
||||
"linuxarm64",
|
||||
false,
|
||||
OSType.LINUX,
|
||||
true), // ODROID C2, N2
|
||||
"Linux ARM64", Platform::getLinuxDeviceTreeModel, false, OSType.LINUX, true), // ODROID C2, N2
|
||||
|
||||
// Completely unsupported
|
||||
WINDOWS_32("Windows x86", Platform::getUnknownModel, "windowsx64", false, OSType.WINDOWS, false),
|
||||
MACOS("Mac OS", Platform::getUnknownModel, "osxuniversal", false, OSType.MACOS, false),
|
||||
WINDOWS_32("Windows x86", Platform::getUnknownModel, false, OSType.WINDOWS, false),
|
||||
MACOS("Mac OS", Platform::getUnknownModel, false, OSType.MACOS, false),
|
||||
LINUX_ARM32(
|
||||
"Linux ARM32",
|
||||
Platform::getUnknownModel,
|
||||
"linuxarm32",
|
||||
false,
|
||||
OSType.LINUX,
|
||||
false), // ODROID XU4, C1+
|
||||
UNKNOWN("Unsupported Platform", Platform::getUnknownModel, "", false, OSType.UNKNOWN, false);
|
||||
"Linux ARM32", Platform::getUnknownModel, false, OSType.LINUX, false), // ODROID XU4, C1+
|
||||
UNKNOWN("Unsupported Platform", Platform::getUnknownModel, false, OSType.UNKNOWN, false);
|
||||
|
||||
public enum OSType {
|
||||
WINDOWS,
|
||||
@@ -96,7 +81,6 @@ public enum Platform {
|
||||
|
||||
public final String description;
|
||||
public final String hardwareModel;
|
||||
public final String nativeLibraryFolderName;
|
||||
public final boolean isPi;
|
||||
public final OSType osType;
|
||||
public final boolean isSupported;
|
||||
@@ -108,7 +92,6 @@ public enum Platform {
|
||||
Platform(
|
||||
String description,
|
||||
Supplier<String> getHardwareModel,
|
||||
String nativeLibFolderName,
|
||||
boolean isPi,
|
||||
OSType osType,
|
||||
boolean isSupported) {
|
||||
@@ -117,7 +100,6 @@ public enum Platform {
|
||||
this.isPi = isPi;
|
||||
this.osType = osType;
|
||||
this.isSupported = isSupported;
|
||||
this.nativeLibraryFolderName = nativeLibFolderName;
|
||||
}
|
||||
|
||||
public static void overridePlatform(Platform platform) {
|
||||
@@ -161,10 +143,6 @@ public enum Platform {
|
||||
return currentPlatform.hardwareModel;
|
||||
}
|
||||
|
||||
public static String getNativeLibraryFolderName() {
|
||||
return currentPlatform.nativeLibraryFolderName;
|
||||
}
|
||||
|
||||
public static boolean isSupported() {
|
||||
return currentPlatform.isSupported;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user