CH32L103

ch32-metapac-gen/Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 regex = "1.7.1"
-chiptool = { git = "https://github.com/ch32-rs/chiptool", rev = "1c198ae678ebd426751513f0deab6fbd6f8b8211" }
+chiptool = { git = "https://github.com/ch32-rs/chiptool", rev = "305bd6ee3e57009ae93be2c81d6e94b9896a03b1" }
 serde = { version = "1.0.157", features = ["derive"] }
 serde_json = "1.0.94"
 proc-macro2 = "1.0.52"

ch32-metapac-gen/src/lib.rs

@@ -62,7 +62,7 @@ impl Gen {
             .peripherals
             .iter()
             .find(|p| p.name == "GPIOA")
-            .unwrap()
+            .expect("GPIOA must exist")
             .address as u32;
         let gpio_stride = 0x400;
 
@@ -360,7 +360,10 @@ impl Gen {
                 .join("registers")
                 .join(&format!("{}_{}.json", module, version));
 
-            let mut ir: ir::IR = serde_json::from_reader(File::open(regs_path).unwrap()).unwrap();
+            let mut ir: ir::IR = serde_json::from_reader(
+                File::open(&regs_path).expect(&format!("open {}", regs_path.display())),
+            )
+            .unwrap();
 
             transform::expand_extends::ExpandExtends {}
                 .run(&mut ir)

d

@@ -48,7 +48,7 @@ case "$CMD" in
     gen)
         rm -rf build/data
         echo "TODO: More chips to be added"
-        cargo run -p ch32-data-gen && cargo run -p ch32-metapac-gen -- "CH32X03*" "CH32V*" CH641 CH643
+        cargo run -p ch32-data-gen && cargo run -p ch32-metapac-gen -- "CH32X03*" "CH32V*" "CH32L*" CH641 CH643
     ;;
     ci)
         echo TODO $CMD

data/chips/CH32L103C8T6.yaml

@@ -6,6 +6,7 @@ device_id: 271648512
 keywords:
   - USBPD
   - Low Power
+  - CAN FD
 packages:
   - name: CH32L103C8T6
     package: LQFP48
@@ -25,13 +26,15 @@ memory:
 docs:
   - type: homepage
     title: Homepage
-    name: ""
+    name: "CH32L103"
     url: https://www.wch.cn/products/CH32L103.html
 cores:
   - name: qingke-v4c
     peripherals: []
     include_peripherals:
       - "../family/CH32L1.yaml"
+      - "../peripherals/L1x_SPI2.yaml"
+      - "../peripherals/L1x_I2C2.yaml"
     include_dma_channels:
       DMA1: "../dma/CH32V_V4C_L1.yaml"
     include_interrupts: "../interrupts/CH32L1.yaml"

data/chips/CH32L103F7P6.yaml

@@ -6,6 +6,7 @@ device_id: 272041728
 keywords:
   - USBPD
   - Low Power
+  - CAN FD
 packages:
   - name: CH32L103F7P6
     package: TSSOP20
@@ -25,13 +26,15 @@ memory:
 docs:
   - type: homepage
     title: Homepage
-    name: ""
+    name: "CH32L103"
     url: https://www.wch.cn/products/CH32L103.html
 cores:
   - name: qingke-v4c
     peripherals: []
     include_peripherals:
       - "../family/CH32L1.yaml"
+      - "../peripherals/L1x_SPI2.yaml"
+      - "../peripherals/L1x_I2C2.yaml"
     include_dma_channels:
       DMA1: "../dma/CH32V_V4C_L1.yaml"
     include_interrupts: "../interrupts/CH32L1.yaml"

data/chips/CH32L103F8P6.yaml

@@ -6,6 +6,7 @@ device_id: 272238336
 keywords:
   - USBPD
   - Low Power
+  - CAN FD
 packages:
   - name: CH32L103F8P6
     package: TSSOP20
@@ -25,7 +26,7 @@ memory:
 docs:
   - type: homepage
     title: Homepage
-    name: ""
+    name: "CH32L103"
     url: https://www.wch.cn/products/CH32L103.html
 cores:
   - name: qingke-v4c

data/chips/CH32L103F8U6.yaml

@@ -6,6 +6,7 @@ device_id: 272434944
 keywords:
   - USBPD
   - Low Power
+  - CAN FD
 packages:
   - name: CH32L103F8U6
     package: QFN20
@@ -25,13 +26,15 @@ memory:
 docs:
   - type: homepage
     title: Homepage
-    name: ""
+    name: "CH32L103"
     url: https://www.wch.cn/products/CH32L103.html
 cores:
   - name: qingke-v4c
     peripherals: []
     include_peripherals:
       - "../family/CH32L1.yaml"
+      - "../peripherals/L1x_SPI2.yaml"
+      - "../peripherals/L1x_I2C2.yaml"
     include_dma_channels:
       DMA1: "../dma/CH32V_V4C_L1.yaml"
     include_interrupts: "../interrupts/CH32L1.yaml"

data/chips/CH32L103G8R6.yaml

@@ -32,6 +32,8 @@ cores:
     peripherals: []
     include_peripherals:
       - "../family/CH32L1.yaml"
+      - "../peripherals/L1x_SPI2.yaml"
+      - "../peripherals/L1x_I2C2.yaml"
     include_dma_channels:
       DMA1: "../dma/CH32V_V4C_L1.yaml"
     include_interrupts: "../interrupts/CH32L1.yaml"