jeremy/FW_LED_System_Monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved device connection logic

Browse Source
This commit is contained in:
= 2024-08-03 10:24:03 -04:00
parent 48c1fda83a
commit 78c05943d7
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
led_system_monitor.py
View File

@ -12,6 +12,7 @@ from monitors import CPUMonitorThread, MemoryMonitorThread, BatteryMonitorThread
# External Dependencies # External Dependencies
try: try:
import serial # pyserial import serial # pyserial
from serial.tools import list_ports
import numpy as np # This is used in a module and we import it here to fetch it if needed import numpy as np # This is used in a module and we import it here to fetch it if needed
import screen_brightness_control as sbc import screen_brightness_control as sbc
except ImportError: except ImportError:
@ -19,44 +20,27 @@ except ImportError:
for dependency in ["numpy", "pyserial", "screen-brightness-control"]: for dependency in ["numpy", "pyserial", "screen-brightness-control"]:
pip.main(['install', '--user', dependency]) pip.main(['install', '--user', dependency])
import serial import serial
from serial.tools import list_ports
import screen_brightness_control as sbc import screen_brightness_control as sbc
# print(sbc.get_brightness()) # print(sbc.get_brightness())
def get_ports(): def init_device(location = "1-4.2"):
"""Returns a list of all available serial ports on the system.
Raises:
EnvironmentError: Will be returned if the platform is not Windows, Linux, Cygwin, or Darwin.
Returns:
[list(str)]: A list of valid serial ports on the system.
"""
if sys.platform.startswith('win'):
ports = ['COM%s' % (i+1) for i in range(256)]
elif sys.platform.startswith('linux') or sys.platform.startswith('cygwin'):
ports = reversed(glob.glob('/dev/ttyUSB*'))
elif sys.platform.startswith('darwin'):
ports = glob.glob('/dev/tty.*')
else:
raise EnvironmentError('Unsupported platform')
result = []
for port in ports:
try: try:
s = serial.Serial(port) # VID = 1234
s.close() # PID = 5678
result.append(port) device_list = list_ports.comports()
except (OSError, serial.SerialException): for device in device_list:
pass if device.location == location:
return result s = serial.Serial(device.device, 115200)
return s
except Exception as e:
print(e)
if __name__ == "__main__": if __name__ == "__main__":
# Left LED Matrix location: "1-4.2"
# Right LED Matrix location: "1-3.3"
# print(get_ports())
port = "COM3"
cpu_queue = queue.Queue(2) cpu_queue = queue.Queue(2)
cpu_monitor = CPUMonitorThread(cpu_queue) cpu_monitor = CPUMonitorThread(cpu_queue)
@ -70,8 +54,6 @@ if __name__ == "__main__":
battery_monitor = BatteryMonitorThread(battery_queue) battery_monitor = BatteryMonitorThread(battery_queue)
battery_monitor.start() battery_monitor.start()
s = serial.Serial(port, 115200)
min_background_brightness = 8 min_background_brightness = 8
max_background_brightness = 20 max_background_brightness = 20
min_foreground_brightness = 30 min_foreground_brightness = 30
@ -81,6 +63,8 @@ if __name__ == "__main__":
last_memory_values = memory_queue.get() last_memory_values = memory_queue.get()
last_battery_values = battery_queue.get() last_battery_values = battery_queue.get()
s = init_device()
while True: while True:
try: try:
if not cpu_queue.empty(): if not cpu_queue.empty():
@ -101,6 +85,8 @@ if __name__ == "__main__":
draw_to_LEDs(s, grid) draw_to_LEDs(s, grid)
except Exception as e: except Exception as e:
print(f"Error in main loop: {e}") print(f"Error in main loop: {e}")
s = init_device()
time.sleep(1.0)
time.sleep(0.05) time.sleep(0.05)