Merge pull request #138 from stm32-rs/clusters

cluster add/modify (rust)

Author: burrbull

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
           pip install .
       - name: Check
         run: |
-          black --check svdtools
+          black --check --diff svdtools
           isort --check-only svdtools
       - name: Test
         run: pytest svdtools

CHANGELOG-rust.md

@@ -5,6 +5,8 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* cluster add/modify
+
 ## [v0.2.8] 2022-01-28
 
 * patch: added possibility to modify dim elements (arrays)

src/patch/device.rs

@@ -6,7 +6,7 @@ use std::collections::HashSet;
 use std::{fs::File, io::Read, path::Path};
 
 use super::iterators::{MatchIter, Matched};
-use super::peripheral::PeripheralExt;
+use super::peripheral::{PeripheralExt, RegisterBlockExt};
 use super::yaml_ext::{AsType, GetVal};
 use super::{abspath, matchname, PatchResult, VAL_LVL};
 use super::{make_address_block, make_address_blocks, make_cpu, make_interrupt, make_peripheral};
@@ -302,7 +302,7 @@ impl DeviceExt for Device {
                 make_peripheral(hash, true)?.derived_from(Some(pderive.into())),
             )
         } else {
-            return Err(anyhow!("derive: incorrect syntax for {}", pname));
+            return Err(anyhow!("derive: incorrect syntax for {pname}"));
         };
 
         if !pderive.contains('.') {

src/patch/mod.rs

@@ -408,7 +408,22 @@ fn make_register(radd: &Hash) -> Result<RegisterInfoBuilder> {
 fn make_cluster(cadd: &Hash) -> Result<ClusterInfoBuilder> {
     let mut cnew = ClusterInfo::builder()
         .description(cadd.get_string("description")?)
-        .default_register_properties(get_register_properties(cadd)?);
+        .default_register_properties(get_register_properties(cadd)?)
+        .children(match cadd.get_hash("registers")? {
+            Some(h) => {
+                let mut ch = Vec::new();
+                for (rname, val) in h {
+                    ch.push(RegisterCluster::Register(
+                        make_register(val.hash()?)?
+                            .name(rname.str()?.into())
+                            .build(VAL_LVL)?
+                            .single(),
+                    ));
+                }
+                ch
+            }
+            _ => Vec::new(),
+        });
 
     if let Some(name) = cadd.get_str("name")? {
         cnew = cnew.name(name.into());