2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Update sensors.py to improve CPU data

Browse source 
Include AMD CCD sensors
Exclude current sensors
This commit is contained in:
2Shirt 2020-12-24 21:08:53 -07:00
parent 830395f672
commit 7d77aa81b0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/wk/hw/sensors.py
View file

@ -261,7 +261,7 @@ def fix_sensor_name(name):
name = name.replace('Smc', 'SMC') name = name.replace('Smc', 'SMC')
name = re.sub(r'(\D+)(\d+)', r'\1 \2', name, re.IGNORECASE) 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'^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) name = re.sub(r'\s+', ' ', name)
return name return name
@ -294,7 +294,7 @@ def get_sensor_data_linux():
## current temp is labeled xxxx_input ## current temp is labeled xxxx_input
for source, labels in sources.items(): for source, labels in sources.items():
for label, temp in labels.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 # Skip fan RPMs and voltages
continue continue
if 'input' in label: if 'input' in label: