From dc6de9cab0cf8f110523db7c6272bced89cbd207 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 5 Feb 2019 21:25:28 -0700
Subject: [PATCH] Use consistent labels

---
 .bin/Scripts/functions/hw_diags.py |  8 ++++----
 .bin/Scripts/functions/sensors.py  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 44a1c7f7..9ede016e 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -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)
diff --git a/.bin/Scripts/functions/sensors.py b/.bin/Scripts/functions/sensors.py
index 221fcfc3..a7d742bb 100644
--- a/.bin/Scripts/functions/sensors.py
+++ b/.bin/Scripts/functions/sensors.py
@@ -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):