Extra aura control

This commit is contained in:
Serge
2023-05-08 11:00:41 +02:00
parent ea134b640b
commit 07020c3561
11 changed files with 114 additions and 69 deletions

View File

@@ -15,14 +15,18 @@ namespace GHelper
SleepKeyb = 1 << 5, SleepKeyb = 1 << 5,
ShutdownLogo = 1 << 6, ShutdownLogo = 1 << 6,
ShutdownKeyb = 1 << 7, ShutdownKeyb = 1 << 7,
BootBar = 1 << (7 + 2), Unknown1 = 1 << 8,
AwakeBar = 1 << (7 + 3), BootBar = 1u << (7 + 2),
SleepBar = 1 << (7 + 4), AwakeBar = 1u << (7 + 3),
ShutdownBar = 1 << (7 + 5), SleepBar = 1u << (7 + 4),
BootLid = 1 << (15 + 1), ShutdownBar = 1u << (7 + 5),
AwakeLid = 1 << (15 + 2), Unknown2 = 1 << 13,
SleepLid = 1 << (15 + 3), Unknown3 = 1 << 14,
ShutdownLid = 1 << (15 + 4) Unknown4 = 1 << 15,
BootLid = 1u << (15 + 1),
AwakeLid = 1u << (15 + 2),
SleepLid = 1u << (15 + 3),
ShutdownLid = 1u << (15 + 4)
} }
public static class AuraDev19b6Extensions public static class AuraDev19b6Extensions

40
app/Extra.Designer.cs generated
View File

@@ -218,26 +218,32 @@ namespace GHelper
tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
tableBacklight.Controls.Add(checkBootLid, 2, 2);
tableBacklight.Controls.Add(checkShutdown, 0, 4); tableBacklight.Controls.Add(labelBacklight, 0, 0);
tableBacklight.Controls.Add(checkAwake, 0, 1); tableBacklight.Controls.Add(checkAwake, 0, 1);
tableBacklight.Controls.Add(checkBoot, 0, 2); tableBacklight.Controls.Add(checkBoot, 0, 2);
tableBacklight.Controls.Add(checkSleep, 0, 3); tableBacklight.Controls.Add(checkSleep, 0, 3);
tableBacklight.Controls.Add(labelBacklight, 0, 0); tableBacklight.Controls.Add(checkShutdown, 0, 4);
tableBacklight.Controls.Add(checkSleepBar, 1, 3);
tableBacklight.Controls.Add(checkShutdownBar, 1, 4); tableBacklight.Controls.Add(labelBacklightLogo, 1, 0);
tableBacklight.Controls.Add(labelBacklightBar, 1, 0); tableBacklight.Controls.Add(checkAwakeLogo, 1, 1);
tableBacklight.Controls.Add(checkAwakeBar, 1, 1); tableBacklight.Controls.Add(checkBootLogo, 1, 2);
tableBacklight.Controls.Add(checkBootBar, 1, 2); tableBacklight.Controls.Add(checkSleepLogo, 1, 3);
tableBacklight.Controls.Add(checkSleepLid, 2, 3); tableBacklight.Controls.Add(checkShutdownLogo, 1, 4);
tableBacklight.Controls.Add(checkShutdownLid, 2, 4);
tableBacklight.Controls.Add(labelBacklightLid, 2, 0); tableBacklight.Controls.Add(labelBacklightBar, 2, 0);
tableBacklight.Controls.Add(checkAwakeLid, 2, 1); tableBacklight.Controls.Add(checkAwakeBar, 2, 1);
tableBacklight.Controls.Add(labelBacklightLogo, 3, 0); tableBacklight.Controls.Add(checkBootBar, 2, 2);
tableBacklight.Controls.Add(checkAwakeLogo, 3, 1); tableBacklight.Controls.Add(checkSleepBar, 2, 3);
tableBacklight.Controls.Add(checkBootLogo, 3, 2); tableBacklight.Controls.Add(checkShutdownBar, 2, 4);
tableBacklight.Controls.Add(checkSleepLogo, 3, 3);
tableBacklight.Controls.Add(checkShutdownLogo, 3, 4); tableBacklight.Controls.Add(labelBacklightLid, 3, 0);
tableBacklight.Controls.Add(checkAwakeLid, 3, 1);
tableBacklight.Controls.Add(checkBootLid, 3, 2);
tableBacklight.Controls.Add(checkSleepLid, 3, 3);
tableBacklight.Controls.Add(checkShutdownLid, 3, 4);
tableBacklight.Dock = DockStyle.Top; tableBacklight.Dock = DockStyle.Top;
tableBacklight.Location = new Point(3, 35); tableBacklight.Location = new Point(3, 35);
tableBacklight.Margin = new Padding(0); tableBacklight.Margin = new Padding(0);

