optimize and improveHEADmaster

1 files changed, 11 insertions, 2 deletions

diff --git a/bin/st-temp b/bin/st-temp
index 20d7a01..25333fa 100755
--- a/bin/st-temp
+++ b/bin/st-temp
@@ -1,5 +1,14 @@
 #!/bin/sh
-CPUTEMP=$(sensors | grep "Package id 0" | awk '{print $4}' | sed 's/+//;s/\.0//g' )
+RAW=$(sensors | grep -e "Package id 0" -e "edge" -e "PPT")
+
+CPUTEMP=$(echo $RAW | awk '{print $4}' | sed 's/+//;s/\.0//g')
+#CPUPOWER=$(turbostat -Sq -i 1 --show PkgWatt --num_iterations 1 | awk 'NR==2')
+
+#GPUTEMP=$(sensors | grep "edge" | awk '{print $2}' | sed 's/+//;s/\.0//g')
+GPUTEMP=$(echo $RAW | awk '{print $12}' | sed 's/+//;s/\.0//g')
+#GPUPOWER=$(echo $RAW | awk '{print $20}' | sed 's/\.00//g')
+
+
 
 # freebsd
 #CORETEMPS=$(sysctl dev.cpu | grep temperature | awk '{print $2}' | sed s/.[0-9]C$//g)
@@ -15,4 +24,4 @@ CPUTEMP=$(sensors | grep "Package id 0" | awk '{print $4}' | sed 's/+//;s/\.0//g
 #
 #CPUTEMP="$((SUM / CORE_COUNT)) C"
 
-echo $CPUTEMP
+echo "CPU: $CPUTEMP GPU: $GPUTEMP"