saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup more emulation issues

Browse source
This commit is contained in:
bunnie 2025-02-28 17:42:30 +08:00
parent cb0cfb3f2c
commit e84daa0179
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/cramium-hal/src/sh1107.rs
View file

@ -38,7 +38,7 @@ pub enum Mono {
impl From<ColorNative> for Mono {
fn from(value: ColorNative) -> Self {
match value.0 {
0 => Mono::Black,
1 => Mono::Black,
_ => Mono::White,
}
}
@ -46,8 +46,8 @@ impl From<ColorNative> for Mono {
impl Into<ColorNative> for Mono {
fn into(self) -> ColorNative {
match self {
Mono::Black => ColorNative::from(0),
Mono::White => ColorNative::from(1),
Mono::Black => ColorNative::from(1),
Mono::White => ColorNative::from(0),
}
}
}
@ -500,11 +500,7 @@ impl<'a> FrameBuffer for Oled128x128<'a> {
return None;
}
let bitnum = (p.x + p.y * COLUMN) as usize;
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
Some(Mono::White.into())
} else {
Some(Mono::Black.into())
}
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { Some(1.into()) } else { Some(0.into()) }
}
fn xor_pixel(&mut self, p: Point) {

12
services/cramium-emu/src/display.rs
View file

@ -23,7 +23,7 @@ pub enum Mono {
impl From<ColorNative> for Mono {
fn from(value: ColorNative) -> Self {
match value.0 {
0 => Mono::Black,
1 => Mono::Black,
_ => Mono::White,
}
}
@ -31,8 +31,8 @@ impl From<ColorNative> for Mono {
impl Into<ColorNative> for Mono {
fn into(self) -> ColorNative {
match self {
Mono::Black => ColorNative::from(0),
Mono::White => ColorNative::from(1),
Mono::Black => ColorNative::from(1),
Mono::White => ColorNative::from(0),
}
}
}
@ -178,11 +178,7 @@ impl FrameBuffer for Oled128x128 {
return None;
}
let bitnum = (p.x + p.y * COLUMN) as usize;
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
Some(Mono::White.into())
} else {
Some(Mono::Black.into())
}
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { Some(1.into()) } else { Some(0.into()) }
}
fn xor_pixel(&mut self, p: Point) {