diff --git a/data/chips/STM32H723VE.json b/data/chips/STM32H723VE.json
index bf9cd3f..dda4410 100644
--- a/data/chips/STM32H723VE.json
+++ b/data/chips/STM32H723VE.json
@@ -6974,7 +6974,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7632,7 +7632,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7764,7 +7764,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7846,7 +7846,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7928,7 +7928,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8060,7 +8060,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8172,7 +8172,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8374,7 +8374,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H723VG.json b/data/chips/STM32H723VG.json
index 1523242..2edd694 100644
--- a/data/chips/STM32H723VG.json
+++ b/data/chips/STM32H723VG.json
@@ -6974,7 +6974,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7632,7 +7632,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7764,7 +7764,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7846,7 +7846,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7928,7 +7928,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8060,7 +8060,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8172,7 +8172,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8374,7 +8374,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H723ZE.json b/data/chips/STM32H723ZE.json
index 81dd494..0b912dd 100644
--- a/data/chips/STM32H723ZE.json
+++ b/data/chips/STM32H723ZE.json
@@ -8377,7 +8377,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9095,7 +9095,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9227,7 +9227,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9369,7 +9369,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9476,7 +9476,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9608,7 +9608,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9720,7 +9720,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9922,7 +9922,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H723ZG.json b/data/chips/STM32H723ZG.json
index aebe9cc..9df6042 100644
--- a/data/chips/STM32H723ZG.json
+++ b/data/chips/STM32H723ZG.json
@@ -8377,7 +8377,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9095,7 +9095,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9227,7 +9227,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9369,7 +9369,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9476,7 +9476,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9608,7 +9608,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9720,7 +9720,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9922,7 +9922,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725AE.json b/data/chips/STM32H725AE.json
index 0c6e7b2..352049f 100644
--- a/data/chips/STM32H725AE.json
+++ b/data/chips/STM32H725AE.json
@@ -7857,7 +7857,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8575,7 +8575,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8707,7 +8707,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8849,7 +8849,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8956,7 +8956,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9088,7 +9088,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9200,7 +9200,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9417,7 +9417,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725AG.json b/data/chips/STM32H725AG.json
index 17b3898..5030b2b 100644
--- a/data/chips/STM32H725AG.json
+++ b/data/chips/STM32H725AG.json
@@ -7863,7 +7863,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8581,7 +8581,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8713,7 +8713,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8855,7 +8855,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8962,7 +8962,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9094,7 +9094,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9206,7 +9206,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9423,7 +9423,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725IE.json b/data/chips/STM32H725IE.json
index 86df794..7d1294b 100644
--- a/data/chips/STM32H725IE.json
+++ b/data/chips/STM32H725IE.json
@@ -9343,7 +9343,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -10116,7 +10116,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10248,7 +10248,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10390,7 +10390,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10497,7 +10497,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10629,7 +10629,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10741,7 +10741,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10963,7 +10963,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725IG.json b/data/chips/STM32H725IG.json
index b772763..ee1186e 100644
--- a/data/chips/STM32H725IG.json
+++ b/data/chips/STM32H725IG.json
@@ -9349,7 +9349,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -10122,7 +10122,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10254,7 +10254,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10396,7 +10396,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10503,7 +10503,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10635,7 +10635,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10747,7 +10747,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10969,7 +10969,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725RE.json b/data/chips/STM32H725RE.json
index 327e638..8de6999 100644
--- a/data/chips/STM32H725RE.json
+++ b/data/chips/STM32H725RE.json
@@ -4529,7 +4529,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5097,7 +5097,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5224,7 +5224,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5306,7 +5306,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5388,7 +5388,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5515,7 +5515,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5602,7 +5602,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5804,7 +5804,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725RG.json b/data/chips/STM32H725RG.json
index f43aa41..9c00819 100644
--- a/data/chips/STM32H725RG.json
+++ b/data/chips/STM32H725RG.json
@@ -4535,7 +4535,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5103,7 +5103,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5230,7 +5230,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5312,7 +5312,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5394,7 +5394,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5521,7 +5521,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5608,7 +5608,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5810,7 +5810,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725VE.json b/data/chips/STM32H725VE.json
index d783169..ae98f23 100644
--- a/data/chips/STM32H725VE.json
+++ b/data/chips/STM32H725VE.json
@@ -6819,7 +6819,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7442,7 +7442,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7574,7 +7574,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7656,7 +7656,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7738,7 +7738,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7870,7 +7870,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7982,7 +7982,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8184,7 +8184,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725VG.json b/data/chips/STM32H725VG.json
index b539070..f19eca9 100644
--- a/data/chips/STM32H725VG.json
+++ b/data/chips/STM32H725VG.json
@@ -7521,7 +7521,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8144,7 +8144,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8276,7 +8276,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8358,7 +8358,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8440,7 +8440,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8572,7 +8572,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8684,7 +8684,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8886,7 +8886,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725ZE.json b/data/chips/STM32H725ZE.json
index a9cb007..71c5fc9 100644
--- a/data/chips/STM32H725ZE.json
+++ b/data/chips/STM32H725ZE.json
@@ -7244,7 +7244,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7942,7 +7942,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8074,7 +8074,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8191,7 +8191,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8283,7 +8283,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8415,7 +8415,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8527,7 +8527,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8729,7 +8729,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H725ZG.json b/data/chips/STM32H725ZG.json
index 4a49373..51b9cc7 100644
--- a/data/chips/STM32H725ZG.json
+++ b/data/chips/STM32H725ZG.json
@@ -7250,7 +7250,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7948,7 +7948,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8080,7 +8080,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8197,7 +8197,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8289,7 +8289,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8421,7 +8421,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8533,7 +8533,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8735,7 +8735,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H730AB.json b/data/chips/STM32H730AB.json
index 3b72fbd..a717abf 100644
--- a/data/chips/STM32H730AB.json
+++ b/data/chips/STM32H730AB.json
@@ -7978,7 +7978,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8696,7 +8696,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8828,7 +8828,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8970,7 +8970,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9077,7 +9077,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9209,7 +9209,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9321,7 +9321,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9538,7 +9538,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H730IB.json b/data/chips/STM32H730IB.json
index b1b57ee..4444f28 100644
--- a/data/chips/STM32H730IB.json
+++ b/data/chips/STM32H730IB.json
@@ -9464,7 +9464,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -10237,7 +10237,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10369,7 +10369,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10511,7 +10511,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10618,7 +10618,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10750,7 +10750,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10862,7 +10862,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -11084,7 +11084,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H730VB.json b/data/chips/STM32H730VB.json
index d6bcb81..aed7b00 100644
--- a/data/chips/STM32H730VB.json
+++ b/data/chips/STM32H730VB.json
@@ -7089,7 +7089,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7747,7 +7747,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7879,7 +7879,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7961,7 +7961,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8043,7 +8043,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8175,7 +8175,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8287,7 +8287,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8489,7 +8489,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H730ZB.json b/data/chips/STM32H730ZB.json
index 937ff46..1d4f922 100644
--- a/data/chips/STM32H730ZB.json
+++ b/data/chips/STM32H730ZB.json
@@ -8492,7 +8492,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9210,7 +9210,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9342,7 +9342,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9484,7 +9484,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9591,7 +9591,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9723,7 +9723,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9835,7 +9835,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10037,7 +10037,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H733VG.json b/data/chips/STM32H733VG.json
index 69c67b8..442e0d5 100644
--- a/data/chips/STM32H733VG.json
+++ b/data/chips/STM32H733VG.json
@@ -7089,7 +7089,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7747,7 +7747,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7879,7 +7879,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7961,7 +7961,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8043,7 +8043,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8175,7 +8175,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8287,7 +8287,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8489,7 +8489,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H733ZG.json b/data/chips/STM32H733ZG.json
index ecc9fed..aec30ac 100644
--- a/data/chips/STM32H733ZG.json
+++ b/data/chips/STM32H733ZG.json
@@ -8492,7 +8492,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9210,7 +9210,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9342,7 +9342,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9484,7 +9484,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9591,7 +9591,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9723,7 +9723,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9835,7 +9835,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10037,7 +10037,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H735AG.json b/data/chips/STM32H735AG.json
index 348ecd2..bece967 100644
--- a/data/chips/STM32H735AG.json
+++ b/data/chips/STM32H735AG.json
@@ -7983,7 +7983,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8701,7 +8701,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8833,7 +8833,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8975,7 +8975,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9082,7 +9082,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9214,7 +9214,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9326,7 +9326,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9543,7 +9543,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H735IG.json b/data/chips/STM32H735IG.json
index 4bf1755..51b173d 100644
--- a/data/chips/STM32H735IG.json
+++ b/data/chips/STM32H735IG.json
@@ -9469,7 +9469,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -10242,7 +10242,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10374,7 +10374,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10516,7 +10516,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10623,7 +10623,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10755,7 +10755,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10867,7 +10867,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -11089,7 +11089,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H735RG.json b/data/chips/STM32H735RG.json
index c31849c..356faf2 100644
--- a/data/chips/STM32H735RG.json
+++ b/data/chips/STM32H735RG.json
@@ -4560,7 +4560,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5128,7 +5128,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5255,7 +5255,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5337,7 +5337,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5419,7 +5419,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5546,7 +5546,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5633,7 +5633,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5835,7 +5835,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H735VG.json b/data/chips/STM32H735VG.json
index 1896f3e..afdbf11 100644
--- a/data/chips/STM32H735VG.json
+++ b/data/chips/STM32H735VG.json
@@ -7641,7 +7641,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8264,7 +8264,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8396,7 +8396,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8478,7 +8478,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8560,7 +8560,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8692,7 +8692,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8804,7 +8804,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9006,7 +9006,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H735ZG.json b/data/chips/STM32H735ZG.json
index 2a8119d..4180d98 100644
--- a/data/chips/STM32H735ZG.json
+++ b/data/chips/STM32H735ZG.json
@@ -7370,7 +7370,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8068,7 +8068,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8200,7 +8200,7 @@
                     "address": 1073799168,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8317,7 +8317,7 @@
                     "address": 1073800192,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8409,7 +8409,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8541,7 +8541,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8653,7 +8653,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8855,7 +8855,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742AG.json b/data/chips/STM32H742AG.json
