jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into AllyTDP

Browse Source
This commit is contained in:
Serge
2024-04-16 23:39:44 +02:00
parent 966dd01f1d fc1f594a61
commit b83fa41772
7 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/AppConfig.cs
View File

@@ -591,11 +591,6 @@ public static class AppConfig
return ContainsModel("G814") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634");
}
public static bool IsNewAura()
{
return ContainsModel("G834") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634");
}
public static bool IsNoFNV()
{
return ContainsModel("FX507") || ContainsModel("FX707");

1
app/Fan/FanSensorControl.cs
View File

@@ -68,6 +68,7 @@ namespace GHelper.Fan
if (AppConfig.ContainsModel("GV601")) return new int[3] { 78, 59, 85 };
if (AppConfig.ContainsModel("GA403")) return new int[3] { 68, 68, 80 };
if (AppConfig.ContainsModel("GU605")) return new int[3] { 62, 62, 92 };
return new int[3] { DEFAULT_FAN_MAX, DEFAULT_FAN_MAX, DEFAULT_FAN_MAX };
}

2
app/Fans.cs
View File

@@ -1166,7 +1166,7 @@ namespace GHelper
InitGPUPower();
VisualiseGPUSettings();
modeControl.SetGPUClocks(true);
modeControl.SetGPUClocks(true, true);
modeControl.SetGPUPower();
}

4
app/Mode/ModeControl.cs
View File

@@ -342,7 +342,7 @@ namespace GHelper.Mode
}
public void SetGPUClocks(bool launchAsAdmin = true)
public void SetGPUClocks(bool launchAsAdmin = true, bool reset = false)
{
Task.Run(() =>
{
@@ -351,6 +351,8 @@ namespace GHelper.Mode
int memory = AppConfig.GetMode("gpu_memory");
int clock_limit = AppConfig.GetMode("gpu_clock_limit");
if (reset) core = memory = clock_limit = 0;
if (core == -1 && memory == -1 && clock_limit == -1) return;
//if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false;

12
app/Properties/Strings.tr.resx
View File

@@ -139,7 +139,7 @@
<value>Ultimate Modu kapatmak yeniden başlatmayı gerektirir</value>
</data>
<data name="AlertUltimateOn" xml:space="preserve">
<value>Ultimate Modu etkinleştirmek yeniden başlatmayı gerektirir</value>
<value>Ultimate Mod için yeniden başlatılmalı</value>
</data>
<data name="AlertUltimateTitle" xml:space="preserve">
<value>Şimdi yeniden başlatılsın mı?</value>
@@ -387,7 +387,7 @@ Yine de devam etmek istiyor musunuz?</value>
<value>Profili Dışa Aktar</value>
</data>
<data name="Extra" xml:space="preserve">
<value>Ekstra</value>
<value>Ek Özellikler</value>
</data>
<data name="ExtraSettings" xml:space="preserve">
<value>Ek Ayarlar</value>
@@ -420,10 +420,10 @@ Yine de devam etmek istiyor musunuz?</value>
<value>Fanlar + Güç</value>
</data>
<data name="FlickerFreeDimming" xml:space="preserve">
<value>Flicker-free Dimming</value>
<value>Titreşimsiz Karartma</value>
</data>
<data name="FnLock" xml:space="preserve">
<value>Fn+F kısayol tuşlarını FN tuşuna basmadan çalıştır</value>
<value>Fn+F kısayolunu Fn tuşuna basmadan çalıştır</value>
</data>
<data name="FnLockOff" xml:space="preserve">
<value>FN-Lock Kapalı</value>
@@ -603,7 +603,7 @@ Yine de devam etmek istiyor musunuz?</value>
<value>Yeni güncellemeler</value>
</data>
<data name="NoNewUpdates" xml:space="preserve">
<value>Güncelleme yok</value>
<value>Yeni güncelleme yok</value>
</data>
<data name="NotConnected" xml:space="preserve">
<value>Bağlı Değil</value>
@@ -675,7 +675,7 @@ Yine de devam etmek istiyor musunuz?</value>
<value>RPM</value>
</data>
<data name="RSDeadzones" xml:space="preserve">
<value>Sağ Joystick Ölü Bölgeleri</value>
<value>Sağ Çubuk Ölü Bölgeleri</value>
</data>
<data name="RTDeadzones" xml:space="preserve">
<value>Sağ Tetik Ölü Bölgeleri</value>

19
app/USB/Aura.cs
View File

@@ -268,25 +268,6 @@ namespace GHelper.USB
Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1A },
}, "Init");
// Random data AC sends to keyboard on start, that seem to wake up keyboard on 2024
if (AppConfig.IsNewAura())
{
AsusHid.Write(new List<byte[]> {
new byte[] { AsusHid.AURA_ID, 0x9F, 0x01 },
new byte[] { AsusHid.AURA_ID, 0xBF },
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x10 },
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x20 },
new byte[] { AsusHid.AURA_ID, 0xC0, 0x03, 0x01 },
new byte[] { AsusHid.AURA_ID, 0x9E, 0x01, 0x20 },
Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1A },
new byte[] { AsusHid.AURA_ID, 0xC0, 0x00, 0x01 },
}, "Init");
}
}

12
app/Updates.cs
View File

@@ -233,11 +233,23 @@ namespace GHelper
AutomaticDecompression = DecompressionMethods.All
}))
{
Logger.WriteLine(url);
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip, deflate, br");
httpClient.DefaultRequestHeaders.Add("User-Agent", "C# App");
var json = await httpClient.GetStringAsync(url);
var data = JsonSerializer.Deserialize<JsonElement>(json);
var result = data.GetProperty("Result");
// fallback for bugged API
if (result.ToString() == "" || result.GetProperty("Obj").GetArrayLength() == 0)
{
var urlFallback = url + "&tag=" + new Random().Next(10, 99);
Logger.WriteLine(urlFallback);
json = await httpClient.GetStringAsync(urlFallback);
data = JsonSerializer.Deserialize<JsonElement>(json);
}
var groups = data.GetProperty("Result").GetProperty("Obj");