From 12e06b09c3ff75732bf4d078cb96c2f88b71da03 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 5 Jan 2022 20:34:42 -0800 Subject: [PATCH] Add Pi zero 2 W to PiVersion enum (#373) This approach is quite brittle, but it's easy to get working and can ship in an initial 2022 release. It's necessary to prevent GPU acceleration from happening on Pi 4s though. Let's try to put together something better for future releases. --- .../main/java/org/photonvision/common/hardware/PiVersion.java | 1 + .../main/java/org/photonvision/common/hardware/Platform.java | 2 +- photon-core/src/main/java/org/photonvision/raspi/PicamJNI.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/PiVersion.java b/photon-core/src/main/java/org/photonvision/common/hardware/PiVersion.java index 3e4b457a6..392b0632b 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/PiVersion.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/PiVersion.java @@ -20,6 +20,7 @@ public enum PiVersion { PI_B("Pi Model B"), COMPUTE_MODULE("Compute Module Rev"), ZERO_W("Pi Zero W Rev 1.1"), + ZERO_2_W("Raspberry Pi Zero 2 W"), PI_3("Pi 3"), PI_4("Pi 4"), COMPUTE_MODULE_3("Compute Module 3"), diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/Platform.java b/photon-core/src/main/java/org/photonvision/common/hardware/Platform.java index 5f4416787..61e606aff 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/Platform.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/Platform.java @@ -46,7 +46,7 @@ public enum Platform { private static final String OS_NAME = System.getProperty("os.name"); private static final String OS_ARCH = System.getProperty("os.arch"); - // These are querried on init and should never change after + // These are queried on init and should never change after public static final Platform currentPlatform = getCurrentPlatform(); protected static final String currentPiVersionStr = getPiVersionString(); public static final PiVersion currentPiVersion = PiVersion.getPiVersion(); diff --git a/photon-core/src/main/java/org/photonvision/raspi/PicamJNI.java b/photon-core/src/main/java/org/photonvision/raspi/PicamJNI.java index aa6c3180f..c5fad364e 100644 --- a/photon-core/src/main/java/org/photonvision/raspi/PicamJNI.java +++ b/photon-core/src/main/java/org/photonvision/raspi/PicamJNI.java @@ -89,7 +89,8 @@ public class PicamJNI { && getSensorModel() != SensorModel.Disconnected && Platform.isRaspberryPi() && (Platform.currentPiVersion == PiVersion.PI_3 - || Platform.currentPiVersion == PiVersion.COMPUTE_MODULE_3); + || Platform.currentPiVersion == PiVersion.COMPUTE_MODULE_3 + || Platform.currentPiVersion == PiVersion.ZERO_2_W); } public static SensorModel getSensorModel() {