[???] Fix program execution

src/main.rs

@@ -5,11 +5,12 @@ use sdl2::event::Event;
 use sdl2::EventPump;
 use sdl2::keyboard::Keycode;
 use sdl2::pixels::Color;
-use sdl2::render::WindowCanvas;
+use sdl2::render::{BlendMode, WindowCanvas};
 use simple_logger::SimpleLogger;
 use crate::emu::cpu::Cpu;
 use crate::emu::graphics::GraphicsProcessor;
-use crate::emu::memory::{MEM_LENGTH, RamMemory};
+use crate::emu::keyboard::Keyboard;
+use crate::emu::memory::{MEM_LENGTH, Memory, RamMemory};
 use crate::graphics::graphics_adapter::SDLGraphicsAdapter;
 
 use crate::misc::result::EmulatorResult;
@@ -23,15 +24,20 @@ fn main() -> EmulatorResult<()> {
     let (file_bytes, x) = try_load_rom()?;
     assert!(x < MEM_LENGTH);
     SimpleLogger::new().env().init().unwrap();
-    let ram = RamMemory::try_from(file_bytes.as_slice())?;
 
     let (mut canvas, mut event_pump, draw_factor) = initiate_sdl();
 
+
+    let ram = RamMemory::try_from(file_bytes.as_slice())?;
     let graphics_processor = GraphicsProcessor::try_new(&ram)?;
-    let sdl2_graphics_adapter = SDLGraphicsAdapter::new(&graphics_processor);
+    let mut keyboard = Keyboard::new(&ram);
     let cpu = Cpu::new(&ram, &graphics_processor);
 
+    let mut sdl2_graphics_adapter = SDLGraphicsAdapter::new(&graphics_processor);
+
+    let mut i = 0;
     'running: loop {
+        i = (i+1)%255;
         canvas.set_draw_color(Color::BLACK);
         canvas.clear();
         for event in event_pump.poll_iter() {
@@ -39,7 +45,17 @@ fn main() -> EmulatorResult<()> {
                 Event::Quit { .. } |
                 Event::KeyDown { keycode: Some(Keycode::Escape), .. } => {
                     break 'running;
+                }
+                Event::KeyDown { keycode: Some(x),repeat:false,.. } => {
+                    if let Some(key_val) = get_key_index(x) {
+                        keyboard.key_down(key_val)
+                    }
                 },
+                Event::KeyUp { keycode: Some(x), repeat:false, .. } => {
+                    if let Some(key_val) = get_key_index(x) {
+                        keyboard.key_up(key_val)
+                    }
+                }
 
                 event => {
                     log::trace!("Received window event {:?}",event);
@@ -47,10 +63,12 @@ fn main() -> EmulatorResult<()> {
             }
         }
 
+        keyboard.flush_keyboard()?;
+
         // The rest of the game loop goes here...
         cpu.cycle()?;
         // draw graphics
-        sdl2_graphics_adapter.draw(&mut canvas, draw_factor)?;
+        sdl2_graphics_adapter.draw(&mut canvas)?;
         // TODO render audio
 
         canvas.present();
@@ -61,10 +79,33 @@ fn main() -> EmulatorResult<()> {
     Ok(())
 }
 
+/// get index of key pressed. 0..9+A..F provides a u8
+fn get_key_index(p0: Keycode) -> Option<u8> {
+    match p0 {
+        Keycode::Kp0 => Some(0x0),
+        Keycode::Kp1 => Some(0x1),
+        Keycode::Kp2 => Some(0x2),
+        Keycode::Kp3 => Some(0x3),
+        Keycode::Kp4 => Some(0x4),
+        Keycode::Kp5 => Some(0x5),
+        Keycode::Kp6 => Some(0x6),
+        Keycode::Kp7 => Some(0x7),
+        Keycode::Kp8 => Some(0x8),
+        Keycode::Kp9 => Some(0x9),
+        Keycode::A => Some(0xA),
+        Keycode::B => Some(0xB),
+        Keycode::C => Some(0xC),
+        Keycode::D => Some(0xD),
+        Keycode::E => Some(0xE),
+        Keycode::F => Some(0xF),
+        _ => None
+    }
+}
+
 fn try_load_rom() -> EmulatorResult<(Vec<u8>, usize)> {
     let mut file_bytes = vec![0u8; MEM_LENGTH];
 
-    let mut file_handle = File::open("rom.BytePusher")?;
+    let mut file_handle = File::open("roms/Keyboard Test(1).BytePusher")?;
     let x = file_handle.read(&mut file_bytes)?;
 
     Ok((file_bytes, x))
@@ -83,9 +124,13 @@ fn initiate_sdl() -> (WindowCanvas, EventPump, u32) {
         .unwrap();
     let mut canvas = window.into_canvas().build().unwrap();
 
-    canvas.set_draw_color(Color::RGB(0, 255, 255));
+    canvas.set_draw_color(Color::RGB(0x10, 0x10, 0x10));
+    canvas.set_integer_scale(true).expect("Setting int scale");
+
+    canvas.set_scale(DRAW_FACTOR as f32,DRAW_FACTOR as f32).expect("Setting scale");
     canvas.clear();
+    canvas.set_blend_mode(BlendMode::None);
     canvas.present();
-    let mut event_pump = sdl_context.event_pump().unwrap();
+    let event_pump = sdl_context.event_pump().unwrap();
     (canvas, event_pump, DRAW_FACTOR)
 }