mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
wip: support for G835L
This commit is contained in:
Yaseen
@@ -121,6 +121,8 @@ impl AnimeImage {
|
||||
match anime_type {
|
||||
AnimeType::GA401 => 0.8,
|
||||
AnimeType::GU604 => 0.78,
|
||||
// TODO: Measure physical display and calculate correct value
|
||||
AnimeType::G835L => 0.77,
|
||||
_ => 0.77,
|
||||
}
|
||||
}
|
||||
@@ -153,6 +155,7 @@ impl AnimeImage {
|
||||
/// square grid, so `first_x` is the x position on that grid where the
|
||||
/// LED is actually positioned in relation to the Y.
|
||||
///
|
||||
/// For GA401/GA402/GU604 (shrinking pattern - diagonal cuts in from left):
|
||||
/// ```text
|
||||
/// +------------+
|
||||
/// | |
|
||||
@@ -164,22 +167,21 @@ impl AnimeImage {
|
||||
/// \ |
|
||||
/// |----|\ |
|
||||
/// ^ ------+
|
||||
/// first_x
|
||||
/// first_x (grows as y increases)
|
||||
/// ```
|
||||
///
|
||||
/// TODO: add the cases for G635L and G835L
|
||||
/// This is how it looks like, but calculation may be a bit more complex
|
||||
/// For G835L (inverted pattern - triangle grows then rectangle shifts):
|
||||
/// ```text
|
||||
/// |\
|
||||
/// | \
|
||||
/// | \
|
||||
/// | \
|
||||
/// \ \
|
||||
/// \ \
|
||||
/// \ \
|
||||
/// \ \
|
||||
/// \____\
|
||||
/// ● <- Row 0: first_x = 0, width = 1
|
||||
/// ● <- Row 1: first_x = 0 (stagger), width = 1
|
||||
/// ● ● <- Row 2: first_x = 0, width = 2
|
||||
/// ● ● <- Row 3: first_x = 0 (stagger), width = 2
|
||||
/// ... <- Triangle continues, first_x = 0 for rows 0-27
|
||||
/// ● ● ● ● ● ● ● ● ● ● ● ● ● ● ● <- Row 28+: first_x grows
|
||||
/// ● ● ● ● ● ● ● ● ● ● ● ● ● ● ● <- Rectangle shifts right
|
||||
/// ```
|
||||
/// Triangle (rows 0-27): first_x = 0 (no cumulative shift)
|
||||
/// Rectangle (rows 28-67): first_x = (y - 28) / 2 (shifts right)
|
||||
fn first_x(anime_type: AnimeType, y: u32) -> u32 {
|
||||
match anime_type {
|
||||
AnimeType::GA401 => {
|
||||
@@ -197,6 +199,16 @@ impl AnimeImage {
|
||||
// and then their offset grows by one every two rows
|
||||
(y - 9) / 2
|
||||
}
|
||||
AnimeType::G835L => {
|
||||
// G835L has inverted geometry - triangle at top-left, rectangle shifts right
|
||||
// Triangle (rows 0-27): no cumulative shift, just alternating stagger
|
||||
// Rectangle (rows 28-67): shifts right by ~0.5px per row
|
||||
if y < 28 {
|
||||
0
|
||||
} else {
|
||||
(y - 28) / 2
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
// first 11 rows start at zero
|
||||
if y <= 11 {
|
||||
@@ -239,19 +251,16 @@ impl AnimeImage {
|
||||
}
|
||||
38 - Self::first_x(anime_type, y) + y % 2
|
||||
}
|
||||
// TODO: Implement this
|
||||
// AnimeType::G635L => {
|
||||
// if y <= 11 {
|
||||
// return 34;
|
||||
// }
|
||||
// 39 - y / 2
|
||||
// }
|
||||
// AnimeType::G635E => {
|
||||
// if y <= 11 {
|
||||
// return 34;
|
||||
// }
|
||||
// 39 - y / 2
|
||||
// }
|
||||
AnimeType::G835L => {
|
||||
// G835L rows GROW then stay constant (inverted from other devices)
|
||||
// Triangle (rows 0-27): pairs of rows with same length, 1→14
|
||||
// Rectangle (rows 28-67): constant 15 LEDs
|
||||
if y < 28 {
|
||||
y / 2 + 1
|
||||
} else {
|
||||
15
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
if y <= 11 {
|
||||
return 34;
|
||||
@@ -267,9 +276,8 @@ impl AnimeImage {
|
||||
// 33.0 = Longest row LED count (physical) plus half-pixel offset
|
||||
AnimeType::GA401 => (33.0 + 0.5) * Self::scale_x(anime_type),
|
||||
AnimeType::GU604 => (38.0 + 0.5) * Self::scale_x(anime_type),
|
||||
// TODO: Implement this
|
||||
// AnimeType::G635L => (34.0 + 0.5) * Self::scale_x(anime_type),
|
||||
// AnimeType::G835L => (34.0 + 0.5) * Self::scale_x(anime_type),
|
||||
// G835L: max 15 LEDs wide + rectangle shift (~20 pixels) + stagger
|
||||
AnimeType::G835L => (35.0 + 0.5) * Self::scale_x(anime_type),
|
||||
_ => (35.0 + 0.5) * Self::scale_x(anime_type),
|
||||
}
|
||||
}
|
||||
@@ -279,9 +287,7 @@ impl AnimeImage {
|
||||
match anime_type {
|
||||
AnimeType::GA401 => 55,
|
||||
AnimeType::GU604 => 62,
|
||||
// TODO: Implement this
|
||||
// AnimeType::G635L => 68,
|
||||
// AnimeType::G835L => 68,
|
||||
AnimeType::G835L => 68,
|
||||
_ => 61,
|
||||
}
|
||||
}
|
||||
@@ -292,11 +298,7 @@ impl AnimeImage {
|
||||
// 54.0 = End column LED count (physical) plus one dead pixel
|
||||
AnimeType::GA401 => (54.0 + 1.0) * Self::scale_y(anime_type),
|
||||
AnimeType::GU604 => 62.0 * Self::scale_y(anime_type),
|
||||
|
||||
// TODO: Implement this
|
||||
// AnimeType::G635L => (34.0 + 0.5) * Self::scale_y(anime_type),
|
||||
// AnimeType::G835L => (34.0 + 0.5) * Self::scale_y(anime_type),
|
||||
|
||||
AnimeType::G835L => 68.0 * Self::scale_y(anime_type),
|
||||
// GA402 may not have dead pixels and require only the physical LED count
|
||||
_ => 61.0 * Self::scale_y(anime_type),
|
||||
}
|
||||
@@ -311,18 +313,7 @@ impl AnimeImage {
|
||||
_ => 36 - y / 2,
|
||||
},
|
||||
|
||||
// TODO: Implement this
|
||||
// AnimeType::G635L => match y {
|
||||
|
||||
// },
|
||||
// AnimeType::G835L => match y {
|
||||
|
||||
// },
|
||||
|
||||
// This seems redundant
|
||||
AnimeType::GU604 => AnimeImage::width(anime_type, y),
|
||||
|
||||
// GA402 does not have padding, equivalent to width
|
||||
// Other devices don't have dead pixels
|
||||
_ => AnimeImage::width(anime_type, y),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user