diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/MetricsManager.java b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/MetricsManager.java index d38b52718..266ea0b46 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/MetricsManager.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/MetricsManager.java @@ -28,6 +28,7 @@ import org.photonvision.common.hardware.metrics.cmds.CmdBase; import org.photonvision.common.hardware.metrics.cmds.FileCmds; import org.photonvision.common.hardware.metrics.cmds.LinuxCmds; import org.photonvision.common.hardware.metrics.cmds.PiCmds; +import org.photonvision.common.hardware.metrics.cmds.RK3588Cmds; import org.photonvision.common.logging.LogGroup; import org.photonvision.common.logging.Logger; import org.photonvision.common.util.ShellExec; @@ -44,6 +45,8 @@ public class MetricsManager { cmds = new FileCmds(); } else if (Platform.isRaspberryPi()) { cmds = new PiCmds(); // Pi's can use a hardcoded command set + } else if (Platform.isRK3588()) { + cmds = new RK3588Cmds(); // RK3588 chipset hardcoded command set } else if (Platform.isLinux()) { cmds = new LinuxCmds(); // Linux/Unix platforms assume a nominal command set } else { diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/RK3588Cmds.java b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/RK3588Cmds.java new file mode 100644 index 000000000..586ec9e98 --- /dev/null +++ b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/RK3588Cmds.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) Photon Vision. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.photonvision.common.hardware.metrics.cmds; + +import org.photonvision.common.configuration.HardwareConfig; + +public class RK3588Cmds extends LinuxCmds { + /** Applies pi-specific commands, ignoring any input configuration */ + public void initCmds(HardwareConfig config) { + super.initCmds(config); + + // CPU Temperature + /* The RK3588 chip has 7 thermal zones that can be accessed via: + * /sys/class/thermal/thermal_zoneX/temp + * where X is an interger from 0 to 6. + * + * || Zone || Location || Comments || + * | 0 | soc | soc thermal (near the center of the chip) | + * | 1 | bigcore0 | CPU Big Core A76_0/1 (CPU4 and CPU5) | + * | 2 | bigcore1 | CPU Big Core A76_2/3 (CPU6 and CPU7) | + * | 3 | littlecore | CPU Small Core A55_0/1/2/3 (CPU0, CPU1, CPU2, and CPU3) | + * | 4 | center | also called PD_CENTER | + * | 5 | gpu | GPU | + * | 6 | npu | NPU | + * + * Sources: + * - http://forum.armsom.org/t/topic/51/3 + * - https://lore.kernel.org/lkml/7276280.TLKafQO6qx@archbook/ + */ + cpuTemperatureCommand = + "cat /sys/class/thermal/thermal_zone1/temp | awk '{printf \"%.1f\", $1/1000}'"; + } +}