diff --git a/images/Image.bmp b/images/Image.bmp deleted file mode 100644 index 2e47e38..0000000 Binary files a/images/Image.bmp and /dev/null differ diff --git a/images/Image.qoi b/images/Image.qoi deleted file mode 100644 index 865ad89..0000000 Binary files a/images/Image.qoi and /dev/null differ diff --git a/images/Image.xcf b/images/Image.xcf deleted file mode 100644 index 3346adc..0000000 Binary files a/images/Image.xcf and /dev/null differ diff --git a/images/hi.qoi b/images/hi.qoi deleted file mode 100644 index 3e5e4f0..0000000 Binary files a/images/hi.qoi and /dev/null differ diff --git a/images/hi.xcf b/images/hi.xcf deleted file mode 100644 index 0de368f..0000000 Binary files a/images/hi.xcf and /dev/null differ diff --git a/images/large.qoi b/images/large.qoi deleted file mode 100644 index d72c608..0000000 Binary files a/images/large.qoi and /dev/null differ diff --git a/images/large.xcf b/images/large.xcf deleted file mode 100644 index 8fd96d9..0000000 Binary files a/images/large.xcf and /dev/null differ diff --git a/images/mario.xcf b/images/mario.xcf deleted file mode 100644 index 2a05e00..0000000 Binary files a/images/mario.xcf and /dev/null differ diff --git a/images/sheep.qoi b/images/sheep.qoi deleted file mode 100644 index ad15092..0000000 Binary files a/images/sheep.qoi and /dev/null differ diff --git a/images/sheep.xcf b/images/sheep.xcf deleted file mode 100644 index edae3fb..0000000 Binary files a/images/sheep.xcf and /dev/null differ diff --git a/images/steve.qoi b/images/steve.qoi new file mode 100644 index 0000000..aa16342 Binary files /dev/null and b/images/steve.qoi differ diff --git a/src/main.rs b/src/main.rs index e28435b..cee5a52 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,7 +20,7 @@ use panic_halt as _; use crate::{ display::{Display, Position, Rgb565}, peripherals::{Button, Knob}, - qoi::{MARIO, PIKA, PRESS_BTN, draw_image}, + qoi::{MARIO, PIKA, PRESS_BTN, STEVE, draw_image}, }; mod display; @@ -49,7 +49,7 @@ fn main() -> ! { // ufmt::uwriteln!(serial, "Eeprom capacity: {}", eeprom.capacity()).unwrap(); let cs = pins.pb2.into_output(); - let (mut spi, mut cs) = spi::Spi::new( + let (spi, cs) = spi::Spi::new( dp.SPI, pins.pb5.into_output(), pins.pb3.into_output(), @@ -75,23 +75,15 @@ fn main() -> ! { display.init(); - let mut adc: Adc = atmega_hal::Adc::new(dp.ADC, Default::default()); - let mut button = Button::from(pins.pd5.into_pull_up_input()); - let mut knob = Knob { - pin: pins.pc1.into_analog_input(&mut adc), - adc, - }; - - let mut delay = atmega_hal::delay::Delay::::new(); let mut idx = 0; - let mut images = [&PIKA.as_slice(), &MARIO.as_slice()]; + let images = [&PIKA.as_slice(), &MARIO.as_slice(), &STEVE.as_slice()]; let len = images.len(); match draw_image( &mut serial, - &PRESS_BTN.as_slice(), + &PIKA.as_slice(), &mut display, Position { x: 0, y: 0 }, ) { diff --git a/src/qoi.rs b/src/qoi.rs index 1e326cd..3238c5d 100644 --- a/src/qoi.rs +++ b/src/qoi.rs @@ -19,6 +19,7 @@ use crate::{ // https://qoiformat.org/qoi-specification.pdf pub static MARIO: [u8; 161] = *include_bytes!("../images/mario.qoi"); pub static PIKA: [u8; 241] = *include_bytes!("../images/pikachu.qoi"); +pub static STEVE: [u8; 187] = *include_bytes!("../images/steve.qoi"); pub static PRESS_BTN: [u8; 174] = *include_bytes!("../images/press_btn.qoi"); #[derive(Debug, uDebug)]