From 01d7651212b9bcb472fc1896f883732b4872cdb5 Mon Sep 17 00:00:00 2001 From: kirbylife Date: Thu, 4 May 2023 20:57:19 -0600 Subject: [PATCH] change the rs/en screen pins --- Cargo.toml | 2 +- src/main.rs | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a729059..ed0afcc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -arduino-hal = { git = "https://github.com/rahix/avr-hal", features = ["arduino-uno"] } +arduino-hal = { git = "https://github.com/rahix/avr-hal", features = ["arduino-nano"] } ds323x = { git = "https://github.com/kirbylife/ds323x-rs", branch = "fix-set-day-format" } hmac-sha1-compact = { git = "https://github.com/kirbylife/rust-hmac-sha1" } panic-halt = "0.2.0" diff --git a/src/main.rs b/src/main.rs index decf267..86f3109 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,16 +39,8 @@ fn main() -> ! { let mut led = pins.d13.into_output(); let mut serial = default_serial!(dp, pins, 9600); - let i2c_clock = arduino_hal::I2c::new( - dp.TWI, - pins.a4.into_pull_up_input(), // SDA - pins.a5.into_pull_up_input(), // SCL - 50000, - ); - let mut rtc = ds323x::Ds323x::new_ds3231(i2c_clock); - - let mut rs = pins.d12.into_output(); - let mut en = pins.d11.into_output(); + let mut rs = pins.d9.into_output(); + let mut en = pins.d8.into_output(); let mut d4 = pins.d5.into_output(); let mut d5 = pins.d4.into_output(); let mut d6 = pins.d3.into_output(); @@ -57,12 +49,20 @@ fn main() -> ! { let mut display = screen::StnScreen::new(&mut rs, &mut en, &mut d4, &mut d5, &mut d6, &mut d7); display.clear(); + let i2c_clock = arduino_hal::I2c::new( + dp.TWI, + pins.a4.into_pull_up_input(), // SDA + pins.a5.into_pull_up_input(), // SCL + 50000, + ); + let mut rtc = ds323x::Ds323x::new_ds3231(i2c_clock); + let mut eeprom = arduino_hal::Eeprom::new(dp.EEPROM); let mut tokens = storage::Tokens::new(&mut eeprom); - let up = pins.d6.into_pull_up_input(); + let up = pins.a2.into_pull_up_input(); let mut up_button = button::Button::new(&up, true); - let down = pins.d7.into_pull_up_input(); + let down = pins.a1.into_pull_up_input(); let mut down_button = button::Button::new(&down, true); up_button.update();