Skip to content

correct buffer sizes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
flippette wants to merge 1 commit into from
Closed

correct buffer sizes #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 18 additions & 28 deletions src/ll.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,23 +1653,20 @@ impl_register! {
}

/// Transmit Data Buffer
///
/// Currently only the first 127 bytes of the buffer are supported, which is
/// enough to support standard Standard IEEE 802.15.4 UWB frames.
#[allow(non_camel_case_types)]
pub struct TX_BUFFER;

impl Register for TX_BUFFER {
const ID: u8 = 0x14;
const LEN: usize = 127;
const LEN: usize = 1024;
const SUB_ID: u8 = 0x00;
}

impl Writable for TX_BUFFER {
type Write = tx_buffer::W;

fn write() -> Self::Write {
tx_buffer::W([0; 127 + 2])
tx_buffer::W([0; Self::LEN])
}

fn buffer(w: &mut Self::Write) -> &mut [u8] {
Expand All @@ -1686,12 +1683,11 @@ impl<SPI> DW3000<SPI> {

/// Transmit Data Buffer
pub mod tx_buffer {

const HEADER_LEN: usize = 2;
const LEN: usize = 127;
const LEN: usize = 1024;

/// Used to write to the register
pub struct W(pub(crate) [u8; LEN + HEADER_LEN]);
pub struct W(pub(crate) [u8; LEN]);

impl W {
/// Provides write access to the buffer contents
Expand All @@ -1702,23 +1698,20 @@ pub mod tx_buffer {
}

/// Receive Data Buffer 0
///
/// Currently only the first 127 bytes of the buffer are supported, which is
/// enough to support standard Standard IEEE 802.15.4 UWB frames.
#[allow(non_camel_case_types)]
pub struct RX_BUFFER_0;

impl Register for RX_BUFFER_0 {
const ID: u8 = 0x12;
const LEN: usize = 127;
const LEN: usize = 1024;
const SUB_ID: u8 = 0x00;
}

impl Readable for RX_BUFFER_0 {
type Read = rx_buffer_0::R;

fn read() -> Self::Read {
rx_buffer_0::R([0; 127 + 2])
rx_buffer_0::R([0; Self::LEN])
}

fn buffer(w: &mut Self::Read) -> &mut [u8] {
Expand All @@ -1738,23 +1731,23 @@ pub mod rx_buffer_0 {
use core::fmt;

const HEADER_LEN: usize = 2;
const LEN: usize = 127;
const LEN: usize = 1024;

/// Used to read from the register
pub struct R(pub(crate) [u8; HEADER_LEN + LEN]);
pub struct R(pub(crate) [u8; LEN]);

impl R {
/// Provides read access to the buffer contents
pub fn data(&self) -> &[u8] {
&self.0[HEADER_LEN..HEADER_LEN + LEN]
&self.0[HEADER_LEN..]
}
}

impl fmt::Debug for R {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "0x")?;
for i in (0..LEN).rev() {
write!(f, "{:02x}", self.0[HEADER_LEN + i])?;
for byte in self.data().iter().rev() {
write!(f, "{byte:02x}")?;
}

Ok(())
Expand All @@ -1763,23 +1756,20 @@ pub mod rx_buffer_0 {
}

/// Receive Data Buffer 1
///
/// Currently only the first 127 bytes of the buffer are supported, which is
/// enough to support Standard IEEE 802.15.4 UWB frames.
#[allow(non_camel_case_types)]
pub struct RX_BUFFER_1;

impl Register for RX_BUFFER_1 {
const ID: u8 = 0x13;
const LEN: usize = 127;
const LEN: usize = 1024;
const SUB_ID: u8 = 0x00;
}

impl Readable for RX_BUFFER_1 {
type Read = rx_buffer_1::R;

fn read() -> Self::Read {
rx_buffer_1::R([0; 127 + 2])
rx_buffer_1::R([0; Self::LEN])
}

fn buffer(w: &mut Self::Read) -> &mut [u8] {
Expand All @@ -1799,23 +1789,23 @@ pub mod rx_buffer_1 {
use core::fmt;

const HEADER_LEN: usize = 2;
const LEN: usize = 127;
const LEN: usize = 1024;

/// Used to read from the register
pub struct R(pub(crate) [u8; HEADER_LEN + LEN]);
pub struct R(pub(crate) [u8; LEN]);

impl R {
/// Provides read access to the buffer contents
pub fn data(&self) -> &[u8] {
&self.0[HEADER_LEN..HEADER_LEN + LEN]
&self.0[HEADER_LEN..]
}
}

impl fmt::Debug for R {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "0x")?;
for i in (0..LEN).rev() {
write!(f, "{:02x}", self.0[HEADER_LEN + i])?;
for byte in self.data().iter().rev() {
write!(f, "{byte:02x}")?;
}

Ok(())
Expand Down
Loading