From 9cfc8b712b65b0591a7547e5abaed75e33e0517b Mon Sep 17 00:00:00 2001 From: Marc Rouillard Date: Tue, 13 Apr 2021 11:24:27 +0200 Subject: [PATCH 1/2] fixing issue on reading cpu load when decimal separator is not a dot --- examples/ssd1306_stats.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ssd1306_stats.py b/examples/ssd1306_stats.py index 1efb4d0..0b02e7a 100644 --- a/examples/ssd1306_stats.py +++ b/examples/ssd1306_stats.py @@ -65,7 +65,7 @@ # https://unix.stackexchange.com/questions/119126/command-to-display-memory-usage-disk-usage-and-cpu-load cmd = "hostname -I | cut -d' ' -f1" IP = subprocess.check_output(cmd, shell=True).decode("utf-8") - cmd = "top -bn1 | grep load | awk '{printf \"CPU Load: %.2f\", $(NF-2)}'" + cmd = "cut -f 1 -d \" \" /proc/loadavg" CPU = subprocess.check_output(cmd, shell=True).decode("utf-8") cmd = "free -m | awk 'NR==2{printf \"Mem: %s/%s MB %.2f%%\", $3,$2,$3*100/$2 }'" MemUsage = subprocess.check_output(cmd, shell=True).decode("utf-8") @@ -75,7 +75,7 @@ # Write four lines of text. draw.text((x, top + 0), "IP: " + IP, font=font, fill=255) - draw.text((x, top + 8), CPU, font=font, fill=255) + draw.text((x, top + 8), "CPU load: " + CPU, font=font, fill=255) draw.text((x, top + 16), MemUsage, font=font, fill=255) draw.text((x, top + 25), Disk, font=font, fill=255) From 03d5955d1ff5ecfff7932f85dea80bf18539e80d Mon Sep 17 00:00:00 2001 From: Marc Rouillard Date: Tue, 13 Apr 2021 11:59:23 +0200 Subject: [PATCH 2/2] run black --- examples/ssd1306_stats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ssd1306_stats.py b/examples/ssd1306_stats.py index 0b02e7a..af81d1d 100644 --- a/examples/ssd1306_stats.py +++ b/examples/ssd1306_stats.py @@ -65,7 +65,7 @@ # https://unix.stackexchange.com/questions/119126/command-to-display-memory-usage-disk-usage-and-cpu-load cmd = "hostname -I | cut -d' ' -f1" IP = subprocess.check_output(cmd, shell=True).decode("utf-8") - cmd = "cut -f 1 -d \" \" /proc/loadavg" + cmd = 'cut -f 1 -d " " /proc/loadavg' CPU = subprocess.check_output(cmd, shell=True).decode("utf-8") cmd = "free -m | awk 'NR==2{printf \"Mem: %s/%s MB %.2f%%\", $3,$2,$3*100/$2 }'" MemUsage = subprocess.check_output(cmd, shell=True).decode("utf-8")