Merge pull request embassy-rs#785 from turnaroundfactor/n6-can

N6 CAN Support

Author: xoviat

data/registers/can_fdcan_h7.yaml data/registers/can_fdcan_v2.yamldata/registers/can_fdcan_h7.yaml renamed to data/registers/can_fdcan_v2.yaml

@@ -964,6 +964,10 @@ fieldset/RXFS:
     description: Rx FIFO X Message Lost
     bit_offset: 25
     bit_size: 1
+  - name: DMS
+    description: Debug message status
+    bit_offset: 30
+    bit_size: 2
 fieldset/SIDFC:
   description: FDCAN Standard ID Filter Configuration Register
   fields:

data/registers/fdcanram_h7.yaml data/registers/fdcanram_v2.yamldata/registers/fdcanram_h7.yaml renamed to data/registers/fdcanram_v2.yaml

@@ -586,10 +586,11 @@ fn create_peripheral_map(chip_name: &str, group: &ChipGroup, defines: &header::D
 
     // The STM32H7S / STM32H7R use the FDCAN v1 peripheral instead of the one used in the rest of the H7 family.
     let h7_non_rs_re = Regex::new(r"STM32H7[0-9AB].*").unwrap();
+    let n6 = Regex::new(r"STM32N6.*").unwrap();
 
     if !fdcans.is_empty() {
-        if h7_non_rs_re.is_match(chip_name) {
-            // H7 has one message RAM shared between FDCANs
+        if h7_non_rs_re.is_match(chip_name) || n6.is_match(chip_name) {
+            // H7 and N6 have one message RAM shared between FDCANs
             peri_kinds
                 .entry("FDCANRAM".to_string())
                 .or_insert("unknown".to_string());

stm32-data-gen/src/generator.rs

@@ -626,10 +626,12 @@ pub static PERIMAP: RegexMap<(&str, &str, &str)> = RegexMap::new(&[
     (".*:DMA.*", ("bdma", "v1", "DMA")),
     (".*:CAN:bxcan1_v1_1.*", ("can", "bxcan", "CAN")),
     ("STM32H7[RS].*FDCAN:fdcan1_v1_[01].*", ("can", "fdcan_v1", "FDCAN")),
-    ("STM32H7.*:FDCAN:fdcan1_v1_[01].*", ("can", "fdcan_h7", "FDCAN")),
+    ("STM32H7.*:FDCAN:fdcan1_v1_[01].*", ("can", "fdcan_v2", "FDCAN")),
     (".*:FDCAN:fdcan1_v1_[01].*", ("can", "fdcan_v1", "FDCAN")),
+    (".*:FDCAN:.*fdcan1_v1_2", ("can", "fdcan_v2", "FDCAN")),
     ("STM32H7[RS].*:FDCANRAM.*", ("fdcanram", "v1", "FDCANRAM")),
-    ("STM32H7.*:FDCANRAM.*", ("fdcanram", "h7", "FDCANRAM")),
+    ("STM32H7.*:FDCANRAM.*", ("fdcanram", "v2", "FDCANRAM")),
+    ("STM32N6.*:FDCANRAM.*", ("fdcanram", "v2", "FDCANRAM")),
     (".*:FDCANRAM.*", ("fdcanram", "v1", "FDCANRAM")),
     ("STM32F[124].*:CRC:.*", ("crc", "v1", "CRC")),
     ("STM32L1.*:CRC:.*", ("crc", "v1", "CRC")),