guangzong/stm32-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new enum debug macro

Browse Source
This commit is contained in:
xoviat 2023-11-05 14:47:25 -06:00
parent 509f315261
commit 916fa6f760
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stm32-metapac-gen/src/data.rs
View File

@ -1,4 +1,5 @@
use serde::Deserialize; use serde::Deserialize;
use stm32_data_macros::EnumDebug;
pub mod ir { pub mod ir {
use super::*; use super::*;
@ -176,7 +177,7 @@ pub mod ir {
pub block: String, pub block: String,
} }
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] #[derive(EnumDebug, Eq, PartialEq, Clone, Deserialize)]
pub enum Access { pub enum Access {
ReadWrite, ReadWrite,
Read, Read,
@ -263,7 +264,7 @@ pub struct FlashSettings {
pub erase_value: u8, pub erase_value: u8,
} }
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] #[derive(EnumDebug, Eq, PartialEq, Clone, Deserialize)]
pub enum MemoryRegionKind { pub enum MemoryRegionKind {
#[serde(rename = "flash")] #[serde(rename = "flash")]
Flash, Flash,

5
stm32-metapac-gen/src/lib.rs
View File

@ -394,15 +394,10 @@ fn stringify<T: Debug>(metadata: T) -> String {
metadata metadata
.replace(": [", ": &[") .replace(": [", ": &[")
.replace("kind: Ram", "kind: MemoryRegionKind::Ram")
.replace("kind: Flash", "kind: MemoryRegionKind::Flash")
.replace("Register(", "BlockItemInner::Register(") .replace("Register(", "BlockItemInner::Register(")
.replace("Block(", "BlockItemInner::Block(") .replace("Block(", "BlockItemInner::Block(")
.replace("Regular(", "Array::Regular(") .replace("Regular(", "Array::Regular(")
.replace("Cursed(", "Array::Cursed(") .replace("Cursed(", "Array::Cursed(")
.replace("Read,", "Access::Read,")
.replace("Write,", "Access::Write,")
.replace("ReadAccess::Write,", "Access::ReadWrite,")
} }
fn gen_opts() -> generate::Options { fn gen_opts() -> generate::Options {