From 200ace566f3da7db6f4119d6bd3b709a69293297 Mon Sep 17 00:00:00 2001
From: Corey Schuhen <cschuhen@gmail.com>
Date: Sat, 17 Feb 2024 10:51:31 +1000
Subject: [PATCH] Don't use word Standard for frame format because it can be
 confused with ID format. Use Classic instead to mean CAN 2.0B frames.

---
 .../src/can/fd/message_ram/common.rs          |  6 +++---
 embassy-stm32/src/can/fd/message_ram/enums.rs | 20 +++++++++----------
 embassy-stm32/src/can/fd/mod.rs               |  2 +-
 embassy-stm32/src/can/fd/peripheral.rs        |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/embassy-stm32/src/can/fd/message_ram/common.rs b/embassy-stm32/src/can/fd/message_ram/common.rs
index a67d68fa0..108c1a428 100644
--- a/embassy-stm32/src/can/fd/message_ram/common.rs
+++ b/embassy-stm32/src/can/fd/message_ram/common.rs
@@ -88,12 +88,12 @@ pub type FDF_R = generic::R<bool, FrameFormat>;
 impl FDF_R {
     pub fn frame_format(&self) -> FrameFormat {
         match self.bits() {
-            false => FrameFormat::Standard,
+            false => FrameFormat::Classic,
             true => FrameFormat::Fdcan,
         }
     }
-    pub fn is_standard_format(&self) -> bool {
-        *self == FrameFormat::Standard
+    pub fn is_classic_format(&self) -> bool {
+        *self == FrameFormat::Classic
     }
     pub fn is_fdcan_format(&self) -> bool {
         *self == FrameFormat::Fdcan
diff --git a/embassy-stm32/src/can/fd/message_ram/enums.rs b/embassy-stm32/src/can/fd/message_ram/enums.rs
index 78285bf81..0ec5e0f34 100644
--- a/embassy-stm32/src/can/fd/message_ram/enums.rs
+++ b/embassy-stm32/src/can/fd/message_ram/enums.rs
@@ -5,7 +5,7 @@
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum DataLength {
-    Standard(u8),
+    Classic(u8),
     Fdcan(u8),
 }
 impl DataLength {
@@ -14,8 +14,8 @@ impl DataLength {
     /// Uses the byte length and Type of frame as input
     pub fn new(len: u8, ff: FrameFormat) -> DataLength {
         match ff {
-            FrameFormat::Standard => match len {
-                0..=8 => DataLength::Standard(len),
+            FrameFormat::Classic => match len {
+                0..=8 => DataLength::Classic(len),
                 _ => panic!("DataLength > 8"),
             },
             FrameFormat::Fdcan => match len {
@@ -24,9 +24,9 @@ impl DataLength {
             },
         }
     }
-    /// Specialised function to create standard frames
-    pub fn new_standard(len: u8) -> DataLength {
-        Self::new(len, FrameFormat::Standard)
+    /// Specialised function to create classic frames
+    pub fn new_classic(len: u8) -> DataLength {
+        Self::new(len, FrameFormat::Classic)
     }
     /// Specialised function to create FDCAN frames
     pub fn new_fdcan(len: u8) -> DataLength {
@@ -36,13 +36,13 @@ impl DataLength {
     /// returns the length in bytes
     pub fn len(&self) -> u8 {
         match self {
-            DataLength::Standard(l) | DataLength::Fdcan(l) => *l,
+            DataLength::Classic(l) | DataLength::Fdcan(l) => *l,
         }
     }
 
     pub(crate) fn dlc(&self) -> u8 {
         match self {
-            DataLength::Standard(l) => *l,
+            DataLength::Classic(l) => *l,
             // See RM0433 Rev 7 Table 475. DLC coding
             DataLength::Fdcan(l) => match l {
                 0..=8 => *l,
@@ -61,7 +61,7 @@ impl DataLength {
 impl From<DataLength> for FrameFormat {
     fn from(dl: DataLength) -> FrameFormat {
         match dl {
-            DataLength::Standard(_) => FrameFormat::Standard,
+            DataLength::Classic(_) => FrameFormat::Classic,
             DataLength::Fdcan(_) => FrameFormat::Fdcan,
         }
     }
@@ -121,7 +121,7 @@ impl From<ErrorStateIndicator> for bool {
 /// Type of frame, standard (classic) or FdCAN
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum FrameFormat {
-    Standard = 0,
+    Classic = 0,
     Fdcan = 1,
 }
 impl From<FrameFormat> for bool {
diff --git a/embassy-stm32/src/can/fd/mod.rs b/embassy-stm32/src/can/fd/mod.rs
index 0008fd3a8..271ca0b3c 100644
--- a/embassy-stm32/src/can/fd/mod.rs
+++ b/embassy-stm32/src/can/fd/mod.rs
@@ -1,4 +1,4 @@
-//! Module containing that which is speciffic to fdcan hardware variant
+//! Module containing that which is specific to fdcan hardware variant
 
 pub mod config;
 pub mod filter;
diff --git a/embassy-stm32/src/can/fd/peripheral.rs b/embassy-stm32/src/can/fd/peripheral.rs
index 6f390abb4..3422d7148 100644
--- a/embassy-stm32/src/can/fd/peripheral.rs
+++ b/embassy-stm32/src/can/fd/peripheral.rs
@@ -167,7 +167,7 @@ impl Registers {
 
             let len = match header_reg.to_data_length() {
                 DataLength::Fdcan(len) => len,
-                DataLength::Standard(len) => len,
+                DataLength::Classic(len) => len,
             };
             if len as usize > ClassicFrame::MAX_DATA_LEN {
                 return None;
@@ -202,7 +202,7 @@ impl Registers {
 
             let len = match header_reg.to_data_length() {
                 DataLength::Fdcan(len) => len,
-                DataLength::Standard(len) => len,
+                DataLength::Classic(len) => len,
             };
             if len as usize > FdFrame::MAX_DATA_LEN {
                 return None;
@@ -683,7 +683,7 @@ fn put_tx_header(mailbox: &mut TxBufferElement, header: &Header) {
     let frame_format = if header.len() > 8 || header.fdcan() {
         FrameFormat::Fdcan
     } else {
-        FrameFormat::Standard
+        FrameFormat::Classic
     };
     let brs = header.len() > 8 || header.bit_rate_switching();