gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Anime: fixups, GU604 support

Browse Source
This commit is contained in:
Luke D. Jones
2023-06-15 23:53:24 +12:00
parent cdc42193d1
commit 40e00c4739
11 changed files with 115 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rog-anime/src/data.rs
View File

@@ -38,6 +38,7 @@ pub struct AnimePowerStates {
pub enum AnimeType {
GA401,
GA402,
GU604,
Unknown,
}
@@ -46,6 +47,7 @@ impl AnimeType {
pub fn width(&self) -> usize {
match self {
AnimeType::GA401 | AnimeType::GA402 => 74,
AnimeType::GU604 => 74,
AnimeType::Unknown => 0,
}
}
@@ -55,6 +57,7 @@ impl AnimeType {
match self {
AnimeType::GA401 => 36,
AnimeType::GA402 => 39,
AnimeType::GU604 => 39,
AnimeType::Unknown => 0,
}
}
@@ -64,6 +67,7 @@ impl AnimeType {
match self {
AnimeType::GA401 => PANE_LEN * 2,
AnimeType::GA402 => PANE_LEN * 3,
AnimeType::GU604 => PANE_LEN * 3,
AnimeType::Unknown => 0,
}
}
@@ -115,7 +119,7 @@ impl AnimeDataBuffer {
}
}
/// The two packets to be written to USB
/// The packets to be written to USB
pub type AnimePacketType = Vec<[u8; 640]>;
impl TryFrom<AnimeDataBuffer> for AnimePacketType {
@@ -128,8 +132,7 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
let mut buffers = match anime.anime {
AnimeType::GA401 => vec![[0; 640]; 2],
AnimeType::GA402 => vec![[0; 640]; 3],
AnimeType::Unknown => vec![[0; 640]; 1],
AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unknown => vec![[0; 640]; 3],
};
for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
@@ -138,7 +141,10 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
buffers[0][..7].copy_from_slice(&USB_PREFIX1);
buffers[1][..7].copy_from_slice(&USB_PREFIX2);
if matches!(anime.anime, AnimeType::GA402) {
if matches!(
anime.anime,
AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unknown
) {
buffers[2][..7].copy_from_slice(&USB_PREFIX3);
}
Ok(buffers)

1
rog-anime/src/diagonal.rs
View File

@@ -139,6 +139,7 @@ impl AnimeDiagonal {
match anime_type {
AnimeType::GA401 => self.to_ga401_packets(),
AnimeType::GA402 => self.to_ga402_packets(),
AnimeType::GU604 => self.to_ga402_packets(),
AnimeType::Unknown => self.to_unknown_packets(),
}
}

20
rog-anime/src/image.rs
View File

@@ -118,6 +118,7 @@ impl AnimeImage {
match anime_type {
AnimeType::GA401 => 0.8,
AnimeType::GA402 => 0.77,
AnimeType::GU604 => 0.77,
AnimeType::Unknown => 0.0,
}
}
@@ -134,6 +135,7 @@ impl AnimeImage {
match anime_type {
AnimeType::GA401 => 0.3,
AnimeType::GA402 => 0.283,
AnimeType::GU604 => 0.283,
AnimeType::Unknown => 0.0,
}
}
@@ -175,6 +177,14 @@ impl AnimeImage {
// and then their offset grows by one every two rows
(y + 1) / 2 - 5
}
AnimeType::GU604 => {
// first 11 rows start at zero
if y <= 9 {
return 0;
}
// and then their offset grows by one every two rows
(y + 1) / 2 - 5
}
AnimeType::Unknown => 0,
}
}
@@ -209,6 +219,12 @@ impl AnimeImage {
}
39 - y / 2
}
AnimeType::GU604 => {
if y <= 9 {
return 39;
}
44 - y / 2
}
AnimeType::Unknown => 0,
}
}
@@ -219,6 +235,7 @@ 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::GA402 => (35.0 + 0.5) * Self::scale_x(anime_type),
AnimeType::GU604 => (35.0 + 0.5) * Self::scale_x(anime_type),
AnimeType::Unknown => 0.0,
}
}
@@ -228,6 +245,7 @@ impl AnimeImage {
match anime_type {
AnimeType::GA401 => 55,
AnimeType::GA402 => 61,
AnimeType::GU604 => 61,
AnimeType::Unknown => 0,
}
}
@@ -239,6 +257,7 @@ impl AnimeImage {
AnimeType::GA401 => (54.0 + 1.0) * Self::scale_y(anime_type),
// GA402 may not have dead pixels and require only the physical LED count
AnimeType::GA402 => 61.0 * Self::scale_y(anime_type),
AnimeType::GU604 => 61.0 * Self::scale_y(anime_type),
AnimeType::Unknown => 0.0,
}
}
@@ -253,6 +272,7 @@ impl AnimeImage {
},
// GA402 does not have padding, equivalent to width
AnimeType::GA402 => AnimeImage::width(anime_type, y),
AnimeType::GU604 => AnimeImage::width(anime_type, y),
AnimeType::Unknown => 0,
}
}

