Add CPU fan RPM, fix formatting

Automatically detect GPU fan speed from HWiNFO or Afterburner, detect CPU fan speed from HWiNFO, and fixes to sizes and positioning of rpm measures

Win10 Widgets/@Resources/Performance Templates/cpuTemplate.ini

@@ -49,7 +49,6 @@ IfFalseAction4=[!SetOption Value1 Text "%1%"]
 OnUpdateAction=[!UpdateMeter Value1]
 UpdateDivider=10
 
-
 [MeasureCPUTemp_SpeedFan]
 ; Returns the Temperature of the CPU using SpeedFan
 ; If the Temperature is not shown even though SpeedFan is running
@@ -75,14 +74,39 @@ HWiNFOType=CurrentValue
 OnUpdateAction=[!UpdateMeasure MeasureCPUTemp]
 UpdateDivider=10
 
-
 [MeasureCPUTemp_CoreTemp]
 ; Returns the Temperature of the Hottest CPU Core using CoreTemp
 Measure=Plugin
 Plugin=CoreTemp
 OnUpdateAction=[!UpdateMeasure MeasureCPUTemp]
 UpdateDivider=10
 
+[MeasureCPUFanRPM]
+; Pulls Info About the CPU Fan RPM if possible
+; only works with HWiNFO
+Measure=Calc
+Formula=0
+IfCondition=MeasureCPUFanRPM_HWiNFO > 0
+IfTrueAction=[!SetOption MeasureCPUFanRPM Formula MeasureCPUFanRPM_HWiNFO]
+IfCondition2=MeasureCPUFanRPM > 0
+IfTrueAction2=[!SetOption FanSpeed1 Text "%1 rpm"][!SetOption FanSpeed1 Hidden 0]
+IfFalseAction2=[!SetOption FanSpeed1 Hidden 1]
+OnUpdateAction=[!UpdateMeter FanSpeed1]
+UpdateDivider=10
+
+[MeasureCPUFanRPM_HWiNFO]
+; Returns the FanSpeed of the GPU using HWiNFO
+; If the Speed is not shown even though HWiNFO is running and the HWiNFO.dll is installed
+; Change the Values below according to HWiNFOSharedMemoryViewer.exe included in the HWiNFO Demo Skin
+Measure=Plugin
+Plugin=HWiNFO.dll
+HWiNFOSensorId=0xf7067960
+HWiNFOSensorInstance=0x0
+HWiNFOEntryId=0x3000001
+;
+HWiNFOType=CurrentValue
+OnUpdateAction=[!UpdateMeasure MeasureCPUFanRPM]
+UpdateDivider=1
 
 ; ------------------------------------------------------------------------
 ; METERS
@@ -111,4 +135,12 @@ Hidden=0
 
 [Value1]
 MeasureName2=MeasureCPUTemp
