From 7d77aa81b064e420fa7bfbff7f577ca7eafdb1bb Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 24 Dec 2020 21:08:53 -0700 Subject: [PATCH] Update sensors.py to improve CPU data Include AMD CCD sensors Exclude current sensors --- scripts/wk/hw/sensors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wk/hw/sensors.py b/scripts/wk/hw/sensors.py index 784406da..573c9c3b 100644 --- a/scripts/wk/hw/sensors.py +++ b/scripts/wk/hw/sensors.py @@ -261,7 +261,7 @@ def fix_sensor_name(name): name = name.replace('Smc', 'SMC') name = re.sub(r'(\D+)(\d+)', r'\1 \2', name, re.IGNORECASE) name = re.sub(r'^K (\d+)Temp', r'AMD K\1 Temps', name, re.IGNORECASE) - name = re.sub(r'T(ctl|die)', r'CPU (T\1)', name, re.IGNORECASE) + name = re.sub(r'T(ccd\s+\d+|ctl|die)', r'CPU (T\1)', name, re.IGNORECASE) name = re.sub(r'\s+', ' ', name) return name @@ -294,7 +294,7 @@ def get_sensor_data_linux(): ## current temp is labeled xxxx_input for source, labels in sources.items(): for label, temp in labels.items(): - if label.startswith('fan') or label.startswith('in'): + if label.startswith('fan') or label.startswith('in') or label.startswith('curr'): # Skip fan RPMs and voltages continue if 'input' in label: