diff --git a/d b/d
index 8368ff7..74ac3dc 100755
--- a/d
+++ b/d
@@ -42,6 +42,10 @@ case "$CMD" in
             fi
         done
     ;;
+    gen)
+        rm -rf build/data
+        cargo run --release --bin stm32-data-gen
+    ;;
     ci)
         [ -d sources ] || ./d download-all
         cd ./sources/
@@ -54,6 +58,8 @@ case "$CMD" in
         cd build/stm32-metapac
         find . -name '*.rs' -not -path '*target*' | xargs rustfmt --skip-children --unstable-features --edition 2021
         cargo check --features stm32h755zi-cm7,pac,metadata
+        cargo check --features stm32f777zi,pac
+        cargo check --features stm32u585zi,metadata
     ;;
     *)
         echo "unknown command"
diff --git a/stm32-data-gen/Cargo.toml b/stm32-data-gen/Cargo.toml
index ece22c9..ba8f21e 100644
--- a/stm32-data-gen/Cargo.toml
+++ b/stm32-data-gen/Cargo.toml
@@ -17,7 +17,7 @@ quick-xml = { version = "0.26.0", features = ["serialize"] }
 regex = "1.7.1"
 serde = { version = "1.0.157", features = ["derive"] }
 serde_yaml = "0.9.19"
-chiptool = { git = "https://github.com/embassy-rs/chiptool", rev="689341ad3437280d3553cef319d1e77470f2e704" }
+chiptool = { git = "https://github.com/embassy-rs/chiptool", rev="247ccbe44669ac716393247e56693a396e641e4a" }
 serde_json = "1.0.94"
 rayon = { version = "1.7.0", optional = true }
 stm32-data-serde = { version = "0.1.0", path = "../stm32-data-serde" }
diff --git a/stm32-metapac-gen/Cargo.toml b/stm32-metapac-gen/Cargo.toml
index 25a6609..f9a12fb 100644
--- a/stm32-metapac-gen/Cargo.toml
+++ b/stm32-metapac-gen/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 regex = "1.7.1"
-chiptool = { git = "https://github.com/embassy-rs/chiptool", rev="689341ad3437280d3553cef319d1e77470f2e704" }
+chiptool = { git = "https://github.com/embassy-rs/chiptool", rev="247ccbe44669ac716393247e56693a396e641e4a" }
 serde = { version = "1.0.157", features = [ "derive" ] }
 serde_json = "1.0.94"
 proc-macro2 = "1.0.52"