Modify the code to remove single drive class

Remove the class for single drive data fetching, and so we can modify
the monitor code to make sure we can handle multiple drives
This commit is contained in:
Jeff Curless
2025-10-26 12:12:30 -04:00
parent cf678772d6
commit 68f8057d8d
2 changed files with 51 additions and 96 deletions

View File

@@ -8,12 +8,12 @@ Requires: PyQt5 (including QtCharts)
"""
import sys
from systemsupport import systemData, CPULoad, multiDriveStat
from systemsupport import CPUInfo, CPULoad, multiDriveStat
# --------------------------
# Globals
# --------------------------
sysdata = systemData()
cpuinfo = CPUInfo()
cpuload = CPULoad()
multiDrive = multiDriveStat()
@@ -331,13 +331,13 @@ class MonitorWindow(QMainWindow):
# Obtain the current fan speed
try:
fan_speed = sysdata.fanSpeed
fan_speed = cpuinfo.CPUFanSpeed
except Exception:
fan_speed = None
temperatures = []
try:
temperatures.append( float(sysdata.CPUTemperature) )
temperatures.append( float(cpuinfo.temperature) )
except Exception:
temperatures.append( 0.0 )