vinzenz/servicepoint
0
0
Fork 0
mirror of https://github.com/cccb/servicepoint.git synced 2025-01-18 18:10:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add BitmapLinear variants

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-05-10 21:45:33 +02:00
parent 638249c2b9
commit 571cf73510
1 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/command.rs
View file

@ -94,8 +94,9 @@ impl Into<Packet> for Command {
#[derive(Debug)] #[derive(Debug)]
pub enum TryFromPacketError { pub enum TryFromPacketError {
InvalidCommand(u16), InvalidCommand(u16),
ExtraneousPayload(usize, usize), UnexpectedPayloadSize(usize, usize),
ExtraneousHeaderValues, ExtraneousHeaderValues,
UnsupportedSubcommand(u16),
} }
fn check_empty_header(packet: &Packet) -> Option<TryFromPacketError> { fn check_empty_header(packet: &Packet) -> Option<TryFromPacketError> {
@ -110,12 +111,26 @@ fn check_empty_header(packet: &Packet) -> Option<TryFromPacketError> {
fn check_command_only(packet: &Packet) -> Option<TryFromPacketError> { fn check_command_only(packet: &Packet) -> Option<TryFromPacketError> {
let Packet(_, payload) = packet; let Packet(_, payload) = packet;
if payload.len() != 0 { if payload.len() != 0 {
Some(TryFromPacketError::ExtraneousPayload(0, payload.len())) Some(TryFromPacketError::UnexpectedPayloadSize(0, payload.len()))
} else { } else {
check_empty_header(packet) check_empty_header(packet)
} }
} }
fn check_linear_bitmap(packet: &Packet) -> Option<TryFromPacketError> {
let Packet(Header(_, offset, length, sub, reserved), payload) = packet;
if *reserved != 0 {
return Some(TryFromPacketError::ExtraneousHeaderValues);
}
if *sub != 0 {
return Some(TryFromPacketError::UnsupportedSubcommand(*sub));
}
if payload.len() != *length as usize {
return Some(TryFromPacketError::UnexpectedPayloadSize(*length as usize, payload.len()));
}
None
}
impl TryFrom<Packet> for Command { impl TryFrom<Packet> for Command {
type Error = TryFromPacketError; type Error = TryFromPacketError;
@ -167,16 +182,36 @@ impl TryFrom<Packet> for Command {
CommandCode::BitmapLegacy => { CommandCode::BitmapLegacy => {
Ok(Command::BitmapLegacy) Ok(Command::BitmapLegacy)
} }
CommandCode::BitmapLinear => { todo!() }
CommandCode::BitmapLinearWin => { CommandCode::BitmapLinearWin => {
Ok(Command::BitmapLinearWin( Ok(Command::BitmapLinearWin(
Origin(*a * TILE_SIZE, *b), Origin(*a * TILE_SIZE, *b),
PixelGrid::load(*c as usize * TILE_SIZE as usize, *d as usize, payload), PixelGrid::load(*c as usize * TILE_SIZE as usize, *d as usize, payload),
)) ))
} }
CommandCode::BitmapLinearAnd => { todo!() } CommandCode::BitmapLinear => {
CommandCode::BitmapLinearOr => { todo!() } if let Some(err) = check_linear_bitmap(&value) {
CommandCode::BitmapLinearXor => { todo!() } return Err(err);
}
Ok(Command::BitmapLinear(*a, BitVec::load(payload)))
}
CommandCode::BitmapLinearAnd => {
if let Some(err) = check_linear_bitmap(&value) {
return Err(err);
}
Ok(Command::BitmapLinearAnd(*a, BitVec::load(payload)))
}
CommandCode::BitmapLinearOr => {
if let Some(err) = check_linear_bitmap(&value) {
return Err(err);
}
Ok(Command::BitmapLinearOr(*a, BitVec::load(payload)))
}
CommandCode::BitmapLinearXor => {
if let Some(err) = check_linear_bitmap(&value) {
return Err(err);
}
Ok(Command::BitmapLinearXor(*a, BitVec::load(payload)))
}
} }
} }
} }