Merge branch 'seerge:main' into main

HamzaYslmn · Apr 27, 2023 · a7245fc · a7245fc
2 parents dc318a4 + 3173c2e
commit a7245fc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/app/Fans.Designer.cs b/app/Fans.Designer.cs
diff --git a/app/GHelper.sln b/app/GHelper.sln
@@ -20,8 +20,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|Any CPU.Build.0 = Debug|x64
-		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|x64.ActiveCfg = Debug|x64
-		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|x64.Build.0 = Debug|x64
+		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Debug|x64.Build.0 = Debug|Any CPU
 		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Release|Any CPU.ActiveCfg = Release|x64
 		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Release|Any CPU.Build.0 = Release|x64
 		{D6138BB1-8FDB-4835-87EF-2FE41A3DD604}.Release|x64.ActiveCfg = Release|x64

diff --git a/app/Keyboard.Designer.cs b/app/Keyboard.Designer.cs
diff --git a/app/Settings.cs b/app/Settings.cs
@@ -417,11 +417,13 @@ void SetMatrixPicture(string fileName)
                 }
 
                 StartMatrixTimer();
+                Logger.WriteLine("Matrix GIF " + fileName);
             }
             else
             {
                 mat.GenerateFrame(image);
                 mat.Present();
+                Logger.WriteLine("Matrix " + fileName);
             }
         }
 
@@ -499,6 +501,7 @@ public void SetMatrix()
             if (brightness == 0 || (auto && SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online))
             {
                 mat.SetDisplayState(false);
+                Logger.WriteLine("Matrix Off");
             }
             else
             {
@@ -513,9 +516,11 @@ public void SetMatrix()
                     case 3:
                         mat.SetBuiltInAnimation(false);
                         StartMatrixTimer(1000);
+                        Logger.WriteLine("Matrix Clock");
                         break;
                     default:
                         mat.SetBuiltInAnimation(true, animation);
+                        Logger.WriteLine("Matrix builtin "+animation.AsByte);
                         break;
 
                 }
@@ -916,6 +921,11 @@ public void SetPower()
                 customPower = limit_cpu;
             }
 
+            if (Program.wmi.DeviceGet(ASUSWmi.PPT_APUC2) >= 0)
+            {
+                Program.wmi.DeviceSet(ASUSWmi.PPT_APUC2, 87, "PowerLimit C2");
+            }
+
             Program.settingsForm.BeginInvoke(SetPerformanceLabel);
 
         }