index 8941a7d..1792bcb 100644
--- a/data/chips/STM32H742AG.json
+++ b/data/chips/STM32H742AG.json
@@ -7011,7 +7011,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7714,7 +7714,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7846,7 +7846,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7978,7 +7978,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8090,7 +8090,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8312,7 +8312,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742AI.json b/data/chips/STM32H742AI.json
index b7a723d..5e023a7 100644
--- a/data/chips/STM32H742AI.json
+++ b/data/chips/STM32H742AI.json
@@ -7011,7 +7011,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7714,7 +7714,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7846,7 +7846,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7978,7 +7978,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8090,7 +8090,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8312,7 +8312,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742BG.json b/data/chips/STM32H742BG.json
index 5e75de2..6a32fbf 100644
--- a/data/chips/STM32H742BG.json
+++ b/data/chips/STM32H742BG.json
@@ -7438,7 +7438,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8196,7 +8196,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8328,7 +8328,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8460,7 +8460,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8572,7 +8572,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8799,7 +8799,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742BI.json b/data/chips/STM32H742BI.json
index 088e6a0..e60c6dc 100644
--- a/data/chips/STM32H742BI.json
+++ b/data/chips/STM32H742BI.json
@@ -7438,7 +7438,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8196,7 +8196,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8328,7 +8328,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8460,7 +8460,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8572,7 +8572,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8799,7 +8799,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742IG.json b/data/chips/STM32H742IG.json
index b8a2f8a..b55f429 100644
--- a/data/chips/STM32H742IG.json
+++ b/data/chips/STM32H742IG.json
@@ -8433,7 +8433,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9146,7 +9146,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9278,7 +9278,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9410,7 +9410,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9522,7 +9522,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9749,7 +9749,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742II.json b/data/chips/STM32H742II.json
index 0e130ed..e1c15d2 100644
--- a/data/chips/STM32H742II.json
+++ b/data/chips/STM32H742II.json
@@ -8433,7 +8433,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9146,7 +9146,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9278,7 +9278,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9410,7 +9410,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9522,7 +9522,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9749,7 +9749,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742VG.json b/data/chips/STM32H742VG.json
index 67dd21c..4b8eb6b 100644
--- a/data/chips/STM32H742VG.json
+++ b/data/chips/STM32H742VG.json
@@ -6332,7 +6332,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6975,7 +6975,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7107,7 +7107,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7239,7 +7239,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7351,7 +7351,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7553,7 +7553,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742VI.json b/data/chips/STM32H742VI.json
index c5fd4b9..e6b91ed 100644
--- a/data/chips/STM32H742VI.json
+++ b/data/chips/STM32H742VI.json
@@ -6332,7 +6332,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6975,7 +6975,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7107,7 +7107,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7239,7 +7239,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7351,7 +7351,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7553,7 +7553,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742XG.json b/data/chips/STM32H742XG.json
index 8005ca7..80320a1 100644
--- a/data/chips/STM32H742XG.json
+++ b/data/chips/STM32H742XG.json
@@ -7844,7 +7844,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8602,7 +8602,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8734,7 +8734,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8866,7 +8866,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8978,7 +8978,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9205,7 +9205,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742XI.json b/data/chips/STM32H742XI.json
index b60667e..bf7a593 100644
--- a/data/chips/STM32H742XI.json
+++ b/data/chips/STM32H742XI.json
@@ -7844,7 +7844,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8602,7 +8602,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8734,7 +8734,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8866,7 +8866,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8978,7 +8978,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9205,7 +9205,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742ZG.json b/data/chips/STM32H742ZG.json
index d826085..ec27d2f 100644
--- a/data/chips/STM32H742ZG.json
+++ b/data/chips/STM32H742ZG.json
@@ -6604,7 +6604,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7307,7 +7307,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7439,7 +7439,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7571,7 +7571,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7683,7 +7683,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7885,7 +7885,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H742ZI.json b/data/chips/STM32H742ZI.json
index 2e18c0b..3427f16 100644
--- a/data/chips/STM32H742ZI.json
+++ b/data/chips/STM32H742ZI.json
@@ -6604,7 +6604,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7307,7 +7307,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7439,7 +7439,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7571,7 +7571,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7683,7 +7683,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7885,7 +7885,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743AG.json b/data/chips/STM32H743AG.json
index a7742fc..e4a15aa 100644
--- a/data/chips/STM32H743AG.json
+++ b/data/chips/STM32H743AG.json
@@ -7440,7 +7440,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8143,7 +8143,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8275,7 +8275,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8407,7 +8407,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8519,7 +8519,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8741,7 +8741,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743AI.json b/data/chips/STM32H743AI.json
index 80c08f1..432f3cb 100644
--- a/data/chips/STM32H743AI.json
+++ b/data/chips/STM32H743AI.json
@@ -7440,7 +7440,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8143,7 +8143,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8275,7 +8275,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8407,7 +8407,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8519,7 +8519,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8741,7 +8741,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743BG.json b/data/chips/STM32H743BG.json
index 7dc6bd4..8232fd8 100644
--- a/data/chips/STM32H743BG.json
+++ b/data/chips/STM32H743BG.json
@@ -8047,7 +8047,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8805,7 +8805,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8937,7 +8937,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9069,7 +9069,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9181,7 +9181,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9408,7 +9408,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743BI.json b/data/chips/STM32H743BI.json
index ef5307f..8b9ed03 100644
--- a/data/chips/STM32H743BI.json
+++ b/data/chips/STM32H743BI.json
@@ -8047,7 +8047,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8805,7 +8805,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8937,7 +8937,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9069,7 +9069,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9181,7 +9181,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9408,7 +9408,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743IG.json b/data/chips/STM32H743IG.json
index 6600d4d..2ef80a4 100644
--- a/data/chips/STM32H743IG.json
+++ b/data/chips/STM32H743IG.json
@@ -8882,7 +8882,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9595,7 +9595,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9727,7 +9727,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9859,7 +9859,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9971,7 +9971,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10198,7 +10198,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743II.json b/data/chips/STM32H743II.json
index 32d92be..6642ff1 100644
--- a/data/chips/STM32H743II.json
+++ b/data/chips/STM32H743II.json
@@ -8882,7 +8882,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9595,7 +9595,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9727,7 +9727,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9859,7 +9859,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9971,7 +9971,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10198,7 +10198,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743VG.json b/data/chips/STM32H743VG.json
index a41aa2f..5de2f4b 100644
--- a/data/chips/STM32H743VG.json
+++ b/data/chips/STM32H743VG.json
@@ -6616,7 +6616,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7259,7 +7259,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7391,7 +7391,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7523,7 +7523,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7635,7 +7635,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7837,7 +7837,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743VI.json b/data/chips/STM32H743VI.json
index f8a00d8..46bdeb1 100644
--- a/data/chips/STM32H743VI.json
+++ b/data/chips/STM32H743VI.json
@@ -6616,7 +6616,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7259,7 +7259,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7391,7 +7391,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7523,7 +7523,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7635,7 +7635,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7837,7 +7837,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743XG.json b/data/chips/STM32H743XG.json
index 8f5c479..b2ff3c7 100644
--- a/data/chips/STM32H743XG.json
+++ b/data/chips/STM32H743XG.json
@@ -8453,7 +8453,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9211,7 +9211,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9343,7 +9343,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9475,7 +9475,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9587,7 +9587,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9814,7 +9814,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743XI.json b/data/chips/STM32H743XI.json
index 17f2a33..b4b814f 100644
--- a/data/chips/STM32H743XI.json
+++ b/data/chips/STM32H743XI.json
@@ -8453,7 +8453,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9211,7 +9211,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9343,7 +9343,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9475,7 +9475,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9587,7 +9587,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9814,7 +9814,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743ZG.json b/data/chips/STM32H743ZG.json
index e4d3d1a..c89a8c8 100644
--- a/data/chips/STM32H743ZG.json
+++ b/data/chips/STM32H743ZG.json
@@ -6943,7 +6943,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7646,7 +7646,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7778,7 +7778,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7910,7 +7910,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8022,7 +8022,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8224,7 +8224,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H743ZI.json b/data/chips/STM32H743ZI.json
index 03fefe6..7d819c2 100644
--- a/data/chips/STM32H743ZI.json
+++ b/data/chips/STM32H743ZI.json
@@ -6943,7 +6943,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7646,7 +7646,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7778,7 +7778,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7910,7 +7910,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8022,7 +8022,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8224,7 +8224,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745BG.json b/data/chips/STM32H745BG.json
index c2f23f0..16c54c1 100644
--- a/data/chips/STM32H745BG.json
+++ b/data/chips/STM32H745BG.json
@@ -7928,7 +7928,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8686,7 +8686,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8818,7 +8818,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8950,7 +8950,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9062,7 +9062,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9289,7 +9289,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17832,7 +17832,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18590,7 +18590,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18722,7 +18722,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18854,7 +18854,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18966,7 +18966,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19193,7 +19193,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745BI.json b/data/chips/STM32H745BI.json
index 9420534..e5a3a2d 100644
--- a/data/chips/STM32H745BI.json
+++ b/data/chips/STM32H745BI.json
@@ -7928,7 +7928,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8686,7 +8686,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8818,7 +8818,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8950,7 +8950,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9062,7 +9062,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9289,7 +9289,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17832,7 +17832,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18590,7 +18590,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18722,7 +18722,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18854,7 +18854,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18966,7 +18966,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19193,7 +19193,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745IG.json b/data/chips/STM32H745IG.json
index 7f78e27..f3c3ffd 100644
--- a/data/chips/STM32H745IG.json
+++ b/data/chips/STM32H745IG.json
@@ -8770,7 +8770,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9528,7 +9528,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9660,7 +9660,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9792,7 +9792,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9904,7 +9904,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10126,7 +10126,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18416,7 +18416,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19174,7 +19174,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19306,7 +19306,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19438,7 +19438,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19550,7 +19550,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19772,7 +19772,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745II.json b/data/chips/STM32H745II.json
index a2d154a..9522ae8 100644
--- a/data/chips/STM32H745II.json
+++ b/data/chips/STM32H745II.json
@@ -8770,7 +8770,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9528,7 +9528,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9660,7 +9660,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9792,7 +9792,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9904,7 +9904,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10126,7 +10126,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18416,7 +18416,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19174,7 +19174,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19306,7 +19306,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19438,7 +19438,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19550,7 +19550,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19772,7 +19772,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745XG.json b/data/chips/STM32H745XG.json
index 395bdd9..7bf40c7 100644
--- a/data/chips/STM32H745XG.json
+++ b/data/chips/STM32H745XG.json
@@ -8444,7 +8444,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9202,7 +9202,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9334,7 +9334,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9466,7 +9466,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9578,7 +9578,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9805,7 +9805,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18522,7 +18522,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19280,7 +19280,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19412,7 +19412,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19544,7 +19544,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19656,7 +19656,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19883,7 +19883,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745XI.json b/data/chips/STM32H745XI.json
index f41ef1f..5012646 100644
--- a/data/chips/STM32H745XI.json
+++ b/data/chips/STM32H745XI.json
@@ -8444,7 +8444,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9202,7 +9202,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9334,7 +9334,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9466,7 +9466,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9578,7 +9578,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9805,7 +9805,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18522,7 +18522,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19280,7 +19280,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19412,7 +19412,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19544,7 +19544,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19656,7 +19656,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19883,7 +19883,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745ZG.json b/data/chips/STM32H745ZG.json
index 3b7bb33..d513278 100644
--- a/data/chips/STM32H745ZG.json
+++ b/data/chips/STM32H745ZG.json
@@ -6779,7 +6779,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7462,7 +7462,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7594,7 +7594,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7726,7 +7726,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7838,7 +7838,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8040,7 +8040,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15618,7 +15618,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16301,7 +16301,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16433,7 +16433,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16565,7 +16565,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16677,7 +16677,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16879,7 +16879,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H745ZI.json b/data/chips/STM32H745ZI.json
index 61c692c..59707af 100644
--- a/data/chips/STM32H745ZI.json
+++ b/data/chips/STM32H745ZI.json
@@ -6779,7 +6779,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7462,7 +7462,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7594,7 +7594,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7726,7 +7726,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7838,7 +7838,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8040,7 +8040,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15618,7 +15618,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16301,7 +16301,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16433,7 +16433,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16565,7 +16565,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16677,7 +16677,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16879,7 +16879,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747AG.json b/data/chips/STM32H747AG.json
index ed86f45..16e0f1d 100644
--- a/data/chips/STM32H747AG.json
+++ b/data/chips/STM32H747AG.json
@@ -7132,7 +7132,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7835,7 +7835,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7967,7 +7967,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8099,7 +8099,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8211,7 +8211,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8413,7 +8413,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16232,7 +16232,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16935,7 +16935,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17067,7 +17067,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17199,7 +17199,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17311,7 +17311,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17513,7 +17513,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747AI.json b/data/chips/STM32H747AI.json
index 39d257a..790bbe4 100644
--- a/data/chips/STM32H747AI.json
+++ b/data/chips/STM32H747AI.json
@@ -7132,7 +7132,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7835,7 +7835,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7967,7 +7967,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8099,7 +8099,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8211,7 +8211,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8413,7 +8413,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16232,7 +16232,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16935,7 +16935,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17067,7 +17067,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17199,7 +17199,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17311,7 +17311,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17513,7 +17513,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747BG.json b/data/chips/STM32H747BG.json
index 9ecbfed..9deaffd 100644
--- a/data/chips/STM32H747BG.json
+++ b/data/chips/STM32H747BG.json
@@ -7911,7 +7911,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8624,7 +8624,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8756,7 +8756,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8888,7 +8888,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9000,7 +9000,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9227,7 +9227,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17686,7 +17686,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18399,7 +18399,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18531,7 +18531,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18663,7 +18663,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18775,7 +18775,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19002,7 +19002,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747BI.json b/data/chips/STM32H747BI.json
index 8fa9598..41e1a13 100644
--- a/data/chips/STM32H747BI.json
+++ b/data/chips/STM32H747BI.json
@@ -7911,7 +7911,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8624,7 +8624,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8756,7 +8756,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8888,7 +8888,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9000,7 +9000,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9227,7 +9227,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17686,7 +17686,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18399,7 +18399,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18531,7 +18531,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18663,7 +18663,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18775,7 +18775,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19002,7 +19002,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747IG.json b/data/chips/STM32H747IG.json
index 5e3088a..c449d6b 100644
--- a/data/chips/STM32H747IG.json
+++ b/data/chips/STM32H747IG.json
@@ -7174,7 +7174,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7877,7 +7877,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8009,7 +8009,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8141,7 +8141,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8253,7 +8253,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8455,7 +8455,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16274,7 +16274,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16977,7 +16977,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17109,7 +17109,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17241,7 +17241,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17353,7 +17353,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17555,7 +17555,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747II.json b/data/chips/STM32H747II.json
index c5d9c26..aab5a6b 100644
--- a/data/chips/STM32H747II.json
+++ b/data/chips/STM32H747II.json
@@ -7174,7 +7174,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7877,7 +7877,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8009,7 +8009,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8141,7 +8141,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8253,7 +8253,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8455,7 +8455,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16274,7 +16274,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16977,7 +16977,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17109,7 +17109,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17241,7 +17241,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17353,7 +17353,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17555,7 +17555,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747XG.json b/data/chips/STM32H747XG.json
index f80254c..42ddd0e 100644
--- a/data/chips/STM32H747XG.json
+++ b/data/chips/STM32H747XG.json
@@ -8497,7 +8497,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9255,7 +9255,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9387,7 +9387,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9519,7 +9519,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9631,7 +9631,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9858,7 +9858,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18626,7 +18626,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19384,7 +19384,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19516,7 +19516,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19648,7 +19648,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19760,7 +19760,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19987,7 +19987,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747XI.json b/data/chips/STM32H747XI.json
index 7b65887..9c19558 100644
--- a/data/chips/STM32H747XI.json
+++ b/data/chips/STM32H747XI.json
@@ -8497,7 +8497,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9255,7 +9255,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9387,7 +9387,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9519,7 +9519,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9631,7 +9631,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9858,7 +9858,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18626,7 +18626,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19384,7 +19384,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19516,7 +19516,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19648,7 +19648,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19760,7 +19760,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19987,7 +19987,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H747ZI.json b/data/chips/STM32H747ZI.json
index c56c234..c5801cc 100644
--- a/data/chips/STM32H747ZI.json
+++ b/data/chips/STM32H747ZI.json
@@ -6608,7 +6608,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7271,7 +7271,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7403,7 +7403,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7535,7 +7535,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7647,7 +7647,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7849,7 +7849,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15162,7 +15162,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15825,7 +15825,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -15957,7 +15957,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16089,7 +16089,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16201,7 +16201,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16403,7 +16403,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H750IB.json b/data/chips/STM32H750IB.json
index e7fb1a9..e592656 100644
--- a/data/chips/STM32H750IB.json
+++ b/data/chips/STM32H750IB.json
@@ -8927,7 +8927,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9640,7 +9640,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9772,7 +9772,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9904,7 +9904,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10016,7 +10016,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10243,7 +10243,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H750VB.json b/data/chips/STM32H750VB.json
index 17a5225..a86d722 100644
--- a/data/chips/STM32H750VB.json
+++ b/data/chips/STM32H750VB.json
@@ -6055,7 +6055,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6698,7 +6698,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -6830,7 +6830,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -6962,7 +6962,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7074,7 +7074,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7276,7 +7276,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H750XB.json b/data/chips/STM32H750XB.json
index e16edbf..97828bf 100644
--- a/data/chips/STM32H750XB.json
+++ b/data/chips/STM32H750XB.json
@@ -8498,7 +8498,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9256,7 +9256,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9388,7 +9388,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9520,7 +9520,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9632,7 +9632,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9859,7 +9859,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H750ZB.json b/data/chips/STM32H750ZB.json
index 525d618..67ee542 100644
--- a/data/chips/STM32H750ZB.json
+++ b/data/chips/STM32H750ZB.json
@@ -6976,7 +6976,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7679,7 +7679,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7811,7 +7811,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7943,7 +7943,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8055,7 +8055,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8257,7 +8257,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753AI.json b/data/chips/STM32H753AI.json
index 5e615a9..9c77914 100644
--- a/data/chips/STM32H753AI.json
+++ b/data/chips/STM32H753AI.json
@@ -7519,7 +7519,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8222,7 +8222,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8354,7 +8354,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8486,7 +8486,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8598,7 +8598,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8820,7 +8820,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753BI.json b/data/chips/STM32H753BI.json
index 2d9c3a5..63049dc 100644
--- a/data/chips/STM32H753BI.json
+++ b/data/chips/STM32H753BI.json
@@ -8126,7 +8126,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8884,7 +8884,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9016,7 +9016,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9148,7 +9148,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9260,7 +9260,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9487,7 +9487,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753II.json b/data/chips/STM32H753II.json
index 2dd5cfb..7dcee59 100644
--- a/data/chips/STM32H753II.json
+++ b/data/chips/STM32H753II.json
@@ -8961,7 +8961,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9674,7 +9674,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9806,7 +9806,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9938,7 +9938,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10050,7 +10050,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10277,7 +10277,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753VI.json b/data/chips/STM32H753VI.json
index 7c48a56..4df1ee1 100644
--- a/data/chips/STM32H753VI.json
+++ b/data/chips/STM32H753VI.json
@@ -6695,7 +6695,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7338,7 +7338,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7470,7 +7470,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7602,7 +7602,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7714,7 +7714,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7916,7 +7916,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753XI.json b/data/chips/STM32H753XI.json
index e60a528..3c2a73a 100644
--- a/data/chips/STM32H753XI.json
+++ b/data/chips/STM32H753XI.json
@@ -8532,7 +8532,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9290,7 +9290,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9422,7 +9422,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9554,7 +9554,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9666,7 +9666,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9893,7 +9893,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H753ZI.json b/data/chips/STM32H753ZI.json
index c415bdd..820ee7d 100644
--- a/data/chips/STM32H753ZI.json
+++ b/data/chips/STM32H753ZI.json
@@ -7022,7 +7022,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7725,7 +7725,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7857,7 +7857,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7989,7 +7989,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8101,7 +8101,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8303,7 +8303,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H755BI.json b/data/chips/STM32H755BI.json
index e253e39..5715534 100644
--- a/data/chips/STM32H755BI.json
+++ b/data/chips/STM32H755BI.json
@@ -8007,7 +8007,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8765,7 +8765,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8897,7 +8897,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9029,7 +9029,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9141,7 +9141,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9368,7 +9368,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17988,7 +17988,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18746,7 +18746,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18878,7 +18878,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19010,7 +19010,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19122,7 +19122,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19349,7 +19349,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H755II.json b/data/chips/STM32H755II.json
index 8ea2924..58a0b58 100644
--- a/data/chips/STM32H755II.json
+++ b/data/chips/STM32H755II.json
@@ -8849,7 +8849,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9607,7 +9607,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9739,7 +9739,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9871,7 +9871,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9983,7 +9983,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10205,7 +10205,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18572,7 +18572,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19330,7 +19330,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19462,7 +19462,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19594,7 +19594,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19706,7 +19706,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19928,7 +19928,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H755XI.json b/data/chips/STM32H755XI.json
index 93b21ac..f5d174f 100644
--- a/data/chips/STM32H755XI.json
+++ b/data/chips/STM32H755XI.json
@@ -8523,7 +8523,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9281,7 +9281,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9413,7 +9413,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9545,7 +9545,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9657,7 +9657,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9884,7 +9884,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18678,7 +18678,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19436,7 +19436,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19568,7 +19568,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19700,7 +19700,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19812,7 +19812,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -20039,7 +20039,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H755ZI.json b/data/chips/STM32H755ZI.json
index 85e08a7..c878313 100644
--- a/data/chips/STM32H755ZI.json
+++ b/data/chips/STM32H755ZI.json
@@ -6858,7 +6858,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7541,7 +7541,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7673,7 +7673,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7805,7 +7805,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7917,7 +7917,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8119,7 +8119,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15774,7 +15774,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16457,7 +16457,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16589,7 +16589,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16721,7 +16721,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16833,7 +16833,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17035,7 +17035,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H757AI.json b/data/chips/STM32H757AI.json
index f2edd2f..04b35c9 100644
--- a/data/chips/STM32H757AI.json
+++ b/data/chips/STM32H757AI.json
@@ -7211,7 +7211,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7914,7 +7914,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8046,7 +8046,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8178,7 +8178,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8290,7 +8290,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8492,7 +8492,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16388,7 +16388,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17091,7 +17091,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17223,7 +17223,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17355,7 +17355,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17467,7 +17467,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17669,7 +17669,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H757BI.json b/data/chips/STM32H757BI.json
index 97293da..a5803b4 100644
--- a/data/chips/STM32H757BI.json
+++ b/data/chips/STM32H757BI.json
@@ -7990,7 +7990,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8703,7 +8703,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8835,7 +8835,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8967,7 +8967,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9079,7 +9079,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9306,7 +9306,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17842,7 +17842,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18555,7 +18555,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -18687,7 +18687,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18819,7 +18819,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -18931,7 +18931,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19158,7 +19158,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H757II.json b/data/chips/STM32H757II.json
index 3df73cc..88e0b04 100644
--- a/data/chips/STM32H757II.json
+++ b/data/chips/STM32H757II.json
@@ -7253,7 +7253,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7956,7 +7956,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8088,7 +8088,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8220,7 +8220,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8332,7 +8332,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8534,7 +8534,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -16430,7 +16430,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -17133,7 +17133,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17265,7 +17265,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17397,7 +17397,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -17509,7 +17509,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -17711,7 +17711,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H757XI.json b/data/chips/STM32H757XI.json
index 242f134..2bc30a3 100644
--- a/data/chips/STM32H757XI.json
+++ b/data/chips/STM32H757XI.json
@@ -8576,7 +8576,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9334,7 +9334,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9466,7 +9466,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9598,7 +9598,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9710,7 +9710,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9937,7 +9937,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -18782,7 +18782,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -19540,7 +19540,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -19672,7 +19672,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19804,7 +19804,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -19916,7 +19916,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -20143,7 +20143,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H757ZI.json b/data/chips/STM32H757ZI.json
index eb73646..a752f23 100644
--- a/data/chips/STM32H757ZI.json
+++ b/data/chips/STM32H757ZI.json
@@ -6687,7 +6687,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7350,7 +7350,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7482,7 +7482,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7614,7 +7614,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7726,7 +7726,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7928,7 +7928,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15318,7 +15318,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -15981,7 +15981,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16113,7 +16113,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16245,7 +16245,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -16357,7 +16357,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -16559,7 +16559,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3AG.json b/data/chips/STM32H7A3AG.json
index 60438be..17cb440 100644
--- a/data/chips/STM32H7A3AG.json
+++ b/data/chips/STM32H7A3AG.json
@@ -7373,7 +7373,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8086,7 +8086,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8218,7 +8218,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8350,7 +8350,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8462,7 +8462,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8679,7 +8679,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3AI.json b/data/chips/STM32H7A3AI.json
index 032c950..91b0508 100644
--- a/data/chips/STM32H7A3AI.json
+++ b/data/chips/STM32H7A3AI.json
@@ -7373,7 +7373,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8086,7 +8086,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8218,7 +8218,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8350,7 +8350,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8462,7 +8462,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8679,7 +8679,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3IG.json b/data/chips/STM32H7A3IG.json
index 2f1925a..14347b3 100644
--- a/data/chips/STM32H7A3IG.json
+++ b/data/chips/STM32H7A3IG.json
@@ -11397,7 +11397,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -12165,7 +12165,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12297,7 +12297,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12429,7 +12429,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12541,7 +12541,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12768,7 +12768,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3II.json b/data/chips/STM32H7A3II.json
index 7231b2b..0b09038 100644
--- a/data/chips/STM32H7A3II.json
+++ b/data/chips/STM32H7A3II.json
@@ -11397,7 +11397,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -12165,7 +12165,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12297,7 +12297,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12429,7 +12429,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12541,7 +12541,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12768,7 +12768,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3LG.json b/data/chips/STM32H7A3LG.json
index 117eb77..4ecdff6 100644
--- a/data/chips/STM32H7A3LG.json
+++ b/data/chips/STM32H7A3LG.json
@@ -8369,7 +8369,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9137,7 +9137,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9269,7 +9269,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9401,7 +9401,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9513,7 +9513,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9740,7 +9740,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3LI.json b/data/chips/STM32H7A3LI.json
index e3262f2..398ee95 100644
--- a/data/chips/STM32H7A3LI.json
+++ b/data/chips/STM32H7A3LI.json
@@ -8375,7 +8375,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9143,7 +9143,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9275,7 +9275,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9407,7 +9407,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9519,7 +9519,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9746,7 +9746,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3NG.json b/data/chips/STM32H7A3NG.json
index 8e0f5a7..0760413 100644
--- a/data/chips/STM32H7A3NG.json
+++ b/data/chips/STM32H7A3NG.json
@@ -8277,7 +8277,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9045,7 +9045,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9177,7 +9177,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9309,7 +9309,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9421,7 +9421,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9648,7 +9648,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3NI.json b/data/chips/STM32H7A3NI.json
index 6caabee..e2ac5dd 100644
--- a/data/chips/STM32H7A3NI.json
+++ b/data/chips/STM32H7A3NI.json
@@ -8277,7 +8277,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9045,7 +9045,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9177,7 +9177,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9309,7 +9309,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9421,7 +9421,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9648,7 +9648,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3QI.json b/data/chips/STM32H7A3QI.json
index 981f1ef..d3bd9d9 100644
--- a/data/chips/STM32H7A3QI.json
+++ b/data/chips/STM32H7A3QI.json
@@ -6464,7 +6464,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7117,7 +7117,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7249,7 +7249,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7376,7 +7376,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7488,7 +7488,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7690,7 +7690,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3RG.json b/data/chips/STM32H7A3RG.json
index 94e25f0..416d205 100644
--- a/data/chips/STM32H7A3RG.json
+++ b/data/chips/STM32H7A3RG.json
@@ -4622,7 +4622,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5175,7 +5175,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5302,7 +5302,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5429,7 +5429,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5516,7 +5516,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5718,7 +5718,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3RI.json b/data/chips/STM32H7A3RI.json
index 535c8d6..1d88874 100644
--- a/data/chips/STM32H7A3RI.json
+++ b/data/chips/STM32H7A3RI.json
@@ -4622,7 +4622,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5175,7 +5175,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5302,7 +5302,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5429,7 +5429,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5516,7 +5516,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5718,7 +5718,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3VG.json b/data/chips/STM32H7A3VG.json
index 95b4c35..77ed120 100644
--- a/data/chips/STM32H7A3VG.json
+++ b/data/chips/STM32H7A3VG.json
@@ -7855,7 +7855,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8508,7 +8508,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8640,7 +8640,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8772,7 +8772,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8884,7 +8884,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9086,7 +9086,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3VI.json b/data/chips/STM32H7A3VI.json
index c2f274c..c842190 100644
--- a/data/chips/STM32H7A3VI.json
+++ b/data/chips/STM32H7A3VI.json
@@ -7855,7 +7855,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8508,7 +8508,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8640,7 +8640,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8772,7 +8772,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8884,7 +8884,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9086,7 +9086,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3ZG.json b/data/chips/STM32H7A3ZG.json
index dfad684..057e861 100644
--- a/data/chips/STM32H7A3ZG.json
+++ b/data/chips/STM32H7A3ZG.json
@@ -7889,7 +7889,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8602,7 +8602,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8734,7 +8734,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8866,7 +8866,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8978,7 +8978,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9180,7 +9180,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7A3ZI.json b/data/chips/STM32H7A3ZI.json
index 53300ce..cee027e 100644
--- a/data/chips/STM32H7A3ZI.json
+++ b/data/chips/STM32H7A3ZI.json
@@ -7889,7 +7889,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8602,7 +8602,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8734,7 +8734,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8866,7 +8866,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8978,7 +8978,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9180,7 +9180,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B0AB.json b/data/chips/STM32H7B0AB.json
index f38d680..b975fcd 100644
--- a/data/chips/STM32H7B0AB.json
+++ b/data/chips/STM32H7B0AB.json
@@ -7471,7 +7471,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8184,7 +8184,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8316,7 +8316,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8448,7 +8448,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8560,7 +8560,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8777,7 +8777,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B0IB.json b/data/chips/STM32H7B0IB.json
index 763f254..9aa45db 100644
--- a/data/chips/STM32H7B0IB.json
+++ b/data/chips/STM32H7B0IB.json
@@ -9166,7 +9166,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9889,7 +9889,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10021,7 +10021,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10153,7 +10153,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -10265,7 +10265,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -10492,7 +10492,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B0RB.json b/data/chips/STM32H7B0RB.json
index 46342d9..25aa90f 100644
--- a/data/chips/STM32H7B0RB.json
+++ b/data/chips/STM32H7B0RB.json
@@ -4705,7 +4705,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5258,7 +5258,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5385,7 +5385,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5512,7 +5512,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5599,7 +5599,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5801,7 +5801,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B0VB.json b/data/chips/STM32H7B0VB.json
index 4ddfce0..7aa3bbb 100644
--- a/data/chips/STM32H7B0VB.json
+++ b/data/chips/STM32H7B0VB.json
@@ -6120,7 +6120,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6773,7 +6773,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -6905,7 +6905,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7037,7 +7037,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7149,7 +7149,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7351,7 +7351,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B0ZB.json b/data/chips/STM32H7B0ZB.json
index 9dadc7f..904c070 100644
--- a/data/chips/STM32H7B0ZB.json
+++ b/data/chips/STM32H7B0ZB.json
@@ -7117,7 +7117,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7830,7 +7830,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7962,7 +7962,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8094,7 +8094,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8206,7 +8206,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8408,7 +8408,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3AI.json b/data/chips/STM32H7B3AI.json
index 4092f2d..eeb2197 100644
--- a/data/chips/STM32H7B3AI.json
+++ b/data/chips/STM32H7B3AI.json
@@ -7493,7 +7493,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8206,7 +8206,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8338,7 +8338,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8470,7 +8470,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8582,7 +8582,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8799,7 +8799,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3II.json b/data/chips/STM32H7B3II.json
index be6b4f6..187c0dd 100644
--- a/data/chips/STM32H7B3II.json
+++ b/data/chips/STM32H7B3II.json
@@ -11517,7 +11517,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -12285,7 +12285,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12417,7 +12417,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12549,7 +12549,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -12661,7 +12661,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -12888,7 +12888,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3LI.json b/data/chips/STM32H7B3LI.json
index e39e08b..553ae17 100644
--- a/data/chips/STM32H7B3LI.json
+++ b/data/chips/STM32H7B3LI.json
@@ -8495,7 +8495,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9263,7 +9263,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9395,7 +9395,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9527,7 +9527,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9639,7 +9639,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9866,7 +9866,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3NI.json b/data/chips/STM32H7B3NI.json
index 07231ea..20faa2c 100644
--- a/data/chips/STM32H7B3NI.json
+++ b/data/chips/STM32H7B3NI.json
@@ -8397,7 +8397,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9165,7 +9165,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9297,7 +9297,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9429,7 +9429,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9541,7 +9541,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9768,7 +9768,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3QI.json b/data/chips/STM32H7B3QI.json
index 8aca494..9e4da32 100644
--- a/data/chips/STM32H7B3QI.json
+++ b/data/chips/STM32H7B3QI.json
@@ -6569,7 +6569,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7222,7 +7222,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7354,7 +7354,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7481,7 +7481,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7593,7 +7593,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7795,7 +7795,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3RI.json b/data/chips/STM32H7B3RI.json
index ae1ef71..15e24ca 100644
--- a/data/chips/STM32H7B3RI.json
+++ b/data/chips/STM32H7B3RI.json
@@ -4727,7 +4727,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5280,7 +5280,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5407,7 +5407,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5534,7 +5534,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -5621,7 +5621,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5823,7 +5823,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3VI.json b/data/chips/STM32H7B3VI.json
index cde0124..c70dde4 100644
--- a/data/chips/STM32H7B3VI.json
+++ b/data/chips/STM32H7B3VI.json
@@ -7960,7 +7960,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8613,7 +8613,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8745,7 +8745,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8877,7 +8877,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8989,7 +8989,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9191,7 +9191,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7B3ZI.json b/data/chips/STM32H7B3ZI.json
index 241c075..d1f597d 100644
--- a/data/chips/STM32H7B3ZI.json
+++ b/data/chips/STM32H7B3ZI.json
@@ -8009,7 +8009,7 @@
                     "address": 1073807360,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8722,7 +8722,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8854,7 +8854,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8986,7 +8986,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9098,7 +9098,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9300,7 +9300,7 @@
                     "address": 1073808384,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3A8.json b/data/chips/STM32H7R3A8.json
