Adjusted Prime95 countdown
This commit is contained in:
parent
ca4234b1c3
commit
a910f2cb03
1 changed files with 14 additions and 13 deletions
|
|
@ -651,6 +651,8 @@ def run_mprime_test(state):
|
||||||
sensor_data=_sensor_data, temp_label='Idle')
|
sensor_data=_sensor_data, temp_label='Idle')
|
||||||
|
|
||||||
# Stress CPU
|
# Stress CPU
|
||||||
|
print_log('Starting Prime95')
|
||||||
|
_abort_msg = 'If running too hot, press CTRL+c to abort the test'
|
||||||
run_program(['apple-fans', 'max'])
|
run_program(['apple-fans', 'max'])
|
||||||
tmux_update_pane(
|
tmux_update_pane(
|
||||||
state.panes['mprime'],
|
state.panes['mprime'],
|
||||||
|
|
@ -660,24 +662,23 @@ def run_mprime_test(state):
|
||||||
try:
|
try:
|
||||||
for i in range(time_limit):
|
for i in range(time_limit):
|
||||||
clear_screen()
|
clear_screen()
|
||||||
sec_left = time_limit - i
|
sec_left = (time_limit - i) % 60
|
||||||
min_left = int(sec_left / 60)
|
min_left = int( (time_limit - i) / 60)
|
||||||
|
_status_str = 'Running Prime95 ('
|
||||||
if min_left > 0:
|
if min_left > 0:
|
||||||
print_standard(
|
_status_str += '{} minute{}, '.format(
|
||||||
'Running Prime95 ({} minute{} left)'.format(
|
|
||||||
min_left,
|
min_left,
|
||||||
's' if min_left != 1 else ''))
|
's' if min_left != 1 else '')
|
||||||
else:
|
_status_str += '{} second{} left)'.format(
|
||||||
print_standard(
|
|
||||||
'Running Prime95 ({} second{} left)'.format(
|
|
||||||
sec_left,
|
sec_left,
|
||||||
's' if sec_left != 1 else ''))
|
's' if sec_left != 1 else '')
|
||||||
print_warning('If running too hot, press CTRL+c to abort the test')
|
# Not using print wrappers to avoid flooding the log
|
||||||
|
print(_status_str)
|
||||||
|
print('{YELLOW}{msg}{CLEAR}'.format(msg=_abort_msg, **COLORS))
|
||||||
update_sensor_data(_sensor_data)
|
update_sensor_data(_sensor_data)
|
||||||
sleep(1)
|
sleep(1)
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
# Catch CTRL+C
|
# Catch CTRL+C
|
||||||
aborted = True
|
|
||||||
state.tests['Prime95 & Temps']['Result'] = 'Aborted'
|
state.tests['Prime95 & Temps']['Result'] = 'Aborted'
|
||||||
print_warning('\nAborted.')
|
print_warning('\nAborted.')
|
||||||
update_progress_pane(state)
|
update_progress_pane(state)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue