v6.12

+ CPU temp readout fix for NanoPi M3 range with 4.4 kernel: https://github.com/Fourdee/DietPi/issues/1926
MichaIng · Jul 16, 2018 · 99b8a6d · 99b8a6d
1 parent 562779b
commit 99b8a6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/dietpi/dietpi-cpuinfo b/dietpi/dietpi-cpuinfo
@@ -166,8 +166,8 @@
 		#Current Gov
 		echo -e " Governor     \e[90m|\e[0m     $CPU_GOV_CURRENT"
 
-		if [[ $CPU_GOV_CURRENT == ondemand ]] ||
-			[[ $CPU_GOV_CURRENT == conservative ]]; then
+		if [[ $CPU_GOV_CURRENT == 'ondemand' ]] ||
+			[[ $CPU_GOV_CURRENT == 'conservative' ]]; then
 
 			echo -e " Throttle up  \e[90m|\e[0m     $(grep -m1 '^CONFIG_CPU_USAGE_THROTTLE_UP=' /DietPi/dietpi.txt | sed 's/.*=//')% CPU usage"
 

diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
@@ -1878,12 +1878,10 @@ $print_logfile_info
 				# - Boards that provide 2 digit output
 				#	Pine
 				#	NanoPi M2
-				#	NanoPi M3
 				#	H3 3.x
 				#	H2+ 3.x
 				if (( $G_HW_MODEL == 40 ||
 					$G_HW_MODEL == 61 ||
-					$G_HW_MODEL == 62 ||
 					( $G_HW_CPUID == 1 && $(uname -r | grep -ci -m1 '^3.') ) ||
 					( $G_HW_MODEL == 32 && $(uname -r | grep -ci -m1 '^3.') ) )); then