+ClipString=2
+ClipStringW=(#BackgroundWidth#-[#CURRENTSECTION#:X]-6)
+Hidden=0
+
+[FanSpeed1]
+MeasureName=MeasureCPUFanRPM
+ClipString=2
+ClipStringW=(#BackgroundWidth#-[#CURRENTSECTION#:X]-6)
 Hidden=0

Win10 Widgets/@Resources/Performance Templates/gpuTemplate.ini

@@ -91,7 +91,7 @@ IfTrueAction2=[!SetOption MeasureGPUTemp Formula MeasureGPUTemp_HWiNFO]
 IfCondition3=MeasureGPUTemp_MSIAfterburner > 0
 IfTrueAction3=[!SetOption MeasureGPUTemp Formula MeasureGPUTemp_MSIAfterburner]
 IfCondition4=MeasureGPUTemp > 0
-IfTrueAction4=[!SetOption Value5 Text "%1% (%2[\x00B0]C) #CRLF#%3 rpm"]
+IfTrueAction4=[!SetOption Value5 Text "%1% (%2[\x00B0]C)"]
 IfFalseAction4=[!SetOption Value5 Text "%1%"]
 OnUpdateAction=[!UpdateMeter Value5]
 UpdateDivider=10
@@ -122,6 +122,28 @@ HWiNFOType=CurrentValue
 OnUpdateAction=[!UpdateMeasure MeasureGPUTemp]
 UpdateDivider=10
 
+[MeasureGPUTemp_MSIAfterburner]
+; Returns the Temperature of the GPU using MSIAfterburner
+Measure=Plugin
+Plugin=MSIAfterburner.dll
+DataSource=GPU temperature
+OnUpdateAction=[!UpdateMeasure MeasureGPUTemp]
+UpdateDivider=10
+
+[MeasureGPUFanRPM]
+; Pulls Info About the GPU FanSpeed if possible
+Measure=Calc
+Formula=0
+IfCondition=MeasureGPUFanRPM_HWiNFO > 0
+IfTrueAction=[!SetOption MeasureGPUFanRPM Formula MeasureGPUFanRPM_HWiNFO]
+IfCondition2=MeasureGPUTemp_MSIAfterburner > 0
+IfTrueAction2=[!SetOption MeasureGPUFanRPM Formula MeasureGPUFanRPM_MSIAfterburner]
+IfCondition3=MeasureGPUFanRPM > 0
+IfTrueAction3=[!SetOption FanSpeed5 Text "%1 rpm"][!SetOption FanSpeed5 Hidden 0]
+IfFalseAction3=[!SetOption FanSpeed5 Hidden 1]
+OnUpdateAction=[!UpdateMeter FanSpeed5]
+UpdateDivider=10
+
 [MeasureGPUFanRPM_HWiNFO]
 Measure=Plugin
 Plugin=HWiNFO.dll
@@ -132,19 +154,11 @@ HWiNFOType=CurrentValue
 OnUpdateAction=[!UpdateMeasure MeasureGPUTemp]
 UpdateDivider=10
 
-[MeasureGPUTemp_MSIAfterburner]
-; Returns the Temperature of the GPU using MSIAfterburner
-Measure=Plugin
-Plugin=MSIAfterburner.dll
-DataSource=GPU temperature
-OnUpdateAction=[!UpdateMeasure MeasureGPUTemp]
-UpdateDivider=10
-
 [MeasureGPUFanRPM_MSIAfterburner]
 Measure=Plugin
 Plugin=MSIAfterburner.dll
 DataSource=Fan tachometer
-OnUpdateAction=[!UpdateMeasure MeasureGPUTemp]
+OnUpdateAction=[!UpdateMeasure MeasureGPUFanRPM]
 UpdateDivider=10
 
 ; ------------------------------------------------------------------------
@@ -174,8 +188,10 @@ Hidden=0
 
 [Value5]
 MeasureName2=MeasureGPUTemp
-;MeasureName3=MeasureGPUFanRPM_MSIAfterburner
-MeasureName3=MeasureGPUFanRPM_HWiNFO
 ClipString=2
 ClipStringW=(#BackgroundWidth#-[#CURRENTSECTION#:X]-6)
-Hidden=0
+Hidden=0
+
+[FanSpeed5]
+MeasureName=MeasureGPUFanRPM
+Hidden=0

Win10 Widgets/@Resources/Performance Templates/performanceTemplateX4.ini

@@ -55,6 +55,7 @@ GraphLabel4="Network"
 GraphLeftPadding5=11
 GraphTopPadding5=11
 GraphMeasure5=EmptyMeasure
+GraphMeasure5rpm=EmptyMeasure
 GraphColor5=#GPURed#
 GraphLabel5="GPU"
 
@@ -166,6 +167,18 @@ Text="%1%"
 FontSize=9
 Hidden=1
 
+[FanSpeed1]
+; Value corresponding to graph.
+Meter=String
+MeterStyle=StyleSmallText | StyleForegroundText
+MeasureName=#GraphMeasure1rpm#
+X=0r
+Y=-4R
+Group=Monitor1
+Text="%1 rpm"
+FontSize=9
+Hidden=1
+
 
 ; ------------------------------------------------------------------------
 ; METERS - 2nd Performance Monitor
@@ -560,3 +573,15 @@ Group=Monitor5
 Text="%1%"
 FontSize=9
 Hidden=1
+
+[FanSpeed5]
+; Value corresponding to graph.
+Meter=String
+MeterStyle=StyleSmallText | StyleForegroundText
+MeasureName=#GraphMeasure5rpm#
+X=0r
+Y=-4R
+Group=Monitor5
+Text="%1 rpm"
+FontSize=9
+Hidden=1

Win10 Widgets/@Resources/variables.ini

@@ -24,9 +24,9 @@ Version2=0
 Version3=0
 ; Begin Dimensions
 tiniestHeight=50
-tinyHeight=62
+tinyHeight=66
 smallHeight=90
-mediumHeight=117
+mediumHeight=127
 largeHeight=165
 largestHeight=200
 ;