From 50704497f43d83f880b8f4ee3ec68a7f6ffe3800 Mon Sep 17 00:00:00 2001
From: wildercayden <cayden@gmail.com>
Date: Wed, 25 Jun 2025 21:08:17 -0400
Subject: [PATCH] refindied it a bit and added mem

---
 Tableserver.py => TableLaptop.py |  3 ++-
 TablePI.py                       | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)
 rename Tableserver.py => TableLaptop.py (79%)

diff --git a/Tableserver.py b/TableLaptop.py
similarity index 79%
rename from Tableserver.py
rename to TableLaptop.py
index eb91f61..57575db 100644
--- a/Tableserver.py
+++ b/TableLaptop.py
@@ -11,5 +11,6 @@ print("Server started, waiting for data...")
 while True:
     cpu = table.getNumber("CPU Usage", -1)
     temp = table.getNumber("Temperature", -1)
-    print(f"CPU: {cpu}, Temp: {temp}")
+    mem = table.getNumber("Memory", -1)
+    print(f"CPU: {cpu}, Temp: {temp} Mem:{mem}")
     sleep(1)
diff --git a/TablePI.py b/TablePI.py
index 65744d1..3916718 100644
--- a/TablePI.py
+++ b/TablePI.py
@@ -8,8 +8,25 @@ table = NetworkTables.getTable("PiStatus")
 
 while True:
     cpu = psutil.cpu_percent()
-    temp = 52.5  # Example temperature
+    temps = psutil.sensors_temperatures()
+    mem = psutil.virtual_memory()
+
+    cputemp = "Unavailable"
+    for label in ["coretemp", "cpu-thermal", "k10temp", "cpu_thermal"]:
+        if label in temps and temps[label]:
+            cputemp = f"{temps[label][0].current:.1f}"
+            break
+    else:
+        # fallback for Pi
+        try:
+            with open("/sys/class/thermal/thermal_zone0/temp") as f:
+                cputemp = f"{int(f.read()) / 1000:.1f}"
+        except:
+            pass
+
     table.putNumber("CPU Usage", cpu)
-    table.putNumber("Temperature", temp)
+    table.putNumber("Temperature", float(cputemp) if cputemp != "Unavailable" else -1)
+    table.putNumber("Memory", mem.used // (1024**2))
     print("Sent data to laptop")
     time.sleep(1)
+