index 4ade7fe..fc0911e 100644
--- a/data/chips/STM32H7R3A8.json
+++ b/data/chips/STM32H7R3A8.json
@@ -6119,7 +6119,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6807,7 +6807,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -6924,7 +6924,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7041,7 +7041,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7148,7 +7148,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3I8.json b/data/chips/STM32H7R3I8.json
index 728e34a..f6385e9 100644
--- a/data/chips/STM32H7R3I8.json
+++ b/data/chips/STM32H7R3I8.json
@@ -7525,7 +7525,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8228,7 +8228,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8345,7 +8345,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8462,7 +8462,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8569,7 +8569,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3L8.json b/data/chips/STM32H7R3L8.json
index 2ae691e..edbb5e9 100644
--- a/data/chips/STM32H7R3L8.json
+++ b/data/chips/STM32H7R3L8.json
@@ -8460,7 +8460,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9178,7 +9178,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9295,7 +9295,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9412,7 +9412,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9519,7 +9519,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3R8.json b/data/chips/STM32H7R3R8.json
index 4c75aef..075ed10 100644
--- a/data/chips/STM32H7R3R8.json
+++ b/data/chips/STM32H7R3R8.json
@@ -3141,7 +3141,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -3592,7 +3592,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -3709,7 +3709,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3V8.json b/data/chips/STM32H7R3V8.json
index 0bf9671..de740b1 100644
--- a/data/chips/STM32H7R3V8.json
+++ b/data/chips/STM32H7R3V8.json
@@ -5077,7 +5077,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5625,7 +5625,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5742,7 +5742,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R3Z8.json b/data/chips/STM32H7R3Z8.json
index 8afa5b7..e7156d9 100644
--- a/data/chips/STM32H7R3Z8.json
+++ b/data/chips/STM32H7R3Z8.json
@@ -6585,7 +6585,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7203,7 +7203,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7320,7 +7320,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7437,7 +7437,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7544,7 +7544,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R7A8.json b/data/chips/STM32H7R7A8.json
index d653ea4..bda2f36 100644
--- a/data/chips/STM32H7R7A8.json
+++ b/data/chips/STM32H7R7A8.json
@@ -6282,7 +6282,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6970,7 +6970,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7087,7 +7087,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7204,7 +7204,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7291,7 +7291,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R7I8.json b/data/chips/STM32H7R7I8.json
index 2fec443..7781605 100644
--- a/data/chips/STM32H7R7I8.json
+++ b/data/chips/STM32H7R7I8.json
@@ -7660,7 +7660,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8353,7 +8353,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8470,7 +8470,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8587,7 +8587,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8674,7 +8674,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R7L8.json b/data/chips/STM32H7R7L8.json
index 2cd8c32..3b89815 100644
--- a/data/chips/STM32H7R7L8.json
+++ b/data/chips/STM32H7R7L8.json
@@ -8748,7 +8748,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9466,7 +9466,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9583,7 +9583,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9700,7 +9700,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9807,7 +9807,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7R7Z8.json b/data/chips/STM32H7R7Z8.json
index e0b40b8..6c82fd6 100644
--- a/data/chips/STM32H7R7Z8.json
+++ b/data/chips/STM32H7R7Z8.json
@@ -5576,7 +5576,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6179,7 +6179,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -6296,7 +6296,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -6413,7 +6413,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3A8.json b/data/chips/STM32H7S3A8.json
index c9747fd..7b0f271 100644
--- a/data/chips/STM32H7S3A8.json
+++ b/data/chips/STM32H7S3A8.json
@@ -6244,7 +6244,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6932,7 +6932,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7049,7 +7049,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7166,7 +7166,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7273,7 +7273,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3I8.json b/data/chips/STM32H7S3I8.json
index d70e015..a113636 100644
--- a/data/chips/STM32H7S3I8.json
+++ b/data/chips/STM32H7S3I8.json
@@ -7650,7 +7650,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8353,7 +8353,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8470,7 +8470,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8587,7 +8587,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8694,7 +8694,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3L8.json b/data/chips/STM32H7S3L8.json
index de3d4fe..d263737 100644
--- a/data/chips/STM32H7S3L8.json
+++ b/data/chips/STM32H7S3L8.json
@@ -8585,7 +8585,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9303,7 +9303,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9420,7 +9420,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9537,7 +9537,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9644,7 +9644,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3R8.json b/data/chips/STM32H7S3R8.json
index 66e551c..835221a 100644
--- a/data/chips/STM32H7S3R8.json
+++ b/data/chips/STM32H7S3R8.json
@@ -3266,7 +3266,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -3717,7 +3717,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -3834,7 +3834,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3V8.json b/data/chips/STM32H7S3V8.json
index df4013f..0486bd9 100644
--- a/data/chips/STM32H7S3V8.json
+++ b/data/chips/STM32H7S3V8.json
@@ -5202,7 +5202,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -5750,7 +5750,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -5867,7 +5867,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S3Z8.json b/data/chips/STM32H7S3Z8.json
index 56cf61d..81f73b1 100644
--- a/data/chips/STM32H7S3Z8.json
+++ b/data/chips/STM32H7S3Z8.json
@@ -6710,7 +6710,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7328,7 +7328,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7445,7 +7445,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7562,7 +7562,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7669,7 +7669,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S7A8.json b/data/chips/STM32H7S7A8.json
index a4a897c..9cfa2bb 100644
--- a/data/chips/STM32H7S7A8.json
+++ b/data/chips/STM32H7S7A8.json
@@ -6407,7 +6407,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -7095,7 +7095,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -7212,7 +7212,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7329,7 +7329,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -7416,7 +7416,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S7I8.json b/data/chips/STM32H7S7I8.json
index cb62c5c..fe04019 100644
--- a/data/chips/STM32H7S7I8.json
+++ b/data/chips/STM32H7S7I8.json
@@ -7785,7 +7785,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -8478,7 +8478,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -8595,7 +8595,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8712,7 +8712,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -8799,7 +8799,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S7L8.json b/data/chips/STM32H7S7L8.json
index 7ef3e1f..c681a3d 100644
--- a/data/chips/STM32H7S7L8.json
+++ b/data/chips/STM32H7S7L8.json
@@ -8873,7 +8873,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -9591,7 +9591,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -9708,7 +9708,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9825,7 +9825,7 @@
                     "address": 1073743872,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -9932,7 +9932,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
diff --git a/data/chips/STM32H7S7Z8.json b/data/chips/STM32H7S7Z8.json
index 30cb596..3a4e3a3 100644
--- a/data/chips/STM32H7S7Z8.json
+++ b/data/chips/STM32H7S7Z8.json
@@ -5701,7 +5701,7 @@
                     "address": 1107296256,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_ADV"
                     },
                     "rcc": {
@@ -6304,7 +6304,7 @@
                     "address": 1073741824,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {
@@ -6421,7 +6421,7 @@
                     "address": 1073742848,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP16"
                     },
                     "rcc": {
@@ -6538,7 +6538,7 @@
                     "address": 1073744896,
                     "registers": {
                         "kind": "timer",
-                        "version": "v1",
+                        "version": "v2",
                         "block": "TIM_GP32"
                     },
                     "rcc": {