Merge #590

590: 1-element array r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.22.2] - 2022-04-13
+
+- Fix #579 2: support 1-element arrays
+
 ## [v0.22.1] - 2022-04-05
 
 - Fix #579
@@ -677,7 +681,8 @@ peripheral.register.write(|w| w.field().set());
 
 - Initial version of the `svd2rust` tool
 
-[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.22.1...HEAD
+[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.22.2...HEAD
+[v0.22.2]: https://github.com/rust-embedded/svd2rust/compare/v0.22.1...v0.22.2
 [v0.22.1]: https://github.com/rust-embedded/svd2rust/compare/v0.22.0...v0.22.1
 [v0.22.0]: https://github.com/rust-embedded/svd2rust/compare/v0.21.0...v0.22.0
 [v0.21.0]: https://github.com/rust-embedded/svd2rust/compare/v0.20.0...v0.21.0

Cargo.toml

@@ -23,7 +23,7 @@ keywords = [
 license = "MIT OR Apache-2.0"
 name = "svd2rust"
 repository = "https://github.com/rust-embedded/svd2rust/"
-version = "0.22.1"
+version = "0.22.2"
 readme = "README.md"
 
 [package.metadata.deb]

src/generate/peripheral.rs

@@ -713,7 +713,8 @@ fn expand_cluster(
             accessors: None,
         }),
         Cluster::Array(info, array_info) => {
-            let sequential_addresses = cluster_size == array_info.dim_increment * BITS_PER_BYTE;
+            let sequential_addresses =
+                (array_info.dim == 1) || (cluster_size == array_info.dim_increment * BITS_PER_BYTE);
 
             // if dimIndex exists, test if it is a sequence of numbers from 0 to dim
             let sequential_indexes = array_info.dim_index.as_ref().map_or(true, |dim_index| {
@@ -823,7 +824,8 @@ fn expand_register(
             accessors: None,
         }),
         Register::Array(info, array_info) => {
-            let sequential_addresses = register_size == array_info.dim_increment * BITS_PER_BYTE;
+            let sequential_addresses = (array_info.dim == 1)
+                || (register_size == array_info.dim_increment * BITS_PER_BYTE);
 
             // if dimIndex exists, test if it is a sequence of numbers from 0 to dim
             let sequential_indexes = array_info.dim_index.as_ref().map_or(true, |dim_index| {