From 70e98f49088fd6f2a6e5bc67655a656e21766376 Mon Sep 17 00:00:00 2001 From: Nikita Koss Date: Tue, 26 Sep 2023 18:55:20 +0300 Subject: [PATCH 1/2] add derivedFrom to register maker --- src/patch/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/patch/mod.rs b/src/patch/mod.rs index ce90e32..7801236 100644 --- a/src/patch/mod.rs +++ b/src/patch/mod.rs @@ -396,6 +396,7 @@ fn make_register(radd: &Hash) -> Result { let mut rnew = RegisterInfo::builder() .display_name(radd.get_string("displayName")?) .description(radd.get_string("description")?) + .derived_from(radd.get_string("derivedFrom")?) .alternate_group(radd.get_string("alternateGroup")?) .alternate_register(radd.get_string("alternateRegister")?) .properties(get_register_properties(radd)?) From af85fb60fbed6dac272e4a7ab96bab526097b3c0 Mon Sep 17 00:00:00 2001 From: Nikita Koss Date: Sun, 1 Oct 2023 11:49:58 +0300 Subject: [PATCH 2/2] add derivedFrom to peripheral, cluster and field makers --- src/patch/mod.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/patch/mod.rs b/src/patch/mod.rs index 7801236..7d68ad4 100644 --- a/src/patch/mod.rs +++ b/src/patch/mod.rs @@ -377,6 +377,7 @@ fn modify_dim_element( fn make_field(fadd: &Hash) -> Result { let mut fnew = FieldInfo::builder() .description(fadd.get_string("description")?) + .derived_from(fadd.get_string("derivedFrom")?) .access(fadd.get_str("access")?.and_then(Access::parse_str)); if let Some(name) = fadd.get_str("name")? { @@ -428,6 +429,7 @@ fn make_register(radd: &Hash) -> Result { fn make_cluster(cadd: &Hash) -> Result { let mut cnew = ClusterInfo::builder() .description(cadd.get_string("description")?) + .derived_from(cadd.get_string("derivedFrom")?) .default_register_properties(get_register_properties(cadd)?) .children(match cadd.get_hash("registers")? { Some(h) => { @@ -470,6 +472,7 @@ fn make_peripheral(padd: &Hash, modify: bool) -> Result { .display_name(padd.get_string("displayName")?) .version(padd.get_string("version")?) .description(padd.get_string("description")?) + .derived_from(padd.get_string("derivedFrom")?) .group_name(padd.get_string("groupName")?) .interrupt(if !modify { match padd.get_hash("interrupts")? {