form

burrbull · burrbull · commit 243258dac4da · 2025-05-11T07:38:41.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 ## [Unreleased]
 
-* Updated to `svd2rust` 0.36.1, `svdtools` 0.4.6, `form` 0.12.1, use tools binaries for CI (#1174)
-* bump `defmt` dependency to 1.0
+* Updated to `svd2rust` 0.36.1, `svdtools` 0.4.6, `form` 0.13.0, use tools binaries for CI (#1174)
+* bump `defmt` dependency to 1.0 (#1209)
 * Use `svd2rust.toml` config, use custom ident suffixes (#948)
 * Replace `makehtml.py` with `svdtools html` (#881)
 * Remove workaround for bug in duckscript's `mv` (#981)
@@ -74,21 +74,22 @@
 * F2, F4, F7: Add definitions for OPTCR, OPTCR1 and OPTCR2 registers of FLASH peripheral (#1157)
 * F2, F4, F7: Fix several fields of FLASH peripheral and reorganise 'patches', 'fields' and 'collect' according to impacted registers (#1161)
 * F1, F2, F4: Derive identical UART registers from USART1, add GPTR.PSC (#1179)
-* CCMR3_Output fix
-* CRC enums and fixes
-* Add DAC enums
-* DCMI enums
-* DFSDM enums and fixes
-* RNG enums
-* SDIO/SDMMC v1
-* TSC enums and arrays
-* USB v2
-* Use arrays for DAC channels
-* Derive TIM registers
+* CCMR3_Output fix (#1184)
+* CRC enums and fixes (#1206)
+* Add DAC enums (#1196)
+* DCMI enums (#1205)
+* DFSDM enums and fixes (#1218)
+* RNG enums (#1220)
+* SDIO/SDMMC v1 (#1204)
+* OCTOSPI, TAMP, LTDC enums (#1226)
+* TSC enums and arrays (#1221)
+* USB v2 (#1202)
+* Use arrays for DAC channels (#1197)
+* Derive TIM registers (#1184)
 * Update README.md (#1152)
-* Add SPI enums for G4, U5, H7+
-* FMC/FSMC enums, arrays & derives
-* CRS enums
+* Add SPI enums for G4, U5, H7+ (#1199)
+* FMC/FSMC enums, arrays & derives (#1200)
+* CRS enums (#1208)
 * HRTIM:
   * H7 & G4 fixes and enums (#1021) (#1022)
   * Remove timer block suffixes from register/field names (#1023)
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ contain the latest patches and updates.
     * On x86-64 Linux, run `make install` to download pre-built binaries at the
       current version used by stm32-rs
     * Otherwise, build using `cargo` (double check versions against `scripts/tool_install.sh`):
-        * `cargo install form --version 0.12.1`
+        * `cargo install form --version 0.13.0`
         * `cargo install svdtools --version 0.4.6`
         * `cargo install svd2rust --version 0.36.1`
 * Install rustfmt: `rustup component add rustfmt`
diff --git a/devices/stm32n645.yaml b/devices/stm32n645.yaml
@@ -198,7 +198,7 @@ VREFBUF:
 WWDG:
   _strip: WWDG_
   _include:
-    - patches/16bit.yaml
+    - patches/16bit_with_mask.yaml
     - fields/wwdg/wwdg_v2.yaml
 
 XSPI1:
diff --git a/devices/stm32n647.yaml b/devices/stm32n647.yaml
@@ -198,7 +198,7 @@ VREFBUF:
 WWDG:
   _strip: WWDG_
   _include:
-    - patches/16bit.yaml
+    - patches/16bit_with_mask.yaml
     - fields/wwdg/wwdg_v2.yaml
 
 XSPI1:
diff --git a/devices/stm32n655.yaml b/devices/stm32n655.yaml
@@ -210,7 +210,7 @@ VREFBUF:
 WWDG:
   _strip: WWDG_
   _include:
-    - patches/16bit.yaml
+    - patches/16bit_with_mask.yaml
     - fields/wwdg/wwdg_v2.yaml
 
 XSPI1:
diff --git a/devices/stm32n657.yaml b/devices/stm32n657.yaml
@@ -210,7 +210,7 @@ VREFBUF:
 WWDG:
   _strip: WWDG_
   _include:
-    - patches/16bit.yaml
+    - patches/16bit_with_mask.yaml
     - fields/wwdg/wwdg_v2.yaml
 
 XSPI1:
diff --git a/scripts/tool_install.sh b/scripts/tool_install.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 CARGO_HOME="${CARGO_HOME:-$HOME/.cargo/}"
 
-FORM_VERSION="${FORM_VERSION:-v0.12.1}"
+FORM_VERSION="${FORM_VERSION:-v0.13.0}"
 SVDTOOLS_VERSION="${SVDTOOLS_VERSION:-v0.4.6}"
 SVD2RUST_VERSION="${SVD2RUST_VERSION:-v0.36.1}"
 SVDCONV_VERSION="${SVDCONV_VERSION:-3.3.46}"
