mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
fixup more emulation issues
This commit is contained in:
parent
cb0cfb3f2c
commit
e84daa0179
2 changed files with 8 additions and 16 deletions
|
|
@ -38,7 +38,7 @@ pub enum Mono {
|
||||||
impl From<ColorNative> for Mono {
|
impl From<ColorNative> for Mono {
|
||||||
fn from(value: ColorNative) -> Self {
|
fn from(value: ColorNative) -> Self {
|
||||||
match value.0 {
|
match value.0 {
|
||||||
0 => Mono::Black,
|
1 => Mono::Black,
|
||||||
_ => Mono::White,
|
_ => Mono::White,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -46,8 +46,8 @@ impl From<ColorNative> for Mono {
|
||||||
impl Into<ColorNative> for Mono {
|
impl Into<ColorNative> for Mono {
|
||||||
fn into(self) -> ColorNative {
|
fn into(self) -> ColorNative {
|
||||||
match self {
|
match self {
|
||||||
Mono::Black => ColorNative::from(0),
|
Mono::Black => ColorNative::from(1),
|
||||||
Mono::White => ColorNative::from(1),
|
Mono::White => ColorNative::from(0),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -500,11 +500,7 @@ impl<'a> FrameBuffer for Oled128x128<'a> {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let bitnum = (p.x + p.y * COLUMN) as usize;
|
let bitnum = (p.x + p.y * COLUMN) as usize;
|
||||||
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
|
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { Some(1.into()) } else { Some(0.into()) }
|
||||||
Some(Mono::White.into())
|
|
||||||
} else {
|
|
||||||
Some(Mono::Black.into())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn xor_pixel(&mut self, p: Point) {
|
fn xor_pixel(&mut self, p: Point) {
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ pub enum Mono {
|
||||||
impl From<ColorNative> for Mono {
|
impl From<ColorNative> for Mono {
|
||||||
fn from(value: ColorNative) -> Self {
|
fn from(value: ColorNative) -> Self {
|
||||||
match value.0 {
|
match value.0 {
|
||||||
0 => Mono::Black,
|
1 => Mono::Black,
|
||||||
_ => Mono::White,
|
_ => Mono::White,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -31,8 +31,8 @@ impl From<ColorNative> for Mono {
|
||||||
impl Into<ColorNative> for Mono {
|
impl Into<ColorNative> for Mono {
|
||||||
fn into(self) -> ColorNative {
|
fn into(self) -> ColorNative {
|
||||||
match self {
|
match self {
|
||||||
Mono::Black => ColorNative::from(0),
|
Mono::Black => ColorNative::from(1),
|
||||||
Mono::White => ColorNative::from(1),
|
Mono::White => ColorNative::from(0),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -178,11 +178,7 @@ impl FrameBuffer for Oled128x128 {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let bitnum = (p.x + p.y * COLUMN) as usize;
|
let bitnum = (p.x + p.y * COLUMN) as usize;
|
||||||
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
|
if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 { Some(1.into()) } else { Some(0.into()) }
|
||||||
Some(Mono::White.into())
|
|
||||||
} else {
|
|
||||||
Some(Mono::Black.into())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn xor_pixel(&mut self, p: Point) {
|
fn xor_pixel(&mut self, p: Point) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue