From f13a507a71274a497a970173cd2898dba9491029 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 15 Jan 2024 23:03:52 -0500 Subject: [PATCH] Fix total ram reporting (#1161) --- .../photonvision/common/hardware/metrics/cmds/LinuxCmds.java | 2 +- .../org/photonvision/common/hardware/metrics/cmds/PiCmds.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/LinuxCmds.java b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/LinuxCmds.java index 9abff7ce9..56ad1b736 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/LinuxCmds.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/LinuxCmds.java @@ -22,7 +22,7 @@ import org.photonvision.common.configuration.HardwareConfig; public class LinuxCmds extends CmdBase { public void initCmds(HardwareConfig config) { // CPU - cpuMemoryCommand = "free -m | awk 'FNR == 2 {print $3}'"; + cpuMemoryCommand = "free -m | awk 'FNR == 2 {print $2}'"; // TODO: boards have lots of thermal devices. Hard to pick the CPU diff --git a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/PiCmds.java b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/PiCmds.java index ba72dc553..88ed23f22 100644 --- a/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/PiCmds.java +++ b/photon-core/src/main/java/org/photonvision/common/hardware/metrics/cmds/PiCmds.java @@ -25,7 +25,6 @@ public class PiCmds extends LinuxCmds { super.initCmds(config); // CPU - cpuMemoryCommand = "free -m | awk 'FNR == 2 {print $2}'"; cpuTemperatureCommand = "sed 's/.\\{3\\}$/.&/' /sys/class/thermal/thermal_zone0/temp"; cpuThrottleReasonCmd = "if (( $(( $(vcgencmd get_throttled | grep -Eo 0x[0-9a-fA-F]*) & 0x01 )) != 0x00 )); then echo \"LOW VOLTAGE\"; "