View File

@@ -58,7 +58,7 @@ namespace GHelper
InitializeComponent(); InitializeComponent();
groupBindings.Text = Properties.Strings.KeyBindings; groupBindings.Text = Properties.Strings.KeyBindings;
groupLight.Text = " " + Properties.Strings.KeyboardBacklight; groupLight.Text = " " + Properties.Strings.LaptopBacklight;
groupOther.Text = Properties.Strings.Other; groupOther.Text = Properties.Strings.Other;
checkAwake.Text = Properties.Strings.Awake; checkAwake.Text = Properties.Strings.Awake;
@@ -74,6 +74,11 @@ namespace GHelper
checkTopmost.Text = Properties.Strings.WindowTop; checkTopmost.Text = Properties.Strings.WindowTop;
checkUSBC.Text = Properties.Strings.OptimizedUSBC; checkUSBC.Text = Properties.Strings.OptimizedUSBC;
labelBacklight.Text = Properties.Strings.Keyboard;
labelBacklightBar.Text = Properties.Strings.Lightbar;
labelBacklightLid.Text = Properties.Strings.Lid;
labelBacklightLogo.Text = Properties.Strings.Logo;
Text = Properties.Strings.ExtraSettings; Text = Properties.Strings.ExtraSettings;
InitTheme(); InitTheme();
@@ -135,7 +140,6 @@ namespace GHelper
checkSleepLogo.CheckedChanged += CheckPower_CheckedChanged; checkSleepLogo.CheckedChanged += CheckPower_CheckedChanged;
checkShutdownLogo.CheckedChanged += CheckPower_CheckedChanged; checkShutdownLogo.CheckedChanged += CheckPower_CheckedChanged;
/*
if (!Program.config.ContainsModel("Strix")) if (!Program.config.ContainsModel("Strix"))
{ {
labelBacklightBar.Visible = false; labelBacklightBar.Visible = false;
@@ -143,8 +147,23 @@ namespace GHelper
checkBootBar.Visible = false; checkBootBar.Visible = false;
checkSleepBar.Visible = false; checkSleepBar.Visible = false;
checkShutdownBar.Visible = false; checkShutdownBar.Visible = false;
labelBacklightLid.Visible = false;
checkAwakeLid.Visible = false;
checkBootLid.Visible = false;
checkSleepLid.Visible = false;
checkShutdownLid.Visible = false;
if (!Program.config.ContainsModel("Z13"))
{
labelBacklightLogo.Visible = false;
checkAwakeLogo.Visible = false;
checkBootLogo.Visible = false;
checkSleepLogo.Visible = false;
checkShutdownLogo.Visible = false;
}
} }
*/
checkTopmost.Checked = (Program.config.getConfig("topmost") == 1); checkTopmost.Checked = (Program.config.getConfig("topmost") == 1);
checkTopmost.CheckedChanged += CheckTopmost_CheckedChanged; ; checkTopmost.CheckedChanged += CheckTopmost_CheckedChanged; ;
@@ -243,6 +262,11 @@ namespace GHelper
if (checkSleepLogo.Checked) flags.Add(AuraDev19b6.SleepLogo); if (checkSleepLogo.Checked) flags.Add(AuraDev19b6.SleepLogo);
if (checkShutdownLogo.Checked) flags.Add(AuraDev19b6.ShutdownLogo); if (checkShutdownLogo.Checked) flags.Add(AuraDev19b6.ShutdownLogo);
flags.Add(AuraDev19b6.Unknown1);
flags.Add(AuraDev19b6.Unknown2);
flags.Add(AuraDev19b6.Unknown3);
flags.Add(AuraDev19b6.Unknown4);
Aura.ApplyAuraPower(flags); Aura.ApplyAuraPower(flags);
} }

View File

