From db4d21c54c92437db9e6d4d446b31afc8aa01ff2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 28 Feb 2025 17:29:43 +0800 Subject: [PATCH] fix emulation bugs --- libs/cramium-hal/src/sh1107.rs | 29 ++++++++++++--------------- services/cramium-emu/src/display.rs | 31 +++++++++++++---------------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/libs/cramium-hal/src/sh1107.rs b/libs/cramium-hal/src/sh1107.rs index 3d1a23430..549c1905b 100644 --- a/libs/cramium-hal/src/sh1107.rs +++ b/libs/cramium-hal/src/sh1107.rs @@ -38,7 +38,7 @@ pub enum Mono { impl From for Mono { fn from(value: ColorNative) -> Self { match value.0 { - 1 => Mono::Black, + 0 => Mono::Black, _ => Mono::White, } } @@ -46,8 +46,8 @@ impl From for Mono { impl Into for Mono { fn into(self) -> ColorNative { match self { - Mono::Black => ColorNative::from(1), - Mono::White => ColorNative::from(0), + Mono::Black => ColorNative::from(0), + Mono::White => ColorNative::from(1), } } } @@ -508,19 +508,16 @@ impl<'a> FrameBuffer for Oled128x128<'a> { } fn xor_pixel(&mut self, p: Point) { - if p.x >= COLUMN || p.y >= ROW || p.x < 0 || p.y < 0 { - return; - } - let bitnum = (p.x + p.y * COLUMN) as usize; - let flip: ColorNative = if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { - Mono::Black.into() - } else { - Mono::White.into() - }; - if flip.0 != 0 { - self.buffer[bitnum / 32] |= 1 << (bitnum % 32); - } else { - self.buffer[bitnum / 32] &= !(1 << (bitnum % 32)); + if let Some(px) = self.get_pixel(p) { + let mono_px: Mono = px.into(); + self.put_pixel( + p, + match mono_px { + Mono::Black => Mono::White, + Mono::White => Mono::Black, + } + .into(), + ); } } diff --git a/services/cramium-emu/src/display.rs b/services/cramium-emu/src/display.rs index 32b9f0e48..68c96dc00 100644 --- a/services/cramium-emu/src/display.rs +++ b/services/cramium-emu/src/display.rs @@ -22,8 +22,8 @@ pub enum Mono { } impl From for Mono { fn from(value: ColorNative) -> Self { - match value.0 as u32 { - DARK_COLOUR => Mono::Black, + match value.0 { + 0 => Mono::Black, _ => Mono::White, } } @@ -31,8 +31,8 @@ impl From for Mono { impl Into for Mono { fn into(self) -> ColorNative { match self { - Mono::Black => ColorNative::from(DARK_COLOUR as usize), - Mono::White => ColorNative::from(LIGHT_COLOUR as usize), + Mono::Black => ColorNative::from(0), + Mono::White => ColorNative::from(1), } } } @@ -186,19 +186,16 @@ impl FrameBuffer for Oled128x128 { } fn xor_pixel(&mut self, p: Point) { - if p.x >= COLUMN || p.y >= ROW || p.x < 0 || p.y < 0 { - return; - } - let bitnum = (p.x + p.y * COLUMN) as usize; - let flip: ColorNative = if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { - Mono::Black.into() - } else { - Mono::White.into() - }; - if flip.0 != 0 { - self.buffer[bitnum / 32] |= 1 << (bitnum % 32); - } else { - self.buffer[bitnum / 32] &= !(1 << (bitnum % 32)); + if let Some(px) = self.get_pixel(p) { + let mono_px: Mono = px.into(); + self.put_pixel( + p, + match mono_px { + Mono::Black => Mono::White, + Mono::White => Mono::Black, + } + .into(), + ); } }