From cef6df12ff8e7658d1c5ddee8c948d81d963ee0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20Kaan=20G=C3=9CM=C3=9C=C5=9E?= <96421894+Tahinli@users.noreply.github.com> Date: Fri, 12 Jan 2024 23:32:30 +0300 Subject: [PATCH] refactor: :recycle: rearanged files --- .cargo/config.toml | 8 --- 001-led_blink | 1 + 002-timer | 1 + Cargo.toml | 36 ---------- avr-specs/avr-atmega1280.json | 25 ------- avr-specs/avr-atmega168.json | 25 ------- avr-specs/avr-atmega2560.json | 25 ------- avr-specs/avr-atmega328p.json | 25 ------- avr-specs/avr-atmega32u4.json | 25 ------- avr-specs/avr-atmega48p.json | 25 ------- avr-specs/avr-attiny85.json | 25 ------- avr-specs/avr-attiny88.json | 25 ------- rust-toolchain.toml | 4 -- src/main.rs | 119 ---------------------------------- src/timer.rs | 56 ---------------- 15 files changed, 2 insertions(+), 423 deletions(-) delete mode 100644 .cargo/config.toml create mode 160000 001-led_blink create mode 160000 002-timer delete mode 100644 Cargo.toml delete mode 100644 avr-specs/avr-atmega1280.json delete mode 100644 avr-specs/avr-atmega168.json delete mode 100644 avr-specs/avr-atmega2560.json delete mode 100644 avr-specs/avr-atmega328p.json delete mode 100644 avr-specs/avr-atmega32u4.json delete mode 100644 avr-specs/avr-atmega48p.json delete mode 100644 avr-specs/avr-attiny85.json delete mode 100644 avr-specs/avr-attiny88.json delete mode 100644 rust-toolchain.toml delete mode 100644 src/main.rs delete mode 100644 src/timer.rs diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index d502ee5..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,8 +0,0 @@ -[build] -target = "avr-specs/avr-atmega328p.json" - -[target.'cfg(target_arch = "avr")'] -runner = "ravedude uno -cb 57600" - -[unstable] -build-std = ["core"] diff --git a/001-led_blink b/001-led_blink new file mode 160000 index 0000000..6fc354b --- /dev/null +++ b/001-led_blink @@ -0,0 +1 @@ +Subproject commit 6fc354b0bcb6ca5c008493632c8d324ac22f640b diff --git a/002-timer b/002-timer new file mode 160000 index 0000000..6fc354b --- /dev/null +++ b/002-timer @@ -0,0 +1 @@ +Subproject commit 6fc354b0bcb6ca5c008493632c8d324ac22f640b diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index d93244a..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,36 +0,0 @@ -[package] -name = "rust-arduino" -version = "0.1.0" -authors = ["Ahmet Kaan GÜMÜŞ <96421894+Tahinli@users.noreply.github.com>"] -edition = "2021" -license = "MIT OR Apache-2.0 OR GPL-3.0" - -[[bin]] -name = "rust-arduino" -test = false -bench = false - -[dependencies] -panic-halt = "0.2.0" -ufmt = "0.2.0" -nb = "1.1.0" -embedded-hal = "0.2.3" -avr-device = "0.5.3" - -[dependencies.arduino-hal] -git = "https://github.com/rahix/avr-hal" -rev = "190f2c3cb8d29e10f71119352b912369dc5a1fb7" -features = ["arduino-uno"] - -# Configure the build for minimal size - AVRs have very little program memory -[profile.dev] -panic = "abort" -lto = true -opt-level = "s" - -[profile.release] -panic = "abort" -codegen-units = 1 -debug = false -lto = true -opt-level = "s" diff --git a/avr-specs/avr-atmega1280.json b/avr-specs/avr-atmega1280.json deleted file mode 100644 index 8253bb1..0000000 --- a/avr-specs/avr-atmega1280.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega1280", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega1280" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-atmega168.json b/avr-specs/avr-atmega168.json deleted file mode 100644 index c6fbfec..0000000 --- a/avr-specs/avr-atmega168.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega168", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega168" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-atmega2560.json b/avr-specs/avr-atmega2560.json deleted file mode 100644 index 6fcefb2..0000000 --- a/avr-specs/avr-atmega2560.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega2560", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega2560" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-atmega328p.json b/avr-specs/avr-atmega328p.json deleted file mode 100644 index ab3dcdf..0000000 --- a/avr-specs/avr-atmega328p.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega328p", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega328p" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-atmega32u4.json b/avr-specs/avr-atmega32u4.json deleted file mode 100644 index 637dbe5..0000000 --- a/avr-specs/avr-atmega32u4.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega32u4", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega32u4" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-atmega48p.json b/avr-specs/avr-atmega48p.json deleted file mode 100644 index 0a2254e..0000000 --- a/avr-specs/avr-atmega48p.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "atmega48p", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=atmega48p" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-attiny85.json b/avr-specs/avr-attiny85.json deleted file mode 100644 index 5d092a1..0000000 --- a/avr-specs/avr-attiny85.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "attiny85", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=attiny85" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/avr-specs/avr-attiny88.json b/avr-specs/avr-attiny88.json deleted file mode 100644 index 0a330cd..0000000 --- a/avr-specs/avr-attiny88.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "arch": "avr", - "atomic-cas": false, - "cpu": "attiny88", - "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", - "eh-frame-header": false, - "exe-suffix": ".elf", - "executables": true, - "late-link-args": { - "gcc": [ - "-lgcc" - ] - }, - "linker": "avr-gcc", - "llvm-target": "avr-unknown-unknown", - "max-atomic-width": 8, - "no-default-libraries": false, - "pre-link-args": { - "gcc": [ - "-mmcu=attiny88" - ] - }, - "target-c-int-width": "16", - "target-pointer-width": "16" -} diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 71ef1c6..0000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,4 +0,0 @@ -[toolchain] -channel = "nightly-2023-08-08" -components = ["rust-src"] -profile = "minimal" diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 2521990..0000000 --- a/src/main.rs +++ /dev/null @@ -1,119 +0,0 @@ -#![no_std] -#![no_main] - -use core::cell::RefCell; -use avr_device::interrupt; -use panic_halt as _; - -type Console = arduino_hal::hal::usart::Usart0; -static CONSOLE: interrupt::Mutex>> = interrupt::Mutex::new(RefCell::new(None)); - -macro_rules! println { - ($($t:tt)*) => { - interrupt::free( - |cs| - { - if let Some(console) = CONSOLE.borrow(cs).borrow_mut().as_mut() - { - let _ = ufmt::uwriteln!(console, $($t)*); - } - } - ) - - }; -} - -fn put_console(console:Console) - { - interrupt::free( - |cs| - { - *CONSOLE.borrow(cs).borrow_mut() = Some(console); - } - ) - } -#[arduino_hal::entry] -fn main() -> ! { - let dp = arduino_hal::Peripherals::take().unwrap(); - let pins = arduino_hal::pins!(dp); - let serial = arduino_hal::default_serial!(dp, pins, 57600); - put_console(serial); - println!("Hello World"); - - - let mut led02 = pins.d2.into_output(); - let mut led03 = pins.d3.into_output(); - let mut led04 = pins.d4.into_output(); - let mut led05 = pins.d5.into_output(); - let mut led06 = pins.d6.into_output(); - let mut led07 = pins.d7.into_output(); - //let mut led08 = pins.d8.into_output(); - let mut led09 = pins.d9.into_output(); - let mut led10 = pins.d10.into_output(); - let mut led11 = pins.d11.into_output(); - let mut led12 = pins.d12.into_output(); - let mut led13 = pins.d13.into_output(); - - loop { - led02.toggle(); - arduino_hal::delay_ms(50); - led02.toggle(); - led03.toggle(); - arduino_hal::delay_ms(50); - led03.toggle(); - led04.toggle(); - arduino_hal::delay_ms(50); - led04.toggle(); - led05.toggle(); - arduino_hal::delay_ms(50); - led05.toggle(); - led06.toggle(); - arduino_hal::delay_ms(50); - led06.toggle(); - led07.toggle(); - arduino_hal::delay_ms(50); - led07.toggle(); - led09.toggle(); - arduino_hal::delay_ms(50); - led09.toggle(); - led10.toggle(); - arduino_hal::delay_ms(50); - led10.toggle(); - led11.toggle(); - arduino_hal::delay_ms(50); - led11.toggle(); - led12.toggle(); - arduino_hal::delay_ms(50); - led12.toggle(); - led13.toggle(); - arduino_hal::delay_ms(50); - led13.toggle(); - led12.toggle(); - arduino_hal::delay_ms(50); - led12.toggle(); - led11.toggle(); - arduino_hal::delay_ms(50); - led11.toggle(); - led10.toggle(); - arduino_hal::delay_ms(50); - led10.toggle(); - led09.toggle(); - arduino_hal::delay_ms(50); - led09.toggle(); - led07.toggle(); - arduino_hal::delay_ms(50); - led07.toggle(); - led06.toggle(); - arduino_hal::delay_ms(50); - led06.toggle(); - led05.toggle(); - arduino_hal::delay_ms(50); - led05.toggle(); - led04.toggle(); - arduino_hal::delay_ms(50); - led04.toggle(); - led03.toggle(); - arduino_hal::delay_ms(50); - led03.toggle(); - } -} diff --git a/src/timer.rs b/src/timer.rs deleted file mode 100644 index fb291d3..0000000 --- a/src/timer.rs +++ /dev/null @@ -1,56 +0,0 @@ -#![no_std] -#![no_main] - -use core::cell::RefCell; -use avr_device::interrupt; -use panic_halt as _; - -type Console = arduino_hal::hal::usart::Usart0; -static CONSOLE: interrupt::Mutex>> = interrupt::Mutex::new(RefCell::new(None)); - -macro_rules! println { - ($($t:tt)*) => { - interrupt::free( - |cs| - { - if let Some(console) = CONSOLE.borrow(cs).borrow_mut().as_mut() - { - let _ = ufmt::uwriteln!(console, $($t)*); - } - } - ) - - }; -} - -fn put_console(console:Console) - { - interrupt::free( - |cs| - { - *CONSOLE.borrow(cs).borrow_mut() = Some(console); - } - ) - } -#[arduino_hal::entry] -fn main() -> ! { - let dp = arduino_hal::Peripherals::take().unwrap(); - let pins = arduino_hal::pins!(dp); - let serial = arduino_hal::default_serial!(dp, pins, 57600); - put_console(serial); - println!("Hello World"); - - - let mut pin2 = pins.d2.into_output(); - let mut pin13 = pins.d13.into_output(); - loop { - for i in 0..60 - { - println!("{}", i); - pin2.toggle(); - arduino_hal::delay_ms(1000); - pin13.toggle(); - } - println!("Minute"); - } -}