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

Renamed "Prime95 & Temps" to "Prime95" for brevity

Browse source
This commit is contained in:
2Shirt 2018-12-08 18:16:31 -07:00
parent 49471663f5
commit 941a553766
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.bin/Scripts/functions/hw_diags.py
View file

@ -65,7 +65,7 @@ KEY_NVME = 'nvme_smart_health_information_log'
KEY_SMART = 'ata_smart_attributes' KEY_SMART = 'ata_smart_attributes'
QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'.format(**COLORS) QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'.format(**COLORS)
SIDE_PANE_WIDTH = 20 SIDE_PANE_WIDTH = 20
TESTS_CPU = ['Prime95 & Temps'] TESTS_CPU = ['Prime95']
TESTS_DISK = [ TESTS_DISK = [
'I/O Benchmark', 'I/O Benchmark',
'NVMe / SMART', 'NVMe / SMART',
@ -190,7 +190,7 @@ class State():
self.progress_out = '{}/progress.out'.format(global_vars['LogDir']) self.progress_out = '{}/progress.out'.format(global_vars['LogDir'])
self.quick_mode = False self.quick_mode = False
self.tests = OrderedDict({ self.tests = OrderedDict({
'Prime95 & Temps': { 'Prime95': {
'Enabled': False, 'Enabled': False,
'Function': run_mprime_test, 'Function': run_mprime_test,
'Objects': [], 'Objects': [],
@ -216,7 +216,7 @@ class State():
"""Set log and add devices.""" """Set log and add devices."""
self.disks = [] self.disks = []
for k in ['Result', 'Started', 'Status']: for k in ['Result', 'Started', 'Status']:
self.tests['Prime95 & Temps'][k] = False if k == 'Started' else '' self.tests['Prime95'][k] = False if k == 'Started' else ''
# Update LogDir # Update LogDir
if not self.quick_mode: if not self.quick_mode:
@ -443,7 +443,7 @@ def menu_diags(state, args):
{'Base Name': 'Full Diagnostic', 'Enabled': False}, {'Base Name': 'Full Diagnostic', 'Enabled': False},
{'Base Name': 'Disk Diagnostic', 'Enabled': False}, {'Base Name': 'Disk Diagnostic', 'Enabled': False},
{'Base Name': 'Disk Diagnostic (Quick)', 'Enabled': False}, {'Base Name': 'Disk Diagnostic (Quick)', 'Enabled': False},
{'Base Name': 'Prime95 & Temps', 'Enabled': False, 'CRLF': True}, {'Base Name': 'Prime95', 'Enabled': False, 'CRLF': True},
{'Base Name': 'NVMe / SMART', 'Enabled': False}, {'Base Name': 'NVMe / SMART', 'Enabled': False},
{'Base Name': 'badblocks', 'Enabled': False}, {'Base Name': 'badblocks', 'Enabled': False},
{'Base Name': 'I/O Benchmark', 'Enabled': False}, {'Base Name': 'I/O Benchmark', 'Enabled': False},
@ -642,13 +642,13 @@ def run_keyboard_test():
def run_mprime_test(state): def run_mprime_test(state):
"""Test CPU with Prime95 and track temps.""" """Test CPU with Prime95 and track temps."""
state.tests['Prime95 & Temps']['Started'] = True state.tests['Prime95']['Started'] = True
update_progress_pane(state) update_progress_pane(state)
_sensor_data = state.tests['Prime95 & Temps']['Sensor Data'] _sensor_data = state.tests['Prime95']['Sensor Data']
# Update top pane # Update top pane
_title = '{}\n{}{}{}'.format( _title = '{}\n{}{}{}'.format(
TOP_PANE_TEXT, 'Prime95 & Temps', TOP_PANE_TEXT, 'Prime95',
': ' if 'Model name' in state.lscpu else '', ': ' if 'Model name' in state.lscpu else '',
state.lscpu.get('Model name', '')) state.lscpu.get('Model name', ''))
tmux_update_pane(state.panes['Top'], text=_title) tmux_update_pane(state.panes['Top'], text=_title)
@ -706,7 +706,7 @@ def run_mprime_test(state):
sleep(1) sleep(1)
except KeyboardInterrupt: except KeyboardInterrupt:
# Catch CTRL+C # Catch CTRL+C
state.tests['Prime95 & Temps']['Result'] = 'Aborted' state.tests['Prime95']['Result'] = 'Aborted'
print_warning('\nAborted.') print_warning('\nAborted.')
update_progress_pane(state) update_progress_pane(state)
@ -743,7 +743,7 @@ def run_mprime_test(state):
# TODO # TODO
# Done # Done
state.tests['Prime95 & Temps']['Result'] = 'Unknown' state.tests['Prime95']['Result'] = 'Unknown'
update_progress_pane(state) update_progress_pane(state)
# Cleanup # Cleanup
@ -879,7 +879,7 @@ def update_progress_pane(state):
output = [] output = []
# Prime95 # Prime95
output.append(state.tests['Prime95 & Temps']['Status']) output.append(state.tests['Prime95']['Status'])
output.append(' ') output.append(' ')
# Disks # Disks