diff --git a/Cargo.lock b/Cargo.lock index 03d6720..2874ff3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,12 +14,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - [[package]] name = "base64" version = "0.13.1" @@ -291,29 +285,6 @@ dependencies = [ "nb 1.1.0", ] -[[package]] -name = "embedded-graphics" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8da660bb0c829b34a56a965490597f82a55e767b91f9543be80ce8ccb416fe" -dependencies = [ - "az", - "byteorder", - "embedded-graphics-core", - "float-cmp", - "micromath", -] - -[[package]] -name = "embedded-graphics-core" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95743bef3ff70fcba3930246c4e6872882bbea0dcc6da2ca860112e0cd4bd09f" -dependencies = [ - "az", - "byteorder", -] - [[package]] name = "embedded-hal" version = "0.2.7" @@ -339,16 +310,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-hal-bus" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513e0b3a8fb7d3013a8ae17a834283f170deaf7d0eeab0a7c1a36ad4dd356d22" -dependencies = [ - "critical-section", - "embedded-hal 1.0.0", -] - [[package]] name = "embedded-io" version = "0.6.1" @@ -627,16 +588,13 @@ name = "esp32-phone" version = "0.1.0" dependencies = [ "critical-section", - "embedded-graphics", "embedded-hal 1.0.0", - "embedded-hal-bus", "esp-alloc", "esp-backtrace", "esp-bootloader-esp-idf", "esp-hal", "esp-println", "log", - "mipidsi", ] [[package]] @@ -693,15 +651,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -901,23 +850,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" -[[package]] -name = "micromath" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815" - -[[package]] -name = "mipidsi" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790ebd28bd67addbccf41b1c0c188c26bb9f5bdcd91d4d6da9bd558e20d97a1d" -dependencies = [ - "embedded-graphics-core", - "embedded-hal 1.0.0", - "heapless 0.8.0", -] - [[package]] name = "nb" version = "0.1.3" diff --git a/Cargo.toml b/Cargo.toml index 20ef82c..727de0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,10 +20,6 @@ esp-backtrace = { version = "0.19.0", features = [ ] } esp-println = { version = "0.17.0", features = ["esp32", "log-04"] } -mipidsi = "0.10.0" -embedded-hal-bus = "*" -embedded-graphics="*" - # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html [profile.dev] diff --git a/src/display.rs b/src/display.rs index 36763c1..8894395 100644 --- a/src/display.rs +++ b/src/display.rs @@ -1,11 +1,7 @@ use core::ops::Mul; use embedded_hal::{delay::DelayNs, spi::SpiBus}; -use esp_hal::{ - DriverMode, - gpio::{Input, Output}, - spi::master::Spi, -}; +use esp_hal::{DriverMode, gpio::Output, spi::master::Spi}; // use atmega_hal::{ // Spi, @@ -26,6 +22,14 @@ impl Rgb565 { Color::from(r | b | g) } + pub fn black() -> Rgb565 { + Rgb565(0, 0, 0) + } + + pub fn white() -> Rgb565 { + Rgb565(255, 255, 255) + } + pub fn red() -> Rgb565 { Rgb565(255, 0, 0) } diff --git a/src/main.rs b/src/main.rs index 5cb77d6..46848b4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ use esp_hal::{ gpio::{Level, Output, OutputConfig}, main, spi::master::{Config, Spi}, - time::{Duration, Instant, Rate}, + time::Rate, }; use esp_backtrace as _; @@ -97,17 +97,7 @@ fn main() -> ! { Rgb565::yellow().as_color(), ); - // let mut led = Output::new(peripherals.GPIO5, Level::Low, OutputConfig::default()); - - let mut test_delay = Delay::new(); - - // let mut buffer = [0u8; 512]; - // let spi_device = ExclusiveDevice::new_no_delay(spi, cs).unwrap(); - // let di = SpiInterface::new(spi_device, dc, &mut buffer); - // let mut display = Builder::new(ST7789, di) - // .reset_pin(rst) - // .init(&mut test_delay) - // .unwrap(); // delay provider from your MCU + let test_delay = Delay::new(); let mut color = 0; @@ -116,8 +106,6 @@ fn main() -> ! { color = (color + 50) % 200; - // display.clear(Rgb565::new(color, color, color)).unwrap(); - display.draw_rect( Position::new(0, 0), Position::new(240, 240),