Merge pull request #14 from jeanthom/lcd-driver-sgs

hd66753: Implement SGS drawing logic
daniel5151 · Feb 5, 2024 · 55c9adc · 55c9adc
2 parents 7cef5cf + 9be591b
commit 55c9adc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clicky-core/Cargo.toml b/clicky-core/Cargo.toml
@@ -17,6 +17,7 @@ bytemuck = "1.2"
 byteorder = "1.3"
 cfg-if = "0.1"
 chrono = "0.4"
+either = "1.9.0"
 log = "0.4"
 num_enum = "0.5"
 static_assertions = "1.1"

diff --git a/clicky-core/src/devices/display/hd66753.rs b/clicky-core/src/devices/display/hd66753.rs
@@ -4,6 +4,8 @@ use std::sync::{Arc, RwLock};
 
 use crate::gui::RenderCallback;
 
+use either::Either;
+
 const CGRAM_WIDTH: usize = 168;
 const CGRAM_HEIGHT: usize = 132;
 #[allow(dead_code)]
@@ -155,15 +157,22 @@ impl Hd66753 {
             };
 
             let cgram_window = cgram
-                .chunks_exact(EMU_CGRAM_WIDTH * 2 / 8 / 2)
-                .take(height)
-                .flat_map(|row| row.iter().take(CGRAM_WIDTH * 2 / 8 / 2).rev());
+                    .chunks_exact(EMU_CGRAM_WIDTH * 2 / 8 / 2)
+                    .take(height)
+                    .flat_map(|row| {
+                        match ireg.sgs {
+                            true => Either::Left(row.iter().take(CGRAM_WIDTH * 2 / 8 / 2)),
+                            false => Either::Right(row.iter().take(CGRAM_WIDTH * 2 / 8 / 2).rev()),
+                        }
+
+                     });
 
             // TODO: implement cursor control
 
             let new_buf = cgram_window.flat_map(|w| {
                 // every 16 bits = 8 pixels
-                (0..8).rev().map(move |i| {
+                (0..8).map(move |i| {
+                    let i = if ireg.sgs { i } else { 7 - i };
                     let idx = ((w >> (i * 2)) & 0b11) as usize;
                     if ireg.rev {
                         PALETTE[idx]