Compare commits

..

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

18 changed files with 712 additions and 58 deletions

View File

@ -6,12 +6,10 @@ edition = "2021"
[dependencies.arduino-hal] [dependencies.arduino-hal]
git = "https://github.com/rahix/avr-hal" git = "https://github.com/rahix/avr-hal"
rev = "3e362624547462928a219c40f9ea8e3a64f21e5f" rev = "3e362624547462928a219c40f9ea8e3a64f21e5f"
features = ["sparkfun-promicro"]
[dependencies.static-pins] [dependencies.static_pins]
git = "https://gitea.doryan04.ru/TheEmbeddedRust/static-pins" git = "https://gitea.doryan04.ru/TheEmbeddedRust/static_pins"
[features]
sparkfun-promicro = ["arduino-hal/sparkfun-promicro", "static-pins/sparkfun-promicro"]
[dependencies.avr-device] [dependencies.avr-device]
version = "0.5.4" version = "0.5.4"

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega1280",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega1280",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega1280",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega1284p",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega1284p",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega1284p",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega128a",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega128a",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega128a",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega164pa",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega164pa",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega164pa",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega168",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega168",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega168",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega2560",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega2560",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega2560",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega328",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega328",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega328",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega328p",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega328p",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega328p",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega32a",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega32a",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega32a",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega32u4",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega32u4",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega32u4",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega48p",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega48p",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega48p",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "atmega8",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=atmega8",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=atmega8",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "attiny167",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=attiny167",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=attiny167",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "attiny2313",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=attiny2313",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=attiny2313",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "attiny85",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=attiny85",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=attiny85",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -0,0 +1,41 @@
{
"arch": "avr",
"atomic-cas": false,
"cpu": "attiny88",
"crt-objects-fallback": "false",
"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",
"late-link-args": {
"gnu-cc": [
"-lgcc"
],
"gnu-lld-cc": [
"-lgcc"
]
},
"linker": "avr-gcc",
"linker-flavor": "gnu-cc",
"llvm-target": "avr-unknown-unknown",
"max-atomic-width": 8,
"metadata": {
"description": null,
"host_tools": null,
"std": null,
"tier": null
},
"no-default-libraries": false,
"pre-link-args": {
"gnu-cc": [
"-mmcu=attiny88",
"-Wl,--as-needed,--print-memory-usage"
],
"gnu-lld-cc": [
"-mmcu=attiny88",
"-Wl,--as-needed,--print-memory-usage"
]
},
"relocation-model": "static",
"target-c-int-width": "16",
"target-pointer-width": "16"
}

View File

