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

Use consistent labels

Browse source
This commit is contained in:
2Shirt 2019-02-05 21:25:28 -07:00
parent a28a754be1
commit dc6de9cab0
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1325,12 +1325,12 @@ def run_mprime_test(state, test):
# Wait
sleep(1)
except (KeyboardInterrupt, ThermalError) as err:
# CTRL+c pressed or thermal threshold reached
except (KeyboardInterrupt, ThermalLimitReachedError) as err:
# CTRL+c pressed or thermal limit reached
test.aborted = True
if isinstance(err, KeyboardInterrupt):
test.update_status('Aborted')
elif isinstance(err, ThermalError):
elif isinstance(err, ThermalLimitReachedError):
test.failed = True
test.thermal_abort = True
test.update_status('NS')
@ -1440,7 +1440,7 @@ def run_mprime_test(state, test):
' {YELLOW}Aborted{CLEAR}'.format(**COLORS))
if test.thermal_abort:
test.report.append(
' {RED}CPU temps exceeded threshold{CLEAR}'.format(**COLORS))
' {RED}CPU reached temperature limit{CLEAR}'.format(**COLORS))
# Done
update_progress_pane(state)

10
.bin/Scripts/functions/sensors.py
View file

@ -20,7 +20,7 @@ REGEX_COLORS = re.compile(r'\033\[\d+;?1?m')
# Error Classes
class ThermalError(Exception):
class ThermalLimitReachedError(Exception):
pass
@ -219,7 +219,7 @@ def save_average_temp(sensor_data, temp_label, seconds=10):
_data[temp_label] = sum(_data['Temps']) / len(_data['Temps'])
def update_sensor_data(sensor_data, thermal_threshold=None):
def update_sensor_data(sensor_data, thermal_limit=None):
"""Read sensors and update existing sensor_data, returns dict."""
json_data = get_raw_sensor_data()
for _section, _adapters in sensor_data.items():
@ -236,9 +236,9 @@ def update_sensor_data(sensor_data, thermal_threshold=None):
pass
# Check if thermal limit reached
if thermal_threshold and _section == 'CoreTemps':
if max(_data['Current'], _data['Max']) >= thermal_threshold:
raise ThermalError('CoreTemps above threshold')
if thermal_limit and _section == 'CoreTemps':
if max(_data['Current'], _data['Max']) >= thermal_limit:
raise ThermalLimitReachedError('CoreTemps reached limit')
def join_columns(column1, column2, width=55):