ank/pick-n-place
1
Fork 0
Code Issues Activity

import cleanup (cargo fix)

Browse source
This commit is contained in:
Andy Killorin 2024-05-14 13:53:05 -05:00
parent b42e73480a
commit 81443942ba
Signed by: ank
GPG key ID: 23F9463ECB67FE8C
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encoder.rs
View file

@ -1,6 +1,6 @@
use core::{cell::{Cell, OnceCell}, sync::atomic::AtomicU8}; 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}; use avr_device::interrupt::{self, CriticalSection, Mutex};
pub fn setup_encoder(d3: Pin<Input<Floating>, PD3>, d4: Pin<Input<Floating>, PD4>, int: EXINT) { pub fn setup_encoder(d3: Pin<Input<Floating>, PD3>, d4: Pin<Input<Floating>, PD4>, int: EXINT) {
interrupt::free(|cs| { interrupt::free(|cs| {

6
src/main.rs
View file

@ -2,17 +2,15 @@
#![no_main] #![no_main]
#![feature(abi_avr_interrupt, cell_update)] #![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 avr_device::interrupt;
use encoder::{rotations, setup_encoder, update_encoder, COUNTS, TICKS_PER_ROT}; use encoder::{rotations, setup_encoder, COUNTS};
use panic_halt as _; use panic_halt as _;
mod servo; mod servo;
use servo::{configure_timer_one, Servo}; use servo::{configure_timer_one, Servo};
use ufmt::uwriteln; use ufmt::uwriteln;
use crate::servo::calculate_duty;
mod encoder; mod encoder;
// d3: encoder // d3: encoder