@@ -20,34 +20,9 @@ public class NvidiaGpuControl : IGpuControl
private static PhysicalGPU? _internalGpu; private static PhysicalGPU? _internalGpu;
public NvidiaGpuControl() public NvidiaGpuControl()
{
Create();
}
public static void Create()
{
try
{ {
_internalGpu = GetInternalDiscreteGpu(); _internalGpu = GetInternalDiscreteGpu();
} }
catch (Exception ex)
{
Debug.WriteLine(ex);
_internalGpu = null;
}
}
public static void RecreateWithDelay(int delay = 5)
{
Task.Run(async () =>
{
await Task.Delay(TimeSpan.FromSeconds(delay));
Create();
});
}
public bool IsValid => _internalGpu != null; public bool IsValid => _internalGpu != null;
@@ -144,7 +119,7 @@ public class NvidiaGpuControl : IGpuControl
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.WriteLine(ex.ToString()); Logger.WriteLine(ex.Message);
return null; return null;
} }
} }

View File

@@ -558,9 +558,9 @@ namespace GHelper.Properties {
/// <summary> /// <summary>
/// Looks up a localized string similar to Laptop Backlight. /// Looks up a localized string similar to Laptop Backlight.
/// </summary> /// </summary>
internal static string KeyboardBacklight { internal static string LaptopBacklight {
get { get {
return ResourceManager.GetString("KeyboardBacklight", resourceCulture); return ResourceManager.GetString("LaptopBacklight", resourceCulture);
} }
} }
@@ -582,6 +582,33 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Lid.
/// </summary>
internal static string Lid {
get {
return ResourceManager.GetString("Lid", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Lightbar.
/// </summary>
internal static string Lightbar {
get {
return ResourceManager.GetString("Lightbar", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Logo.
/// </summary>
internal static string Logo {
get {
return ResourceManager.GetString("Logo", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Binary Banner. /// Looks up a localized string similar to Binary Banner.
/// </summary> /// </summary>

View File

@@ -279,8 +279,8 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>Bajar retroiluminación con batería</value> <value>Bajar retroiluminación con batería</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>Retroiluminación del teclado</value> <value>Retroiluminación</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
<value>Teclado del portátil</value> <value>Teclado del portátil</value>

View File

@@ -282,7 +282,7 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>Lower backlight brightness on battery and back when plugged</value> <value>Lower backlight brightness on battery and back when plugged</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>Laptop Backlight</value> <value>Laptop Backlight</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
@@ -291,6 +291,15 @@
<data name="LaptopScreen" xml:space="preserve"> <data name="LaptopScreen" xml:space="preserve">
<value>Laptop Screen</value> <value>Laptop Screen</value>
</data> </data>
<data name="Lid" xml:space="preserve">
<value>Lid</value>
</data>
<data name="Lightbar" xml:space="preserve">
<value>Lightbar</value>
</data>
<data name="Logo" xml:space="preserve">
<value>Logo</value>
</data>
<data name="MatrixBanner" xml:space="preserve"> <data name="MatrixBanner" xml:space="preserve">
<value>Binary Banner</value> <value>Binary Banner</value>
</data> </data>

View File

@@ -279,8 +279,8 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>Pille çalışırken klavye aydınlatmasını kıs, şarjdayken eski haline dön</value> <value>Pille çalışırken klavye aydınlatmasını kıs, şarjdayken eski haline dön</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>Klavye Aydınlatması</value> <value>Aydınlatması</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
<value>Laptop Klavyesi</value> <value>Laptop Klavyesi</value>

View File

@@ -279,8 +279,8 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>Вимкнути підсвітку на батареї та увімкнути на зарядці</value> <value>Вимкнути підсвітку на батареї та увімкнути на зарядці</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>Підсвітка клавіатури</value> <value>Підсвітка</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
<value>Клавіатура</value> <value>Клавіатура</value>

View File

@@ -279,8 +279,8 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>电池模式下降低键盘亮度以省电,并在插上电源时恢复</value> <value>电池模式下降低键盘亮度以省电,并在插上电源时恢复</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>键盘背光</value> <value>背光</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
<value>笔记本键盘</value> <value>笔记本键盘</value>

View File

@@ -279,8 +279,8 @@
<data name="KeyboardAuto" xml:space="preserve"> <data name="KeyboardAuto" xml:space="preserve">
<value>電池模式時自動降低鍵盤背光亮度以省電</value> <value>電池模式時自動降低鍵盤背光亮度以省電</value>
</data> </data>
<data name="KeyboardBacklight" xml:space="preserve"> <data name="LaptopBacklight" xml:space="preserve">
<value>鍵盤背光</value> <value>背光</value>
</data> </data>
<data name="LaptopKeyboard" xml:space="preserve"> <data name="LaptopKeyboard" xml:space="preserve">
<value>鍵盤背光:</value> <value>鍵盤背光:</value>