diff options
| author | Torin Cooper-Bennun <[email protected]> | 2024-03-04 12:22:18 +0000 |
|---|---|---|
| committer | Torin Cooper-Bennun <[email protected]> | 2024-03-04 12:22:18 +0000 |
| commit | 72c6cdc5d5bd851855975061b1c6713cf482e6fb (patch) | |
| tree | a46f26cf6bd28a47f1b02d89c518f2154413e1b5 | |
| parent | 49807c0e7f166e44791d621c503ad771325c37b1 (diff) | |
stm32: can: fd: rename TxBufferMode::Queue -> ::Priority for clarity
| -rw-r--r-- | embassy-stm32/src/can/fd/config.rs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/embassy-stm32/src/can/fd/config.rs b/embassy-stm32/src/can/fd/config.rs index adaffe9cc..68161ca50 100644 --- a/embassy-stm32/src/can/fd/config.rs +++ b/embassy-stm32/src/can/fd/config.rs | |||
| @@ -292,14 +292,14 @@ impl Default for GlobalFilter { | |||
| 292 | pub enum TxBufferMode { | 292 | pub enum TxBufferMode { |
| 293 | /// TX FIFO operation - In this mode CAN frames are trasmitted strictly in write order. | 293 | /// TX FIFO operation - In this mode CAN frames are trasmitted strictly in write order. |
| 294 | Fifo, | 294 | Fifo, |
| 295 | /// TX queue operation - In this mode CAN frames are transmitted according to CAN priority. | 295 | /// TX priority queue operation - In this mode CAN frames are transmitted according to CAN priority. |
| 296 | Queue, | 296 | Priority, |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | impl From<TxBufferMode> for crate::pac::can::vals::Tfqm { | 299 | impl From<TxBufferMode> for crate::pac::can::vals::Tfqm { |
| 300 | fn from(value: TxBufferMode) -> Self { | 300 | fn from(value: TxBufferMode) -> Self { |
| 301 | match value { | 301 | match value { |
| 302 | TxBufferMode::Queue => Self::QUEUE, | 302 | TxBufferMode::Priority => Self::QUEUE, |
| 303 | TxBufferMode::Fifo => Self::FIFO, | 303 | TxBufferMode::Fifo => Self::FIFO, |
| 304 | } | 304 | } |
| 305 | } | 305 | } |
| @@ -308,7 +308,7 @@ impl From<TxBufferMode> for crate::pac::can::vals::Tfqm { | |||
| 308 | impl From<crate::pac::can::vals::Tfqm> for TxBufferMode { | 308 | impl From<crate::pac::can::vals::Tfqm> for TxBufferMode { |
| 309 | fn from(value: crate::pac::can::vals::Tfqm) -> Self { | 309 | fn from(value: crate::pac::can::vals::Tfqm) -> Self { |
| 310 | match value { | 310 | match value { |
| 311 | crate::pac::can::vals::Tfqm::QUEUE => Self::Queue, | 311 | crate::pac::can::vals::Tfqm::QUEUE => Self::Priority, |
| 312 | crate::pac::can::vals::Tfqm::FIFO => Self::Fifo, | 312 | crate::pac::can::vals::Tfqm::FIFO => Self::Fifo, |
| 313 | } | 313 | } |
| 314 | } | 314 | } |
| @@ -354,7 +354,7 @@ pub struct FdCanConfig { | |||
| 354 | pub timestamp_source: TimestampSource, | 354 | pub timestamp_source: TimestampSource, |
| 355 | /// Configures the Global Filter | 355 | /// Configures the Global Filter |
| 356 | pub global_filter: GlobalFilter, | 356 | pub global_filter: GlobalFilter, |
| 357 | /// TX buffer mode (FIFO or queue) | 357 | /// TX buffer mode (FIFO or priority queue) |
| 358 | pub tx_buffer_mode: TxBufferMode, | 358 | pub tx_buffer_mode: TxBufferMode, |
| 359 | } | 359 | } |
| 360 | 360 | ||
| @@ -445,6 +445,13 @@ impl FdCanConfig { | |||
| 445 | self.global_filter = filter; | 445 | self.global_filter = filter; |
| 446 | self | 446 | self |
| 447 | } | 447 | } |
| 448 | |||
| 449 | /// Sets the TX buffer mode (FIFO or priority queue) | ||
| 450 | #[inline] | ||
| 451 | pub const fn set_tx_buffer_mode(mut self, txbm: TxBufferMode) -> Self { | ||
| 452 | self.tx_buffer_mode = txbm; | ||
| 453 | self | ||
| 454 | } | ||
| 448 | } | 455 | } |
| 449 | 456 | ||
| 450 | impl Default for FdCanConfig { | 457 | impl Default for FdCanConfig { |
| @@ -462,7 +469,7 @@ impl Default for FdCanConfig { | |||
| 462 | clock_divider: ClockDivider::_1, | 469 | clock_divider: ClockDivider::_1, |
| 463 | timestamp_source: TimestampSource::None, | 470 | timestamp_source: TimestampSource::None, |
| 464 | global_filter: GlobalFilter::default(), | 471 | global_filter: GlobalFilter::default(), |
| 465 | tx_buffer_mode: TxBufferMode::Queue, | 472 | tx_buffer_mode: TxBufferMode::Priority, |
| 466 | } | 473 | } |
| 467 | } | 474 | } |
| 468 | } | 475 | } |
