From 74bb31e795c41b2466d33ef9fa76f169e3b8ad89 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 5 Dec 2018 23:57:38 -0700
Subject: [PATCH] Open temps monitor during run_mprime

---
 .bin/Scripts/functions/hw_diags.py | 17 +++++++++++++++++
 .bin/Scripts/hw-sensors-monitor    |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index cc9a2c40..594f807a 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -4,6 +4,7 @@ import json
 import re
 import time
 
+from functions.sensors import *
 from functions.tmux import *
 
 # STATIC VARIABLES
@@ -614,6 +615,13 @@ def run_keyboard_test():
 def run_mprime_test(state):
   """Test CPU with Prime95 and track temps."""
   # Prep
+  _sensors_out = '{}/sensors.out'.format(global_vars['TmpDir'])
+  with open(_sensors_out, 'w') as f:
+    f.write(' ')
+  sleep(1)
+  monitor_proc = popen_program(
+    ['hw-sensors-monitor', _sensors_out],
+    pipe=True)
   _title = '{}\n{}{}{}'.format(
     TOP_PANE_TEXT, 'Prime95 & Temps',
     ': ' if 'Model name' in state.lscpu else '',
@@ -621,6 +629,15 @@ def run_mprime_test(state):
   tmux_update_pane(state.panes['Top'], text=_title)
   state.tests['Prime95 & Temps']['Started'] = True
   update_progress_pane(state)
+  state.panes['mprime'] = tmux_split_window(
+    lines=10, vertical=True, text='Prime95 output goes here...')
+  state.panes['Temps'] = tmux_split_window(
+    behind=True, percent=80, vertical=True, watch=_sensors_out)
+  tmux_resize_pane(global_vars['Env']['TMUX_PANE'], y=3)
+
+  # Start live monitor
+  pause()
+  monitor_proc.kill()
 
   # Get idle temps
   # Stress CPU
diff --git a/.bin/Scripts/hw-sensors-monitor b/.bin/Scripts/hw-sensors-monitor
index 22067b91..42757748 100755
--- a/.bin/Scripts/hw-sensors-monitor
+++ b/.bin/Scripts/hw-sensors-monitor
@@ -18,7 +18,7 @@ if __name__ == '__main__':
     if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):
       background = True
       monitor_file = sys.argv[1]
-      monitor_pane=None
+      monitor_pane = None
     else:
       result = run_program(['mktemp'])
       monitor_file = result.stdout.decode().strip()