diff --git a/src/encoder.rs b/src/encoder.rs index 904e77f..e9fdeb7 100644 --- a/src/encoder.rs +++ b/src/encoder.rs @@ -1,6 +1,6 @@ use core::{cell::{Cell, OnceCell}, sync::atomic::AtomicU8}; -use arduino_hal::{hal::port::{PD1, PD2, PD3, PD4}, pac::{exint::eicra::{ISC0_A, ISC1_A}, EXINT}, port::{mode::{Floating, Input}, Pin}}; +use arduino_hal::{hal::port::{PD3, PD4}, pac::{EXINT}, port::{mode::{Floating, Input}, Pin}}; use avr_device::interrupt::{self, CriticalSection, Mutex}; pub fn setup_encoder(d3: Pin, PD3>, d4: Pin, PD4>, int: EXINT) { interrupt::free(|cs| { diff --git a/src/main.rs b/src/main.rs index e1b9200..35aa186 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,17 +2,15 @@ #![no_main] #![feature(abi_avr_interrupt, cell_update)] -use core::sync::atomic::Ordering; -use arduino_hal::{default_serial, delay_ms, hal::port::{PD4, PD5}, pac::tc1::OCR1A, port::{mode::{Input, PullUp}, Pin}}; +use arduino_hal::{hal::port::PD5, pac::tc1::OCR1A, port::{mode::{Input, PullUp}, Pin}}; use avr_device::interrupt; -use encoder::{rotations, setup_encoder, update_encoder, COUNTS, TICKS_PER_ROT}; +use encoder::{rotations, setup_encoder, COUNTS}; use panic_halt as _; mod servo; use servo::{configure_timer_one, Servo}; use ufmt::uwriteln; -use crate::servo::calculate_duty; mod encoder; // d3: encoder