28
rog-anime/src/usb.rs
View File

@@ -11,9 +11,6 @@
use crate::error::AnimeError;
use crate::AnimeType;
const INIT_STR: [u8; 15] = [
0x5e, b'A', b'S', b'U', b'S', b' ', b'T', b'e', b'c', b'h', b'.', b'I', b'n', b'c', b'.',
];
const PACKET_SIZE: usize = 640;
const DEV_PAGE: u8 = 0x5e;
pub const VENDOR_ID: u16 = 0x0b05;
@@ -33,6 +30,8 @@ pub fn get_anime_type() -> Result<AnimeType, AnimeError> {
return Ok(AnimeType::GA401);
} else if board_name.contains("GA402R") {
return Ok(AnimeType::GA402);
} else if board_name.contains("GU604V") {
return Ok(AnimeType::GU604);
}
log::warn!("AniMe Matrix device found but not yet supported");
Ok(AnimeType::Unknown)
@@ -45,12 +44,14 @@ pub const fn pkts_for_init() -> [[u8; PACKET_SIZE]; 2] {
let mut packets = [[0; PACKET_SIZE]; 2];
packets[0][0] = DEV_PAGE; // This is the USB page we're using throughout
let mut count = 0;
while count < INIT_STR.len() {
packets[0][count] = INIT_STR[count];
// TODO: memcpy or slice copy
let bytes = "ASUS Tech.Inc.".as_bytes();
while count < bytes.len() {
packets[0][count + 1] = bytes[count];
count += 1;
}
//
packets[1][0] = DEV_PAGE; // write it to be sure?
packets[1][0] = DEV_PAGE;
packets[1][1] = 0xc2;
packets
}
@@ -80,8 +81,9 @@ pub const fn pkt_for_set_boot(status: bool) -> [u8; PACKET_SIZE] {
/// Get the packet required for setting the device to on. Requires
/// `pkt_for_apply()` to be written after.
// TODO: change the users of this method
#[inline]
pub const fn pkt_for_set_on(on: bool) -> [u8; PACKET_SIZE] {
pub const fn pkt_for_set_brightness(on: bool) -> [u8; PACKET_SIZE] {
let mut pkt = [0; PACKET_SIZE];
pkt[0] = DEV_PAGE;
pkt[1] = 0xc0;
@@ -90,9 +92,19 @@ pub const fn pkt_for_set_on(on: bool) -> [u8; PACKET_SIZE] {
pkt
}
#[inline]
pub const fn pkt_for_set_awake_enabled(enable: bool) -> [u8; PACKET_SIZE] {
let mut pkt = [0; PACKET_SIZE];
pkt[0] = DEV_PAGE;
pkt[1] = 0xc3;
pkt[2] = 0x01;
pkt[3] = if enable { 0x80 } else { 0x00 };
pkt
}
/// Packet required to apply a device setting
#[inline]
pub const fn pkt_for_apply() -> [u8; PACKET_SIZE] {
pub const fn pkt_for_enable_animation() -> [u8; PACKET_SIZE] {
let mut pkt = [0; PACKET_SIZE];
pkt[0] = DEV_PAGE;
pkt[1] = 0xc4;