@ -4,6 +4,7 @@ use core::marker::PhantomData;
use arduino_hal::{ use arduino_hal::{
delay_us, delay_us,
pac::EXINT,
port::{ port::{
mode::{Input, PullUp}, mode::{Input, PullUp},
Pin, PinOps, Pin, PinOps,
@ -41,13 +42,57 @@ where
P: PinOps + StaticPinOps, P: PinOps + StaticPinOps,
{ {
#[inline] #[inline]
pub fn new(_pin: Pin<Input<PullUp>, P>) -> Self { pub fn new(_pin: Pin<Input<PullUp>, P>, exint: &EXINT) -> Self {
exint.eimsk.write(|w| w.bits(1 << 1));
exint.eicra.write(|w| unsafe { w.bits(!(1 << 3 | 1 << 2)) });
Self { Self {
_pin: PhantomData {}, _pin: PhantomData {},
} }
} }
}
pub fn poll(&self) -> PollResult { pub trait SoftSerial<P>
where
P: PinOps + StaticPinOps,
{
fn poll(&self) -> PollResult;
fn response(&self);
fn sync_reciever(&self);
fn sync_transmitter(&self);
fn write_byte(&self, data: u8);
fn read_byte(&self) -> ReadByteResult;
#[inline]
fn finish_write(&self) {
P::into_pull_up_input();
while P::is_low() {}
}
fn write_bytes(&self, transmit_data: &[u8]) {
for byte in transmit_data {
self.write_byte(*byte);
self.sync_transmitter();
}
}
fn read_bytes(&self, recieve_buffer: &mut [u8]) {
for byte in recieve_buffer {
if let Ok(data) = self.read_byte() {
*byte = data;
}
self.sync_reciever();
}
}
}
impl<P> SoftSerial<P> for HalfDuplexSerial<P>
where
P: PinOps + StaticPinOps,
{
fn poll(&self) -> PollResult {
P::into_output(); P::into_output();
delay_cycles(1); delay_cycles(1);
P::into_pull_up_input(); P::into_pull_up_input();
@ -69,7 +114,7 @@ where
PollResult::Ok(()) PollResult::Ok(())
} }
pub fn response(&self) { fn response(&self) {
P::into_output_high(); P::into_output_high();
delay_us(FIRST_HALF_SERIAL_DELAY); delay_us(FIRST_HALF_SERIAL_DELAY);
@ -82,7 +127,7 @@ where
} }
#[inline(never)] #[inline(never)]
pub fn sync_transmitter(&self) { fn sync_transmitter(&self) {
P::into_output(); P::into_output();
delay_us(SERIAL_DELAY); delay_us(SERIAL_DELAY);
@ -91,22 +136,12 @@ where
} }
#[inline(never)] #[inline(never)]
pub fn sync_reciever(&self) { fn sync_reciever(&self) {
while P::is_high() {} while P::is_high() {}
while P::is_low() {} while P::is_low() {}
} }
#[inline]
pub fn reset(&self) {
P::into_pull_up_input();
}
}
pub trait SoftSerialWriter<P, T>
where
P: PinOps + StaticPinOps,
{
#[inline(never)] #[inline(never)]
fn write_byte(&self, data: u8) { fn write_byte(&self, data: u8) {
let (mut data, mut parity_bit) = (data, 0); let (mut data, mut parity_bit) = (data, 0);
@ -136,25 +171,6 @@ where
delay_us(SERIAL_DELAY); delay_us(SERIAL_DELAY);
} }
fn write_bytes(&self, transmit_data: T);
}
impl<P> SoftSerialWriter<P, &[u8]> for HalfDuplexSerial<P>
where
P: PinOps + StaticPinOps,
{
fn write_bytes(&self, transmit_data: &[u8]) {
for byte in transmit_data {
self.write_byte(*byte);
self.sync_transmitter();
}
}
}
pub trait SoftSerialReader<P, T>
where
P: PinOps + StaticPinOps,
{
#[inline(never)] #[inline(never)]
fn read_byte(&self) -> ReadByteResult { fn read_byte(&self) -> ReadByteResult {
let (mut data, mut reciever_parity_bit) = (0, 0); let (mut data, mut reciever_parity_bit) = (0, 0);
@ -163,8 +179,6 @@ where
for _ in 0..8 { for _ in 0..8 {
delay_us(FIRST_HALF_SERIAL_DELAY); delay_us(FIRST_HALF_SERIAL_DELAY);
data <<= 1;
if P::is_low() { if P::is_low() {
data |= 1; data |= 1;
reciever_parity_bit ^= 1; reciever_parity_bit ^= 1;
@ -175,6 +189,8 @@ where
delay_cycles(READING_ADJUST); delay_cycles(READING_ADJUST);
delay_us(SECOND_HALF_SERIAL_DELAY); delay_us(SECOND_HALF_SERIAL_DELAY);
data <<= 1;
} }
delay_us(FIRST_HALF_SERIAL_DELAY); delay_us(FIRST_HALF_SERIAL_DELAY);
@ -184,26 +200,10 @@ where
delay_cycles(READING_ADJUST); delay_cycles(READING_ADJUST);
delay_us(SECOND_HALF_SERIAL_DELAY); delay_us(SECOND_HALF_SERIAL_DELAY);
if reciever_parity_bit == transmitter_parity_bit { if reciever_parity_bit != transmitter_parity_bit {
return Err((data, reciever_parity_bit)); return Err((data, reciever_parity_bit));
} }
Ok(data) Ok(data)
} }
fn read_bytes(&self, recieve_data: T);
}
impl<P> SoftSerialReader<P, &mut [u8]> for HalfDuplexSerial<P>
where
P: PinOps + StaticPinOps,
{
fn read_bytes(&self, recieve_data: &mut [u8]) {
for byte in recieve_data {
if let Ok(data) = self.read_byte() {
*byte = data;
}
self.sync_reciever();
}
}
} }