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

Ambient Aura tweaks

Browse Source
This commit is contained in:
Serge
2023-11-17 17:56:40 +01:00
parent 36eae610e8
commit 0c1ababcf8
1 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
app/USB/Aura.cs
View File

@@ -359,69 +359,69 @@ namespace GHelper.USB
} }
public static void ApplyColor(Color color, bool init = false) public static void ApplyColorStrix(Color[] color, bool init = false)
{ {
Color[] color_list = Enumerable.Repeat(color, 0x12).ToArray(); byte[] msg = new byte[0x40];
ApplyColor(color_list, init);
byte start = 9;
byte maxLeds = 0x93;
msg[0] = AsusHid.AURA_ID;
msg[1] = 0xbc;
msg[2] = 0;
msg[3] = 1;
msg[4] = 1;
msg[5] = 1;
msg[6] = 0;
msg[7] = 0x10;
for (byte i = 0; i < AURA_ZONES; i++)
{
msg[start + i * 3] = color[i].R; // R
msg[start + 1 + i * 3] = color[i].G; // G
msg[start + 2 + i * 3] = color[i].B; // B
}
if (init)
{
Init();
AsusHid.WriteAura(new byte[] { AsusHid.AURA_ID, 0xbc });
}
for (byte b = 0; b < maxLeds; b += 0x10)
{
msg[6] = b;
AsusHid.WriteAura(msg);
}
msg[6] = maxLeds;
AsusHid.WriteAura(msg);
msg[4] = 4;
msg[5] = 0;
msg[6] = 0;
msg[7] = 0;
AsusHid.WriteAura(msg);
} }
public static void ApplyColor(Color[] color, bool init = false) public static void ApplyColor(Color color, bool init = false)
{ {
if (isACPI) if (isACPI)
{ {
Program.acpi.TUFKeyboardRGB(0, color[0], 0, null); Program.acpi.TUFKeyboardRGB(0, color, 0, null);
return; return;
} }
if (isStrix && !isOldHeatmap) if (isStrix && !isOldHeatmap)
{ {
byte[] msg = new byte[0x40]; ApplyColorStrix(Enumerable.Repeat(color, AURA_ZONES).ToArray(), init);
return;
byte start = 9;
byte maxLeds = 0x93;
msg[0] = AsusHid.AURA_ID;
msg[1] = 0xbc;
msg[2] = 0;
msg[3] = 1;
msg[4] = 1;
msg[5] = 1;
msg[6] = 0;
msg[7] = 0x10;
for (byte i = 0; i < AURA_ZONES; i++)
{
msg[start + i * 3] = color[i].R; // R
msg[start + 1 + i * 3] = color[i].G; // G
msg[start + 2 + i * 3] = color[i].B; // B
}
if (init)
{
Init();
AsusHid.WriteAura(new byte[] { AsusHid.AURA_ID, 0xbc });
}
for (byte b = 0; b < maxLeds; b += 0x10)
{
msg[6] = b;
AsusHid.WriteAura(msg);
}
msg[6] = maxLeds;
AsusHid.WriteAura(msg);
msg[4] = 4;
msg[5] = 0;
msg[6] = 0;
msg[7] = 0;
AsusHid.WriteAura(msg);
} }
else else
{ {
AsusHid.WriteAura(AuraMessage(0, color[0], color[0], 0)); AsusHid.WriteAura(AuraMessage(0, color, color, 0));
AsusHid.WriteAura(MESSAGE_SET); AsusHid.WriteAura(MESSAGE_SET);
} }
@@ -514,9 +514,11 @@ namespace GHelper.USB
bound.Y += bound.Height / 3; bound.Y += bound.Height / 3;
bound.Height -= (int)Math.Round(bound.Height * (0.33f + 0.022f)); // cut 1/3 of the top screen + windows panel bound.Height -= (int)Math.Round(bound.Height * (0.33f + 0.022f)); // cut 1/3 of the top screen + windows panel
var screen_low = AmbientData.CamptureScreen(bound, 512, 288); var screen_low = AmbientData.CamptureScreen(bound, 256, 144);
Bitmap screeb_pxl; Bitmap screeb_pxl;
int zones = AURA_ZONES;
if (isStrix) //laptop with lightbar if (isStrix) //laptop with lightbar
{ {
screeb_pxl = AmbientData.ResizeImage(screen_low, 4, 2); // 4x2 zone. top for keyboard and bot for lightbar screeb_pxl = AmbientData.ResizeImage(screen_low, 4, 2); // 4x2 zone. top for keyboard and bot for lightbar
@@ -537,10 +539,9 @@ namespace GHelper.USB
} }
else else
{ {
zones = 1;
screeb_pxl = AmbientData.ResizeImage(screen_low, 1, 1); screeb_pxl = AmbientData.ResizeImage(screen_low, 1, 1);
var average = ColorUtils.HSV.UpSaturation(screeb_pxl.GetPixel(0, 0), (float)0.3); AmbientData.Colors[0].RGB = ColorUtils.HSV.UpSaturation(screeb_pxl.GetPixel(0, 0), (float)0.3);
for (int i = 0; i < 4; i++) //just color transfer from the bottom screen on keyboard
AmbientData.Colors[i].RGB = average;
} }
@@ -550,15 +551,18 @@ namespace GHelper.USB
bool is_fresh = false; bool is_fresh = false;
for (int i = 0; i < AURA_ZONES; i++) for (int i = 0; i < zones; i++)
{ {
if (AmbientData.result[i].ToArgb() != AmbientData.Colors[i].RGB.ToArgb()) if (AmbientData.result[i].ToArgb() != AmbientData.Colors[i].RGB.ToArgb()) is_fresh = true;
is_fresh = true;
AmbientData.result[i] = AmbientData.Colors[i].RGB; AmbientData.result[i] = AmbientData.Colors[i].RGB;
} }
if (is_fresh) if (is_fresh)
ApplyColor(AmbientData.result, init); {
if (isStrix) ApplyColorStrix(AmbientData.result, init);
else ApplyColor(AmbientData.result[0], init);
}
} }
static class AmbientData static class AmbientData