From 2797807d7bdca1153197be86f00f463693029b2f Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Wed, 6 Mar 2024 23:28:21 +0100
Subject: [PATCH] Improved dimming

---
 app/AppConfig.cs                    |  6 +++++-
 app/Display/ScreenControl.cs        | 11 +++++++++--
 app/Helpers/ClamshellModeControl.cs |  2 --
 app/Helpers/ProcessHelper.cs        |  8 ++++----
 app/Settings.cs                     |  3 ++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index 38aa14af..f055f5c0 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -405,7 +405,7 @@ public static class AppConfig
 
     public static bool IsOLED()
     {
-        return ContainsModel("OLED") || IsSlash() || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150"); 
+        return ContainsModel("OLED") || IsSlash() || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M3500"); 
     }
 
     public static bool IsStrix()
@@ -572,6 +572,10 @@ public static class AppConfig
         return ContainsModel("G834") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634");
     }
 
+    public static bool IsROG()
+    {
+        return ContainsModel("ROG");
+    }
     public static bool IsASUS()
     {
         return ContainsModel("ROG") || ContainsModel("TUF") || ContainsModel("Vivobook") || ContainsModel("Zenbook");
diff --git a/app/Display/ScreenControl.cs b/app/Display/ScreenControl.cs
index 460f4d12..0b3c33b8 100644
--- a/app/Display/ScreenControl.cs
+++ b/app/Display/ScreenControl.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using GHelper.Helpers;
+using System.Runtime.InteropServices;
 
 namespace GHelper.Display
 {
@@ -31,10 +32,16 @@ namespace GHelper.Display
             if (brightness >= 0) AppConfig.Set("brightness", brightness);
             else brightness = AppConfig.Get("brightness");
 
-            if (brightness >= 0) SetGamma(brightness);
+            if (brightness >= 0) Task.Run(() =>
+            {
+                //Logger.WriteLine($"Brightness: {brightness}");
+                var splendid = Environment.SystemDirectory + "\\DriverStore\\FileRepository\\asussci2.inf_amd64_f2eed2fae3b45a67\\ASUSOptimization\\AsusSplendid.exe";
+                ProcessHelper.RunCMD(splendid, (AppConfig.IsROG() ? 19 : 9) + " 0 " + (40 + brightness * 0.6));
+            });
         }
 
 
+
         public void SetGamma(int brightness = 100)
         {
             var bright = Math.Round((float)brightness / 200 + 0.5, 2);
diff --git a/app/Helpers/ClamshellModeControl.cs b/app/Helpers/ClamshellModeControl.cs
index 4068d33d..16b7492e 100644
--- a/app/Helpers/ClamshellModeControl.cs
+++ b/app/Helpers/ClamshellModeControl.cs
@@ -101,8 +101,6 @@ namespace GHelper.Helpers
             if (Program.settingsForm.Visible)
                 Program.screenControl.InitScreen();
 
-            Program.screenControl.SetBrightness();
-
         }
 
         private static int CheckAndSaveLidAction()
diff --git a/app/Helpers/ProcessHelper.cs b/app/Helpers/ProcessHelper.cs
index 5b3957e2..48aecdf1 100644
--- a/app/Helpers/ProcessHelper.cs
+++ b/app/Helpers/ProcessHelper.cs
@@ -122,7 +122,7 @@ namespace GHelper.Helpers
             }
         }
 
-        public static void RunCMD(string name, string args)
+        public static string RunCMD(string name, string args)
         {
             var cmd = new Process();
             cmd.StartInfo.UseShellExecute = false;
@@ -133,13 +133,13 @@ namespace GHelper.Helpers
             cmd.StartInfo.Arguments = args;
             cmd.Start();
 
-            Logger.WriteLine(args);
-
+            Logger.WriteLine(name + " " + args);
             string result = cmd.StandardOutput.ReadToEnd().Replace(Environment.NewLine, " ").Trim(' ');
-
             Logger.WriteLine(result);
             
             cmd.WaitForExit();
+
+            return result;
         }
 
 
diff --git a/app/Settings.cs b/app/Settings.cs
index 1baa10c0..23508ee6 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -267,9 +267,10 @@ namespace GHelper
 
             int brightness = AppConfig.Get("brightness");
             if (brightness >= 0) sliderGamma.Value = brightness;
+            labelGamma.Text = sliderGamma.Value + "%";
 
             sliderGamma.ValueChanged += SliderGamma_ValueChanged;
-            labelGamma.Text = sliderGamma.Value + "%";
+            sliderGamma.MouseUp += SliderGamma_ValueChanged;
         }