Do not ignore fan speed overrides when critical mode is enabled

Author: hirschmann

Core/StagWare.FanControl/Fan.cs

@@ -131,13 +131,11 @@ public virtual void SetTargetSpeed(float speed, float temperature, bool readOnly
                 this.targetFanSpeed = speed;
             }
 
-            int speedValue = CriticalModeEnabled
-                ? maxSpeedValueWrite
-                : PercentageToFanSpeed(this.targetFanSpeed);
+            speed = CriticalModeEnabled ? 100.0f : this.targetFanSpeed;
 
             if (!readOnly)
             {
-                ECWriteValue(speedValue);
+                ECWriteValue(PercentageToFanSpeed(speed));
             }
         }
 
@@ -188,8 +186,8 @@ private int PercentageToFanSpeed(float percentage)
             }
             else
             {
-                return (int)Math.Round(minSpeedValueWrite + 
-                    (((maxSpeedValueWrite - minSpeedValueWrite) * percentage) / 100.0));
+                return (int)Math.Round(minSpeedValueWrite
+                    + (((maxSpeedValueWrite - minSpeedValueWrite) * percentage) / 100.0));
             }
         }
 
@@ -207,7 +205,7 @@ private float FanSpeedToPercentage(int fanSpeed)
                 }
                 else
                 {
-                    return ((float)(fanSpeed - minSpeedValueRead) 
+                    return ((float)(fanSpeed - minSpeedValueRead)
                         / (maxSpeedValueRead - minSpeedValueRead)) * 100;
                 }
             }

Core/StagWare.FanControl/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.5.1.0")]
+[assembly: AssemblyFileVersion("2.5.1.0")]
 
 // Internals should be visible to unit test project.
 [assembly: InternalsVisibleTo("StagWare.FanControl.Tests")]

Tests/StagWare.FanControl.Tests/FanTests.cs

@@ -80,7 +80,7 @@ public void HandlesCriticalTemperature()
 
                 Assert.True(fan.CriticalModeEnabled, nameof(fan.CriticalModeEnabled));
                 Assert.Equal(100, fan.TargetSpeed, 10);
-            }
+            }            
 
             [Fact]
             public void DoesRespectReadOnlyArg()
@@ -154,6 +154,40 @@ public void AppliesFanSpeedOverrides()
             }
         }
 
+        [Fact]
+        public void AppliesFanSpeedOverridesWhenTempIsCritical()
+        {
+            var ec = A.Fake<IEmbeddedController>();
+            var fanSpeedOverride = new FanSpeedPercentageOverride()
+            {
+                FanSpeedPercentage = 100,
+                FanSpeedValue = 255,
+                TargetOperation = OverrideTargetOperation.Write
+            };
+
+            var cfg = new FanConfiguration()
+            {
+                WriteRegister = 123,
+                MinSpeedValue = 0,
+                MaxSpeedValue = 200,
+                FanSpeedPercentageOverrides = new List<FanSpeedPercentageOverride>()
+                {
+                    fanSpeedOverride
+                }
+            };            
+
+            int criticalTemperature = 70;
+
+            var fan = new Fan(ec, cfg, criticalTemperature, false);
+            fan.SetTargetSpeed(50, criticalTemperature + 1, false);
+
+            A.CallTo(() => ec.WriteByte((byte)cfg.WriteRegister, (byte)fanSpeedOverride.FanSpeedValue))
+                .MustHaveHappened();
+
+            Assert.True(fan.CriticalModeEnabled, nameof(fan.CriticalModeEnabled));
+            Assert.Equal(100, fan.TargetSpeed, 10);
+        }
+
         public class GetCurrentSpeed
         {
             [Fact]