diff --git a/data/chips/STM32H723VE.json b/data/chips/STM32H723VE.json index bf9cd3f..9a6735f 100644 --- a/data/chips/STM32H723VE.json +++ b/data/chips/STM32H723VE.json @@ -6974,8 +6974,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7216,7 +7216,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7271,7 +7271,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7321,7 +7321,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7371,7 +7371,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7488,7 +7488,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7560,7 +7560,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7632,8 +7632,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7764,8 +7764,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7846,8 +7846,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7928,8 +7928,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8060,8 +8060,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8172,8 +8172,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8274,7 +8274,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8324,7 +8324,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8374,8 +8374,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H723VG.json b/data/chips/STM32H723VG.json index 1523242..af7bd27 100644 --- a/data/chips/STM32H723VG.json +++ b/data/chips/STM32H723VG.json @@ -6974,8 +6974,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7216,7 +7216,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7271,7 +7271,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7321,7 +7321,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7371,7 +7371,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7488,7 +7488,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7560,7 +7560,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7632,8 +7632,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7764,8 +7764,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7846,8 +7846,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7928,8 +7928,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8060,8 +8060,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8172,8 +8172,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8274,7 +8274,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8324,7 +8324,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8374,8 +8374,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H723ZE.json b/data/chips/STM32H723ZE.json index 81dd494..8269f32 100644 --- a/data/chips/STM32H723ZE.json +++ b/data/chips/STM32H723ZE.json @@ -8377,8 +8377,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8639,7 +8639,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8694,7 +8694,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8749,7 +8749,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8804,7 +8804,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8921,7 +8921,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9008,7 +9008,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9095,8 +9095,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9227,8 +9227,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9369,8 +9369,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9476,8 +9476,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9608,8 +9608,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9720,8 +9720,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9822,7 +9822,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9872,7 +9872,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9922,8 +9922,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H723ZG.json b/data/chips/STM32H723ZG.json index aebe9cc..bd7c4f2 100644 --- a/data/chips/STM32H723ZG.json +++ b/data/chips/STM32H723ZG.json @@ -8377,8 +8377,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8639,7 +8639,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8694,7 +8694,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8749,7 +8749,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8804,7 +8804,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8921,7 +8921,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9008,7 +9008,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9095,8 +9095,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9227,8 +9227,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9369,8 +9369,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9476,8 +9476,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9608,8 +9608,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9720,8 +9720,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9822,7 +9822,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9872,7 +9872,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9922,8 +9922,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725AE.json b/data/chips/STM32H725AE.json index 0c6e7b2..f5c53c2 100644 --- a/data/chips/STM32H725AE.json +++ b/data/chips/STM32H725AE.json @@ -7857,8 +7857,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8119,7 +8119,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8174,7 +8174,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8229,7 +8229,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8284,7 +8284,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8401,7 +8401,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8488,7 +8488,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8575,8 +8575,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8707,8 +8707,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8849,8 +8849,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8956,8 +8956,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9088,8 +9088,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9200,8 +9200,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9317,7 +9317,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9367,7 +9367,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9417,8 +9417,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725AG.json b/data/chips/STM32H725AG.json index 17b3898..d813205 100644 --- a/data/chips/STM32H725AG.json +++ b/data/chips/STM32H725AG.json @@ -7863,8 +7863,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8125,7 +8125,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8180,7 +8180,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8235,7 +8235,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8290,7 +8290,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8407,7 +8407,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8494,7 +8494,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8581,8 +8581,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8713,8 +8713,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8855,8 +8855,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8962,8 +8962,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9094,8 +9094,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9206,8 +9206,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9323,7 +9323,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9373,7 +9373,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9423,8 +9423,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725IE.json b/data/chips/STM32H725IE.json index 86df794..52364fa 100644 --- a/data/chips/STM32H725IE.json +++ b/data/chips/STM32H725IE.json @@ -9343,8 +9343,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9650,7 +9650,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9715,7 +9715,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9770,7 +9770,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9825,7 +9825,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9942,7 +9942,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10029,7 +10029,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10116,8 +10116,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10248,8 +10248,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10390,8 +10390,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10497,8 +10497,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10629,8 +10629,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10741,8 +10741,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10863,7 +10863,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10913,7 +10913,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10963,8 +10963,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725IG.json b/data/chips/STM32H725IG.json index b772763..65743d8 100644 --- a/data/chips/STM32H725IG.json +++ b/data/chips/STM32H725IG.json @@ -9349,8 +9349,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9656,7 +9656,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9721,7 +9721,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9776,7 +9776,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9831,7 +9831,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9948,7 +9948,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10035,7 +10035,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10122,8 +10122,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10254,8 +10254,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10396,8 +10396,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10503,8 +10503,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10635,8 +10635,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10747,8 +10747,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10869,7 +10869,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10919,7 +10919,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10969,8 +10969,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725RE.json b/data/chips/STM32H725RE.json index 327e638..8621077 100644 --- a/data/chips/STM32H725RE.json +++ b/data/chips/STM32H725RE.json @@ -4529,8 +4529,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4701,7 +4701,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4756,7 +4756,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4806,7 +4806,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4856,7 +4856,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -4953,7 +4953,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5025,7 +5025,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5097,8 +5097,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5224,8 +5224,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5306,8 +5306,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5388,8 +5388,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5515,8 +5515,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5602,8 +5602,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5704,7 +5704,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5754,7 +5754,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5804,8 +5804,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725RG.json b/data/chips/STM32H725RG.json index f43aa41..820a3d4 100644 --- a/data/chips/STM32H725RG.json +++ b/data/chips/STM32H725RG.json @@ -4535,8 +4535,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4707,7 +4707,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4762,7 +4762,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4812,7 +4812,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4862,7 +4862,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -4959,7 +4959,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5031,7 +5031,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5103,8 +5103,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5230,8 +5230,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5312,8 +5312,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5394,8 +5394,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5521,8 +5521,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5608,8 +5608,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5710,7 +5710,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5760,7 +5760,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5810,8 +5810,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725VE.json b/data/chips/STM32H725VE.json index d783169..102523b 100644 --- a/data/chips/STM32H725VE.json +++ b/data/chips/STM32H725VE.json @@ -6819,8 +6819,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7026,7 +7026,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7081,7 +7081,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7131,7 +7131,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7181,7 +7181,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7298,7 +7298,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7370,7 +7370,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7442,8 +7442,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7574,8 +7574,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7656,8 +7656,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7738,8 +7738,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7870,8 +7870,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7982,8 +7982,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8084,7 +8084,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8134,7 +8134,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8184,8 +8184,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725VG.json b/data/chips/STM32H725VG.json index b539070..2eb3608 100644 --- a/data/chips/STM32H725VG.json +++ b/data/chips/STM32H725VG.json @@ -7521,8 +7521,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7728,7 +7728,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7783,7 +7783,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7833,7 +7833,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7883,7 +7883,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8000,7 +8000,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8072,7 +8072,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8144,8 +8144,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8276,8 +8276,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8358,8 +8358,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8440,8 +8440,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8572,8 +8572,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8684,8 +8684,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8786,7 +8786,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8836,7 +8836,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8886,8 +8886,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725ZE.json b/data/chips/STM32H725ZE.json index a9cb007..4d0217e 100644 --- a/data/chips/STM32H725ZE.json +++ b/data/chips/STM32H725ZE.json @@ -7244,8 +7244,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7486,7 +7486,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7541,7 +7541,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7596,7 +7596,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7651,7 +7651,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7768,7 +7768,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7855,7 +7855,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7942,8 +7942,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8074,8 +8074,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8191,8 +8191,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8283,8 +8283,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8415,8 +8415,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8527,8 +8527,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8629,7 +8629,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8679,7 +8679,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8729,8 +8729,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H725ZG.json b/data/chips/STM32H725ZG.json index 4a49373..9f84096 100644 --- a/data/chips/STM32H725ZG.json +++ b/data/chips/STM32H725ZG.json @@ -7250,8 +7250,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7492,7 +7492,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7547,7 +7547,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7602,7 +7602,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7657,7 +7657,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7774,7 +7774,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7861,7 +7861,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7948,8 +7948,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8080,8 +8080,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8197,8 +8197,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8289,8 +8289,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8421,8 +8421,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8533,8 +8533,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8635,7 +8635,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8685,7 +8685,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8735,8 +8735,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H730AB.json b/data/chips/STM32H730AB.json index 3b72fbd..9c38244 100644 --- a/data/chips/STM32H730AB.json +++ b/data/chips/STM32H730AB.json @@ -7978,8 +7978,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8240,7 +8240,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8295,7 +8295,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8350,7 +8350,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8405,7 +8405,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8522,7 +8522,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8609,7 +8609,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8696,8 +8696,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8828,8 +8828,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8970,8 +8970,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9077,8 +9077,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9209,8 +9209,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9321,8 +9321,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9438,7 +9438,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9488,7 +9488,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9538,8 +9538,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H730IB.json b/data/chips/STM32H730IB.json index b1b57ee..034fcd4 100644 --- a/data/chips/STM32H730IB.json +++ b/data/chips/STM32H730IB.json @@ -9464,8 +9464,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9771,7 +9771,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9836,7 +9836,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9891,7 +9891,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9946,7 +9946,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -10063,7 +10063,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10150,7 +10150,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10237,8 +10237,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10369,8 +10369,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10511,8 +10511,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10618,8 +10618,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10750,8 +10750,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10862,8 +10862,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10984,7 +10984,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -11034,7 +11034,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -11084,8 +11084,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H730VB.json b/data/chips/STM32H730VB.json index d6bcb81..701e598 100644 --- a/data/chips/STM32H730VB.json +++ b/data/chips/STM32H730VB.json @@ -7089,8 +7089,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7331,7 +7331,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7386,7 +7386,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7436,7 +7436,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7486,7 +7486,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7603,7 +7603,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7675,7 +7675,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7747,8 +7747,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7879,8 +7879,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7961,8 +7961,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8043,8 +8043,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8175,8 +8175,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8287,8 +8287,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8389,7 +8389,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8439,7 +8439,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8489,8 +8489,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H730ZB.json b/data/chips/STM32H730ZB.json index 937ff46..5ec8eb3 100644 --- a/data/chips/STM32H730ZB.json +++ b/data/chips/STM32H730ZB.json @@ -8492,8 +8492,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8754,7 +8754,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8809,7 +8809,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8864,7 +8864,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8919,7 +8919,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9036,7 +9036,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9123,7 +9123,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9210,8 +9210,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9342,8 +9342,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9484,8 +9484,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9591,8 +9591,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9723,8 +9723,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9835,8 +9835,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9937,7 +9937,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9987,7 +9987,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10037,8 +10037,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H733VG.json b/data/chips/STM32H733VG.json index 69c67b8..72c14d3 100644 --- a/data/chips/STM32H733VG.json +++ b/data/chips/STM32H733VG.json @@ -7089,8 +7089,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7331,7 +7331,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7386,7 +7386,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7436,7 +7436,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7486,7 +7486,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7603,7 +7603,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7675,7 +7675,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7747,8 +7747,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7879,8 +7879,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7961,8 +7961,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8043,8 +8043,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8175,8 +8175,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8287,8 +8287,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8389,7 +8389,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8439,7 +8439,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8489,8 +8489,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H733ZG.json b/data/chips/STM32H733ZG.json index ecc9fed..1aa252c 100644 --- a/data/chips/STM32H733ZG.json +++ b/data/chips/STM32H733ZG.json @@ -8492,8 +8492,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8754,7 +8754,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8809,7 +8809,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8864,7 +8864,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8919,7 +8919,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9036,7 +9036,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9123,7 +9123,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9210,8 +9210,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9342,8 +9342,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9484,8 +9484,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9591,8 +9591,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9723,8 +9723,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9835,8 +9835,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9937,7 +9937,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9987,7 +9987,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10037,8 +10037,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H735AG.json b/data/chips/STM32H735AG.json index 348ecd2..11180fd 100644 --- a/data/chips/STM32H735AG.json +++ b/data/chips/STM32H735AG.json @@ -7983,8 +7983,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8245,7 +8245,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8300,7 +8300,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8355,7 +8355,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8410,7 +8410,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8527,7 +8527,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8614,7 +8614,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8701,8 +8701,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8833,8 +8833,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8975,8 +8975,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9082,8 +9082,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9214,8 +9214,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9326,8 +9326,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9443,7 +9443,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9493,7 +9493,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9543,8 +9543,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H735IG.json b/data/chips/STM32H735IG.json index 4bf1755..2393cc6 100644 --- a/data/chips/STM32H735IG.json +++ b/data/chips/STM32H735IG.json @@ -9469,8 +9469,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9776,7 +9776,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9841,7 +9841,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9896,7 +9896,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9951,7 +9951,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -10068,7 +10068,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10155,7 +10155,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -10242,8 +10242,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10374,8 +10374,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10516,8 +10516,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10623,8 +10623,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10755,8 +10755,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10867,8 +10867,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10989,7 +10989,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -11039,7 +11039,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -11089,8 +11089,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H735RG.json b/data/chips/STM32H735RG.json index c31849c..b817ddc 100644 --- a/data/chips/STM32H735RG.json +++ b/data/chips/STM32H735RG.json @@ -4560,8 +4560,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4732,7 +4732,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4787,7 +4787,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4837,7 +4837,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4887,7 +4887,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -4984,7 +4984,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5056,7 +5056,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5128,8 +5128,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5255,8 +5255,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5337,8 +5337,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5419,8 +5419,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5546,8 +5546,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5633,8 +5633,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5735,7 +5735,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5785,7 +5785,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5835,8 +5835,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H735VG.json b/data/chips/STM32H735VG.json index 1896f3e..b30d35b 100644 --- a/data/chips/STM32H735VG.json +++ b/data/chips/STM32H735VG.json @@ -7641,8 +7641,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7848,7 +7848,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7903,7 +7903,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7953,7 +7953,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8003,7 +8003,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8120,7 +8120,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8192,7 +8192,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8264,8 +8264,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8396,8 +8396,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8478,8 +8478,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8560,8 +8560,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8692,8 +8692,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8804,8 +8804,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8906,7 +8906,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8956,7 +8956,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9006,8 +9006,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H735ZG.json b/data/chips/STM32H735ZG.json index 2a8119d..c21f400 100644 --- a/data/chips/STM32H735ZG.json +++ b/data/chips/STM32H735ZG.json @@ -7370,8 +7370,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7612,7 +7612,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7667,7 +7667,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7722,7 +7722,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7777,7 +7777,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7894,7 +7894,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7981,7 +7981,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8068,8 +8068,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8200,8 +8200,8 @@ "address": 1073799168, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8317,8 +8317,8 @@ "address": 1073800192, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8409,8 +8409,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8541,8 +8541,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8653,8 +8653,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8755,7 +8755,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8805,7 +8805,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8855,8 +8855,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742AG.json b/data/chips/STM32H742AG.json index 8941a7d..93ae010 100644 --- a/data/chips/STM32H742AG.json +++ b/data/chips/STM32H742AG.json @@ -7011,8 +7011,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7268,7 +7268,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7323,7 +7323,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7378,7 +7378,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7433,7 +7433,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7540,7 +7540,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7627,7 +7627,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7714,8 +7714,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7846,8 +7846,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7978,8 +7978,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8090,8 +8090,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8212,7 +8212,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8262,7 +8262,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8312,8 +8312,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742AI.json b/data/chips/STM32H742AI.json index b7a723d..c8cbad9 100644 --- a/data/chips/STM32H742AI.json +++ b/data/chips/STM32H742AI.json @@ -7011,8 +7011,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7268,7 +7268,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7323,7 +7323,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7378,7 +7378,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7433,7 +7433,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7540,7 +7540,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7627,7 +7627,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7714,8 +7714,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7846,8 +7846,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7978,8 +7978,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8090,8 +8090,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8212,7 +8212,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8262,7 +8262,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8312,8 +8312,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742BG.json b/data/chips/STM32H742BG.json index 5e75de2..53a6b08 100644 --- a/data/chips/STM32H742BG.json +++ b/data/chips/STM32H742BG.json @@ -7438,8 +7438,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7740,7 +7740,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7805,7 +7805,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7860,7 +7860,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7915,7 +7915,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8022,7 +8022,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8109,7 +8109,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8196,8 +8196,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8328,8 +8328,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8460,8 +8460,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8572,8 +8572,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8699,7 +8699,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8749,7 +8749,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8799,8 +8799,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742BI.json b/data/chips/STM32H742BI.json index 088e6a0..719c06e 100644 --- a/data/chips/STM32H742BI.json +++ b/data/chips/STM32H742BI.json @@ -7438,8 +7438,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7740,7 +7740,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7805,7 +7805,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7860,7 +7860,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7915,7 +7915,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8022,7 +8022,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8109,7 +8109,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8196,8 +8196,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8328,8 +8328,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8460,8 +8460,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8572,8 +8572,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8699,7 +8699,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8749,7 +8749,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8799,8 +8799,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742IG.json b/data/chips/STM32H742IG.json index b8a2f8a..1260dbf 100644 --- a/data/chips/STM32H742IG.json +++ b/data/chips/STM32H742IG.json @@ -8433,8 +8433,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8690,7 +8690,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8755,7 +8755,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8810,7 +8810,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8865,7 +8865,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8972,7 +8972,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9059,7 +9059,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9146,8 +9146,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9278,8 +9278,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9410,8 +9410,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9522,8 +9522,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9649,7 +9649,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9699,7 +9699,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9749,8 +9749,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742II.json b/data/chips/STM32H742II.json index 0e130ed..6b5db70 100644 --- a/data/chips/STM32H742II.json +++ b/data/chips/STM32H742II.json @@ -8433,8 +8433,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8690,7 +8690,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8755,7 +8755,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8810,7 +8810,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8865,7 +8865,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8972,7 +8972,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9059,7 +9059,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9146,8 +9146,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9278,8 +9278,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9410,8 +9410,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9522,8 +9522,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9649,7 +9649,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9699,7 +9699,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9749,8 +9749,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742VG.json b/data/chips/STM32H742VG.json index 67dd21c..d5679cc 100644 --- a/data/chips/STM32H742VG.json +++ b/data/chips/STM32H742VG.json @@ -6332,8 +6332,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6569,7 +6569,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6624,7 +6624,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6674,7 +6674,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6724,7 +6724,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6831,7 +6831,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6903,7 +6903,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6975,8 +6975,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7107,8 +7107,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7239,8 +7239,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7351,8 +7351,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7453,7 +7453,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7503,7 +7503,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7553,8 +7553,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742VI.json b/data/chips/STM32H742VI.json index c5fd4b9..0a8d9d8 100644 --- a/data/chips/STM32H742VI.json +++ b/data/chips/STM32H742VI.json @@ -6332,8 +6332,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6569,7 +6569,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6624,7 +6624,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6674,7 +6674,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6724,7 +6724,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6831,7 +6831,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6903,7 +6903,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6975,8 +6975,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7107,8 +7107,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7239,8 +7239,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7351,8 +7351,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7453,7 +7453,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7503,7 +7503,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7553,8 +7553,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742XG.json b/data/chips/STM32H742XG.json index 8005ca7..fc7e220 100644 --- a/data/chips/STM32H742XG.json +++ b/data/chips/STM32H742XG.json @@ -7844,8 +7844,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8146,7 +8146,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8211,7 +8211,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8266,7 +8266,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8321,7 +8321,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8428,7 +8428,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8515,7 +8515,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8602,8 +8602,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8734,8 +8734,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8866,8 +8866,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8978,8 +8978,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9105,7 +9105,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9155,7 +9155,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9205,8 +9205,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742XI.json b/data/chips/STM32H742XI.json index b60667e..1f9a2bb 100644 --- a/data/chips/STM32H742XI.json +++ b/data/chips/STM32H742XI.json @@ -7844,8 +7844,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8146,7 +8146,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8211,7 +8211,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8266,7 +8266,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8321,7 +8321,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8428,7 +8428,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8515,7 +8515,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8602,8 +8602,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8734,8 +8734,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8866,8 +8866,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8978,8 +8978,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9105,7 +9105,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9155,7 +9155,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9205,8 +9205,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742ZG.json b/data/chips/STM32H742ZG.json index d826085..6fec017 100644 --- a/data/chips/STM32H742ZG.json +++ b/data/chips/STM32H742ZG.json @@ -6604,8 +6604,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6861,7 +6861,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6916,7 +6916,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6971,7 +6971,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7026,7 +7026,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7133,7 +7133,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7220,7 +7220,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7307,8 +7307,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7439,8 +7439,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7571,8 +7571,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7683,8 +7683,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7785,7 +7785,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7835,7 +7835,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7885,8 +7885,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H742ZI.json b/data/chips/STM32H742ZI.json index 2e18c0b..fdc0cc3 100644 --- a/data/chips/STM32H742ZI.json +++ b/data/chips/STM32H742ZI.json @@ -6604,8 +6604,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6861,7 +6861,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6916,7 +6916,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6971,7 +6971,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7026,7 +7026,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7133,7 +7133,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7220,7 +7220,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7307,8 +7307,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7439,8 +7439,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7571,8 +7571,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7683,8 +7683,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7785,7 +7785,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7835,7 +7835,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7885,8 +7885,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743AG.json b/data/chips/STM32H743AG.json index a7742fc..2e4f8f1 100644 --- a/data/chips/STM32H743AG.json +++ b/data/chips/STM32H743AG.json @@ -7440,8 +7440,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7697,7 +7697,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7752,7 +7752,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7807,7 +7807,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7862,7 +7862,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7969,7 +7969,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8056,7 +8056,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8143,8 +8143,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8275,8 +8275,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8407,8 +8407,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8519,8 +8519,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8641,7 +8641,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8691,7 +8691,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8741,8 +8741,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743AI.json b/data/chips/STM32H743AI.json index 80c08f1..1fa16c2 100644 --- a/data/chips/STM32H743AI.json +++ b/data/chips/STM32H743AI.json @@ -7440,8 +7440,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7697,7 +7697,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7752,7 +7752,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7807,7 +7807,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7862,7 +7862,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7969,7 +7969,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8056,7 +8056,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8143,8 +8143,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8275,8 +8275,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8407,8 +8407,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8519,8 +8519,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8641,7 +8641,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8691,7 +8691,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8741,8 +8741,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743BG.json b/data/chips/STM32H743BG.json index 7dc6bd4..ac54267 100644 --- a/data/chips/STM32H743BG.json +++ b/data/chips/STM32H743BG.json @@ -8047,8 +8047,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8349,7 +8349,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8414,7 +8414,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8469,7 +8469,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8524,7 +8524,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8631,7 +8631,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8718,7 +8718,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8805,8 +8805,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8937,8 +8937,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9069,8 +9069,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9181,8 +9181,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9308,7 +9308,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9358,7 +9358,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9408,8 +9408,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743BI.json b/data/chips/STM32H743BI.json index ef5307f..3d5fadb 100644 --- a/data/chips/STM32H743BI.json +++ b/data/chips/STM32H743BI.json @@ -8047,8 +8047,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8349,7 +8349,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8414,7 +8414,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8469,7 +8469,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8524,7 +8524,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8631,7 +8631,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8718,7 +8718,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8805,8 +8805,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8937,8 +8937,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9069,8 +9069,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9181,8 +9181,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9308,7 +9308,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9358,7 +9358,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9408,8 +9408,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743IG.json b/data/chips/STM32H743IG.json index 6600d4d..626cd1c 100644 --- a/data/chips/STM32H743IG.json +++ b/data/chips/STM32H743IG.json @@ -8882,8 +8882,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9139,7 +9139,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9204,7 +9204,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9259,7 +9259,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9314,7 +9314,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9421,7 +9421,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9508,7 +9508,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9595,8 +9595,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9727,8 +9727,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9859,8 +9859,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9971,8 +9971,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10098,7 +10098,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10148,7 +10148,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10198,8 +10198,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743II.json b/data/chips/STM32H743II.json index 32d92be..feeb7cd 100644 --- a/data/chips/STM32H743II.json +++ b/data/chips/STM32H743II.json @@ -8882,8 +8882,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9139,7 +9139,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9204,7 +9204,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9259,7 +9259,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9314,7 +9314,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9421,7 +9421,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9508,7 +9508,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9595,8 +9595,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9727,8 +9727,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9859,8 +9859,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9971,8 +9971,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10098,7 +10098,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10148,7 +10148,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10198,8 +10198,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743VG.json b/data/chips/STM32H743VG.json index a41aa2f..72abd86 100644 --- a/data/chips/STM32H743VG.json +++ b/data/chips/STM32H743VG.json @@ -6616,8 +6616,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6853,7 +6853,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6908,7 +6908,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6958,7 +6958,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7008,7 +7008,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7115,7 +7115,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7187,7 +7187,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7259,8 +7259,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7391,8 +7391,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7523,8 +7523,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7635,8 +7635,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7737,7 +7737,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7787,7 +7787,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7837,8 +7837,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743VI.json b/data/chips/STM32H743VI.json index f8a00d8..fffae41 100644 --- a/data/chips/STM32H743VI.json +++ b/data/chips/STM32H743VI.json @@ -6616,8 +6616,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6853,7 +6853,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6908,7 +6908,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6958,7 +6958,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7008,7 +7008,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7115,7 +7115,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7187,7 +7187,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7259,8 +7259,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7391,8 +7391,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7523,8 +7523,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7635,8 +7635,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7737,7 +7737,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7787,7 +7787,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7837,8 +7837,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743XG.json b/data/chips/STM32H743XG.json index 8f5c479..a5dfffd 100644 --- a/data/chips/STM32H743XG.json +++ b/data/chips/STM32H743XG.json @@ -8453,8 +8453,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8755,7 +8755,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8820,7 +8820,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8875,7 +8875,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8930,7 +8930,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9037,7 +9037,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9124,7 +9124,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9211,8 +9211,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9343,8 +9343,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9475,8 +9475,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9587,8 +9587,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9714,7 +9714,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9764,7 +9764,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9814,8 +9814,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743XI.json b/data/chips/STM32H743XI.json index 17f2a33..e212f9e 100644 --- a/data/chips/STM32H743XI.json +++ b/data/chips/STM32H743XI.json @@ -8453,8 +8453,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8755,7 +8755,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8820,7 +8820,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8875,7 +8875,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8930,7 +8930,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9037,7 +9037,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9124,7 +9124,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9211,8 +9211,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9343,8 +9343,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9475,8 +9475,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9587,8 +9587,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9714,7 +9714,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9764,7 +9764,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9814,8 +9814,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743ZG.json b/data/chips/STM32H743ZG.json index e4d3d1a..87f7e98 100644 --- a/data/chips/STM32H743ZG.json +++ b/data/chips/STM32H743ZG.json @@ -6943,8 +6943,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7200,7 +7200,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7255,7 +7255,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7310,7 +7310,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7365,7 +7365,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7472,7 +7472,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7559,7 +7559,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7646,8 +7646,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7778,8 +7778,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7910,8 +7910,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8022,8 +8022,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8124,7 +8124,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8174,7 +8174,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8224,8 +8224,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H743ZI.json b/data/chips/STM32H743ZI.json index 03fefe6..13b2670 100644 --- a/data/chips/STM32H743ZI.json +++ b/data/chips/STM32H743ZI.json @@ -6943,8 +6943,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7200,7 +7200,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7255,7 +7255,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7310,7 +7310,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7365,7 +7365,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7472,7 +7472,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7559,7 +7559,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7646,8 +7646,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7778,8 +7778,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7910,8 +7910,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8022,8 +8022,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8124,7 +8124,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8174,7 +8174,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8224,8 +8224,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745BG.json b/data/chips/STM32H745BG.json index c2f23f0..c94406b 100644 --- a/data/chips/STM32H745BG.json +++ b/data/chips/STM32H745BG.json @@ -7928,8 +7928,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8230,7 +8230,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8295,7 +8295,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8350,7 +8350,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8405,7 +8405,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8512,7 +8512,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8599,7 +8599,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8686,8 +8686,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8818,8 +8818,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8950,8 +8950,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9062,8 +9062,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9189,7 +9189,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9239,7 +9239,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9289,8 +9289,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17832,8 +17832,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18134,7 +18134,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18199,7 +18199,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18254,7 +18254,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18309,7 +18309,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18416,7 +18416,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18503,7 +18503,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18590,8 +18590,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18722,8 +18722,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18854,8 +18854,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18966,8 +18966,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19093,7 +19093,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19143,7 +19143,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19193,8 +19193,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745BI.json b/data/chips/STM32H745BI.json index 9420534..66d2e67 100644 --- a/data/chips/STM32H745BI.json +++ b/data/chips/STM32H745BI.json @@ -7928,8 +7928,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8230,7 +8230,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8295,7 +8295,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8350,7 +8350,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8405,7 +8405,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8512,7 +8512,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8599,7 +8599,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8686,8 +8686,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8818,8 +8818,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8950,8 +8950,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9062,8 +9062,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9189,7 +9189,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9239,7 +9239,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9289,8 +9289,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17832,8 +17832,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18134,7 +18134,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18199,7 +18199,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18254,7 +18254,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18309,7 +18309,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18416,7 +18416,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18503,7 +18503,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18590,8 +18590,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18722,8 +18722,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18854,8 +18854,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18966,8 +18966,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19093,7 +19093,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19143,7 +19143,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19193,8 +19193,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745IG.json b/data/chips/STM32H745IG.json index 7f78e27..0fd82e0 100644 --- a/data/chips/STM32H745IG.json +++ b/data/chips/STM32H745IG.json @@ -8770,8 +8770,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9072,7 +9072,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9137,7 +9137,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9192,7 +9192,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9247,7 +9247,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9354,7 +9354,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9441,7 +9441,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9528,8 +9528,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9660,8 +9660,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9792,8 +9792,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9904,8 +9904,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10026,7 +10026,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10076,7 +10076,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10126,8 +10126,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18416,8 +18416,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18718,7 +18718,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18783,7 +18783,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18838,7 +18838,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18893,7 +18893,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19000,7 +19000,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19087,7 +19087,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19174,8 +19174,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19306,8 +19306,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19438,8 +19438,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19550,8 +19550,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19672,7 +19672,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19722,7 +19722,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19772,8 +19772,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745II.json b/data/chips/STM32H745II.json index a2d154a..9d72efd 100644 --- a/data/chips/STM32H745II.json +++ b/data/chips/STM32H745II.json @@ -8770,8 +8770,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9072,7 +9072,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9137,7 +9137,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9192,7 +9192,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9247,7 +9247,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9354,7 +9354,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9441,7 +9441,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9528,8 +9528,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9660,8 +9660,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9792,8 +9792,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9904,8 +9904,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10026,7 +10026,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10076,7 +10076,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10126,8 +10126,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18416,8 +18416,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18718,7 +18718,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18783,7 +18783,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18838,7 +18838,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18893,7 +18893,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19000,7 +19000,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19087,7 +19087,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19174,8 +19174,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19306,8 +19306,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19438,8 +19438,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19550,8 +19550,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19672,7 +19672,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19722,7 +19722,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19772,8 +19772,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745XG.json b/data/chips/STM32H745XG.json index 395bdd9..3c7c1ea 100644 --- a/data/chips/STM32H745XG.json +++ b/data/chips/STM32H745XG.json @@ -8444,8 +8444,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8746,7 +8746,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8811,7 +8811,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8866,7 +8866,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8921,7 +8921,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9028,7 +9028,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9115,7 +9115,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9202,8 +9202,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9334,8 +9334,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9466,8 +9466,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9578,8 +9578,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9705,7 +9705,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9755,7 +9755,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9805,8 +9805,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18522,8 +18522,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18824,7 +18824,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18889,7 +18889,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18944,7 +18944,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18999,7 +18999,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19106,7 +19106,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19193,7 +19193,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19280,8 +19280,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19412,8 +19412,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19544,8 +19544,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19656,8 +19656,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19783,7 +19783,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19833,7 +19833,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19883,8 +19883,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745XI.json b/data/chips/STM32H745XI.json index f41ef1f..c435c5d 100644 --- a/data/chips/STM32H745XI.json +++ b/data/chips/STM32H745XI.json @@ -8444,8 +8444,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8746,7 +8746,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8811,7 +8811,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8866,7 +8866,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8921,7 +8921,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9028,7 +9028,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9115,7 +9115,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9202,8 +9202,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9334,8 +9334,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9466,8 +9466,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9578,8 +9578,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9705,7 +9705,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9755,7 +9755,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9805,8 +9805,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18522,8 +18522,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18824,7 +18824,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18889,7 +18889,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18944,7 +18944,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18999,7 +18999,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19106,7 +19106,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19193,7 +19193,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19280,8 +19280,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19412,8 +19412,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19544,8 +19544,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19656,8 +19656,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19783,7 +19783,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19833,7 +19833,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19883,8 +19883,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745ZG.json b/data/chips/STM32H745ZG.json index 3b7bb33..6de1476 100644 --- a/data/chips/STM32H745ZG.json +++ b/data/chips/STM32H745ZG.json @@ -6779,8 +6779,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7016,7 +7016,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7071,7 +7071,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7126,7 +7126,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7181,7 +7181,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7288,7 +7288,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7375,7 +7375,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7462,8 +7462,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7594,8 +7594,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7726,8 +7726,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7838,8 +7838,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7940,7 +7940,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7990,7 +7990,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8040,8 +8040,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15618,8 +15618,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15855,7 +15855,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -15910,7 +15910,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15965,7 +15965,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16020,7 +16020,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16127,7 +16127,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16214,7 +16214,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16301,8 +16301,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16433,8 +16433,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16565,8 +16565,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16677,8 +16677,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16779,7 +16779,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16829,7 +16829,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16879,8 +16879,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H745ZI.json b/data/chips/STM32H745ZI.json index 61c692c..af3cfad 100644 --- a/data/chips/STM32H745ZI.json +++ b/data/chips/STM32H745ZI.json @@ -6779,8 +6779,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7016,7 +7016,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7071,7 +7071,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7126,7 +7126,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7181,7 +7181,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7288,7 +7288,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7375,7 +7375,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7462,8 +7462,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7594,8 +7594,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7726,8 +7726,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7838,8 +7838,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7940,7 +7940,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7990,7 +7990,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8040,8 +8040,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15618,8 +15618,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15855,7 +15855,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -15910,7 +15910,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15965,7 +15965,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16020,7 +16020,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16127,7 +16127,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16214,7 +16214,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16301,8 +16301,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16433,8 +16433,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16565,8 +16565,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16677,8 +16677,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16779,7 +16779,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16829,7 +16829,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16879,8 +16879,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747AG.json b/data/chips/STM32H747AG.json index ed86f45..c9ec0a9 100644 --- a/data/chips/STM32H747AG.json +++ b/data/chips/STM32H747AG.json @@ -7132,8 +7132,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7389,7 +7389,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7444,7 +7444,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7499,7 +7499,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7554,7 +7554,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7661,7 +7661,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7748,7 +7748,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7835,8 +7835,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7967,8 +7967,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8099,8 +8099,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8211,8 +8211,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8313,7 +8313,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8363,7 +8363,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8413,8 +8413,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16232,8 +16232,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16489,7 +16489,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16544,7 +16544,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16599,7 +16599,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16654,7 +16654,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16761,7 +16761,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16848,7 +16848,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16935,8 +16935,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17067,8 +17067,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17199,8 +17199,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17311,8 +17311,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17413,7 +17413,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17463,7 +17463,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17513,8 +17513,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747AI.json b/data/chips/STM32H747AI.json index 39d257a..e4b1b34 100644 --- a/data/chips/STM32H747AI.json +++ b/data/chips/STM32H747AI.json @@ -7132,8 +7132,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7389,7 +7389,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7444,7 +7444,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7499,7 +7499,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7554,7 +7554,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7661,7 +7661,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7748,7 +7748,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7835,8 +7835,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7967,8 +7967,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8099,8 +8099,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8211,8 +8211,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8313,7 +8313,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8363,7 +8363,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8413,8 +8413,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16232,8 +16232,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16489,7 +16489,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16544,7 +16544,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16599,7 +16599,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16654,7 +16654,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16761,7 +16761,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16848,7 +16848,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16935,8 +16935,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17067,8 +17067,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17199,8 +17199,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17311,8 +17311,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17413,7 +17413,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17463,7 +17463,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17513,8 +17513,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747BG.json b/data/chips/STM32H747BG.json index 9ecbfed..adf7844 100644 --- a/data/chips/STM32H747BG.json +++ b/data/chips/STM32H747BG.json @@ -7911,8 +7911,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8168,7 +8168,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8233,7 +8233,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8288,7 +8288,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8343,7 +8343,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8450,7 +8450,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8537,7 +8537,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8624,8 +8624,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8756,8 +8756,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8888,8 +8888,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9000,8 +9000,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9127,7 +9127,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9177,7 +9177,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9227,8 +9227,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17686,8 +17686,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17943,7 +17943,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18008,7 +18008,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18063,7 +18063,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18118,7 +18118,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18225,7 +18225,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18312,7 +18312,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18399,8 +18399,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18531,8 +18531,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18663,8 +18663,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18775,8 +18775,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18902,7 +18902,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -18952,7 +18952,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19002,8 +19002,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747BI.json b/data/chips/STM32H747BI.json index 8fa9598..bb3297f 100644 --- a/data/chips/STM32H747BI.json +++ b/data/chips/STM32H747BI.json @@ -7911,8 +7911,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8168,7 +8168,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8233,7 +8233,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8288,7 +8288,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8343,7 +8343,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8450,7 +8450,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8537,7 +8537,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8624,8 +8624,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8756,8 +8756,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8888,8 +8888,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9000,8 +9000,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9127,7 +9127,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9177,7 +9177,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9227,8 +9227,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17686,8 +17686,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17943,7 +17943,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18008,7 +18008,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18063,7 +18063,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18118,7 +18118,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18225,7 +18225,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18312,7 +18312,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18399,8 +18399,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18531,8 +18531,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18663,8 +18663,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18775,8 +18775,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18902,7 +18902,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -18952,7 +18952,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19002,8 +19002,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747IG.json b/data/chips/STM32H747IG.json index 5e3088a..d784a1c 100644 --- a/data/chips/STM32H747IG.json +++ b/data/chips/STM32H747IG.json @@ -7174,8 +7174,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7431,7 +7431,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7486,7 +7486,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7541,7 +7541,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7596,7 +7596,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7703,7 +7703,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7790,7 +7790,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7877,8 +7877,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8009,8 +8009,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8141,8 +8141,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8253,8 +8253,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8355,7 +8355,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8405,7 +8405,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8455,8 +8455,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16274,8 +16274,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16531,7 +16531,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16586,7 +16586,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16641,7 +16641,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16696,7 +16696,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16803,7 +16803,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16890,7 +16890,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16977,8 +16977,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17109,8 +17109,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17241,8 +17241,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17353,8 +17353,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17455,7 +17455,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17505,7 +17505,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17555,8 +17555,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747II.json b/data/chips/STM32H747II.json index c5d9c26..47c20c4 100644 --- a/data/chips/STM32H747II.json +++ b/data/chips/STM32H747II.json @@ -7174,8 +7174,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7431,7 +7431,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7486,7 +7486,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7541,7 +7541,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7596,7 +7596,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7703,7 +7703,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7790,7 +7790,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7877,8 +7877,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8009,8 +8009,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8141,8 +8141,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8253,8 +8253,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8355,7 +8355,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8405,7 +8405,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8455,8 +8455,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16274,8 +16274,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16531,7 +16531,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16586,7 +16586,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16641,7 +16641,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16696,7 +16696,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16803,7 +16803,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16890,7 +16890,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16977,8 +16977,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17109,8 +17109,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17241,8 +17241,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17353,8 +17353,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17455,7 +17455,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17505,7 +17505,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17555,8 +17555,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747XG.json b/data/chips/STM32H747XG.json index f80254c..dee80bc 100644 --- a/data/chips/STM32H747XG.json +++ b/data/chips/STM32H747XG.json @@ -8497,8 +8497,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8799,7 +8799,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8864,7 +8864,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8919,7 +8919,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8974,7 +8974,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9081,7 +9081,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9168,7 +9168,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9255,8 +9255,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9387,8 +9387,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9519,8 +9519,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9631,8 +9631,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9758,7 +9758,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9808,7 +9808,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9858,8 +9858,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18626,8 +18626,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18928,7 +18928,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18993,7 +18993,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19048,7 +19048,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19103,7 +19103,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19210,7 +19210,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19297,7 +19297,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19384,8 +19384,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19516,8 +19516,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19648,8 +19648,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19760,8 +19760,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19887,7 +19887,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19937,7 +19937,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19987,8 +19987,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747XI.json b/data/chips/STM32H747XI.json index 7b65887..1617133 100644 --- a/data/chips/STM32H747XI.json +++ b/data/chips/STM32H747XI.json @@ -8497,8 +8497,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8799,7 +8799,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8864,7 +8864,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8919,7 +8919,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8974,7 +8974,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9081,7 +9081,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9168,7 +9168,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9255,8 +9255,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9387,8 +9387,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9519,8 +9519,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9631,8 +9631,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9758,7 +9758,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9808,7 +9808,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9858,8 +9858,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18626,8 +18626,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18928,7 +18928,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18993,7 +18993,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19048,7 +19048,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19103,7 +19103,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19210,7 +19210,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19297,7 +19297,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19384,8 +19384,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19516,8 +19516,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19648,8 +19648,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19760,8 +19760,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19887,7 +19887,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19937,7 +19937,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19987,8 +19987,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H747ZI.json b/data/chips/STM32H747ZI.json index c56c234..0526898 100644 --- a/data/chips/STM32H747ZI.json +++ b/data/chips/STM32H747ZI.json @@ -6608,8 +6608,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6865,7 +6865,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6920,7 +6920,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6970,7 +6970,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7020,7 +7020,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7127,7 +7127,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7199,7 +7199,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7271,8 +7271,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7403,8 +7403,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7535,8 +7535,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7647,8 +7647,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7749,7 +7749,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7799,7 +7799,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7849,8 +7849,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15162,8 +15162,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15419,7 +15419,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -15474,7 +15474,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15524,7 +15524,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15574,7 +15574,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -15681,7 +15681,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -15753,7 +15753,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -15825,8 +15825,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -15957,8 +15957,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16089,8 +16089,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16201,8 +16201,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16303,7 +16303,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16353,7 +16353,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16403,8 +16403,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H750IB.json b/data/chips/STM32H750IB.json index e7fb1a9..2db1c10 100644 --- a/data/chips/STM32H750IB.json +++ b/data/chips/STM32H750IB.json @@ -8927,8 +8927,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9184,7 +9184,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9249,7 +9249,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9304,7 +9304,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9359,7 +9359,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9466,7 +9466,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9553,7 +9553,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9640,8 +9640,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9772,8 +9772,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9904,8 +9904,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10016,8 +10016,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10143,7 +10143,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10193,7 +10193,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10243,8 +10243,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H750VB.json b/data/chips/STM32H750VB.json index 17a5225..0c77ee9 100644 --- a/data/chips/STM32H750VB.json +++ b/data/chips/STM32H750VB.json @@ -6055,8 +6055,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6292,7 +6292,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6347,7 +6347,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6397,7 +6397,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6447,7 +6447,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6554,7 +6554,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6626,7 +6626,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6698,8 +6698,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6830,8 +6830,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6962,8 +6962,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7074,8 +7074,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7176,7 +7176,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7226,7 +7226,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7276,8 +7276,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H750XB.json b/data/chips/STM32H750XB.json index e16edbf..7bd6796 100644 --- a/data/chips/STM32H750XB.json +++ b/data/chips/STM32H750XB.json @@ -8498,8 +8498,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8800,7 +8800,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8865,7 +8865,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8920,7 +8920,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8975,7 +8975,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9082,7 +9082,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9169,7 +9169,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9256,8 +9256,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9388,8 +9388,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9520,8 +9520,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9632,8 +9632,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9759,7 +9759,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9809,7 +9809,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9859,8 +9859,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H750ZB.json b/data/chips/STM32H750ZB.json index 525d618..6066b47 100644 --- a/data/chips/STM32H750ZB.json +++ b/data/chips/STM32H750ZB.json @@ -6976,8 +6976,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7233,7 +7233,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7288,7 +7288,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7343,7 +7343,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7398,7 +7398,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7505,7 +7505,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7592,7 +7592,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7679,8 +7679,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7811,8 +7811,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7943,8 +7943,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8055,8 +8055,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8157,7 +8157,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8207,7 +8207,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8257,8 +8257,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753AI.json b/data/chips/STM32H753AI.json index 5e615a9..a6827b2 100644 --- a/data/chips/STM32H753AI.json +++ b/data/chips/STM32H753AI.json @@ -7519,8 +7519,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7776,7 +7776,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7831,7 +7831,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7886,7 +7886,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7941,7 +7941,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8048,7 +8048,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8135,7 +8135,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8222,8 +8222,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8354,8 +8354,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8486,8 +8486,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8598,8 +8598,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8720,7 +8720,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8770,7 +8770,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8820,8 +8820,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753BI.json b/data/chips/STM32H753BI.json index 2d9c3a5..ad86144 100644 --- a/data/chips/STM32H753BI.json +++ b/data/chips/STM32H753BI.json @@ -8126,8 +8126,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8428,7 +8428,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8493,7 +8493,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8548,7 +8548,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8603,7 +8603,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8710,7 +8710,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8797,7 +8797,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8884,8 +8884,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9016,8 +9016,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9148,8 +9148,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9260,8 +9260,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9387,7 +9387,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9437,7 +9437,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9487,8 +9487,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753II.json b/data/chips/STM32H753II.json index 2dd5cfb..ff2e913 100644 --- a/data/chips/STM32H753II.json +++ b/data/chips/STM32H753II.json @@ -8961,8 +8961,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9218,7 +9218,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9283,7 +9283,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9338,7 +9338,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9393,7 +9393,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9500,7 +9500,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9587,7 +9587,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9674,8 +9674,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9806,8 +9806,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9938,8 +9938,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10050,8 +10050,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10177,7 +10177,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10227,7 +10227,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10277,8 +10277,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753VI.json b/data/chips/STM32H753VI.json index 7c48a56..0dd7ca5 100644 --- a/data/chips/STM32H753VI.json +++ b/data/chips/STM32H753VI.json @@ -6695,8 +6695,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6932,7 +6932,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6987,7 +6987,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7037,7 +7037,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7087,7 +7087,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7194,7 +7194,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7266,7 +7266,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7338,8 +7338,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7470,8 +7470,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7602,8 +7602,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7714,8 +7714,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7816,7 +7816,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7866,7 +7866,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7916,8 +7916,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753XI.json b/data/chips/STM32H753XI.json index e60a528..54ae425 100644 --- a/data/chips/STM32H753XI.json +++ b/data/chips/STM32H753XI.json @@ -8532,8 +8532,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8834,7 +8834,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8899,7 +8899,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8954,7 +8954,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9009,7 +9009,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9116,7 +9116,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9203,7 +9203,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9290,8 +9290,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9422,8 +9422,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9554,8 +9554,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9666,8 +9666,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9793,7 +9793,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9843,7 +9843,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9893,8 +9893,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H753ZI.json b/data/chips/STM32H753ZI.json index c415bdd..8a543bf 100644 --- a/data/chips/STM32H753ZI.json +++ b/data/chips/STM32H753ZI.json @@ -7022,8 +7022,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7279,7 +7279,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7334,7 +7334,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7389,7 +7389,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7444,7 +7444,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7551,7 +7551,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7638,7 +7638,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7725,8 +7725,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7857,8 +7857,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7989,8 +7989,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8101,8 +8101,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8203,7 +8203,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8253,7 +8253,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8303,8 +8303,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H755BI.json b/data/chips/STM32H755BI.json index e253e39..46d0277 100644 --- a/data/chips/STM32H755BI.json +++ b/data/chips/STM32H755BI.json @@ -8007,8 +8007,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8309,7 +8309,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8374,7 +8374,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8429,7 +8429,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8484,7 +8484,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8591,7 +8591,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8678,7 +8678,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8765,8 +8765,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8897,8 +8897,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9029,8 +9029,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9141,8 +9141,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9268,7 +9268,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9318,7 +9318,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9368,8 +9368,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17988,8 +17988,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18290,7 +18290,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18355,7 +18355,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18410,7 +18410,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18465,7 +18465,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18572,7 +18572,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18659,7 +18659,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18746,8 +18746,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18878,8 +18878,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19010,8 +19010,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19122,8 +19122,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19249,7 +19249,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19299,7 +19299,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19349,8 +19349,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H755II.json b/data/chips/STM32H755II.json index 8ea2924..b4248fa 100644 --- a/data/chips/STM32H755II.json +++ b/data/chips/STM32H755II.json @@ -8849,8 +8849,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9151,7 +9151,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9216,7 +9216,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9271,7 +9271,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9326,7 +9326,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9433,7 +9433,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9520,7 +9520,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9607,8 +9607,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9739,8 +9739,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9871,8 +9871,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9983,8 +9983,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10105,7 +10105,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10155,7 +10155,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10205,8 +10205,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18572,8 +18572,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18874,7 +18874,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18939,7 +18939,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18994,7 +18994,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19049,7 +19049,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19156,7 +19156,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19243,7 +19243,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19330,8 +19330,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19462,8 +19462,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19594,8 +19594,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19706,8 +19706,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19828,7 +19828,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19878,7 +19878,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19928,8 +19928,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H755XI.json b/data/chips/STM32H755XI.json index 93b21ac..ef0cdbf 100644 --- a/data/chips/STM32H755XI.json +++ b/data/chips/STM32H755XI.json @@ -8523,8 +8523,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8825,7 +8825,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8890,7 +8890,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8945,7 +8945,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9000,7 +9000,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9107,7 +9107,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9194,7 +9194,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9281,8 +9281,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9413,8 +9413,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9545,8 +9545,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9657,8 +9657,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9784,7 +9784,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9834,7 +9834,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9884,8 +9884,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18678,8 +18678,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18980,7 +18980,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -19045,7 +19045,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19100,7 +19100,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19155,7 +19155,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19262,7 +19262,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19349,7 +19349,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19436,8 +19436,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19568,8 +19568,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19700,8 +19700,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19812,8 +19812,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19939,7 +19939,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19989,7 +19989,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -20039,8 +20039,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H755ZI.json b/data/chips/STM32H755ZI.json index 85e08a7..86c7b5f 100644 --- a/data/chips/STM32H755ZI.json +++ b/data/chips/STM32H755ZI.json @@ -6858,8 +6858,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7095,7 +7095,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7150,7 +7150,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7205,7 +7205,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7260,7 +7260,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7367,7 +7367,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7454,7 +7454,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7541,8 +7541,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7673,8 +7673,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7805,8 +7805,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7917,8 +7917,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8019,7 +8019,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8069,7 +8069,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8119,8 +8119,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15774,8 +15774,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16011,7 +16011,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16066,7 +16066,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16121,7 +16121,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16176,7 +16176,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16283,7 +16283,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16370,7 +16370,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -16457,8 +16457,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16589,8 +16589,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16721,8 +16721,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16833,8 +16833,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16935,7 +16935,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16985,7 +16985,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17035,8 +17035,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H757AI.json b/data/chips/STM32H757AI.json index f2edd2f..42f1c74 100644 --- a/data/chips/STM32H757AI.json +++ b/data/chips/STM32H757AI.json @@ -7211,8 +7211,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7468,7 +7468,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7523,7 +7523,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7578,7 +7578,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7633,7 +7633,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7740,7 +7740,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7827,7 +7827,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7914,8 +7914,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8046,8 +8046,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8178,8 +8178,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8290,8 +8290,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8392,7 +8392,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8442,7 +8442,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8492,8 +8492,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16388,8 +16388,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16645,7 +16645,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16700,7 +16700,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16755,7 +16755,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16810,7 +16810,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16917,7 +16917,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -17004,7 +17004,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -17091,8 +17091,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17223,8 +17223,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17355,8 +17355,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17467,8 +17467,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17569,7 +17569,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17619,7 +17619,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17669,8 +17669,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H757BI.json b/data/chips/STM32H757BI.json index 97293da..8869fac 100644 --- a/data/chips/STM32H757BI.json +++ b/data/chips/STM32H757BI.json @@ -7990,8 +7990,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8247,7 +8247,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8312,7 +8312,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8367,7 +8367,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8422,7 +8422,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8529,7 +8529,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8616,7 +8616,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8703,8 +8703,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8835,8 +8835,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8967,8 +8967,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9079,8 +9079,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9206,7 +9206,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9256,7 +9256,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9306,8 +9306,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -17842,8 +17842,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18099,7 +18099,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -18164,7 +18164,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18219,7 +18219,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -18274,7 +18274,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -18381,7 +18381,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18468,7 +18468,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -18555,8 +18555,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18687,8 +18687,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18819,8 +18819,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -18931,8 +18931,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19058,7 +19058,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19108,7 +19108,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -19158,8 +19158,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H757II.json b/data/chips/STM32H757II.json index 3df73cc..b8f69dc 100644 --- a/data/chips/STM32H757II.json +++ b/data/chips/STM32H757II.json @@ -7253,8 +7253,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7510,7 +7510,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7565,7 +7565,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7620,7 +7620,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7675,7 +7675,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7782,7 +7782,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7869,7 +7869,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7956,8 +7956,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8088,8 +8088,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8220,8 +8220,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8332,8 +8332,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8434,7 +8434,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8484,7 +8484,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8534,8 +8534,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16430,8 +16430,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -16687,7 +16687,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -16742,7 +16742,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16797,7 +16797,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -16852,7 +16852,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -16959,7 +16959,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -17046,7 +17046,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -17133,8 +17133,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17265,8 +17265,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17397,8 +17397,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17509,8 +17509,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -17611,7 +17611,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17661,7 +17661,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -17711,8 +17711,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H757XI.json b/data/chips/STM32H757XI.json index 242f134..24cc370 100644 --- a/data/chips/STM32H757XI.json +++ b/data/chips/STM32H757XI.json @@ -8576,8 +8576,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8878,7 +8878,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8943,7 +8943,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8998,7 +8998,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9053,7 +9053,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9160,7 +9160,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9247,7 +9247,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9334,8 +9334,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9466,8 +9466,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9598,8 +9598,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9710,8 +9710,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9837,7 +9837,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9887,7 +9887,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9937,8 +9937,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -18782,8 +18782,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -19084,7 +19084,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -19149,7 +19149,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19204,7 +19204,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -19259,7 +19259,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -19366,7 +19366,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19453,7 +19453,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -19540,8 +19540,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19672,8 +19672,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19804,8 +19804,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -19916,8 +19916,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -20043,7 +20043,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -20093,7 +20093,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -20143,8 +20143,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H757ZI.json b/data/chips/STM32H757ZI.json index eb73646..f79bdc7 100644 --- a/data/chips/STM32H757ZI.json +++ b/data/chips/STM32H757ZI.json @@ -6687,8 +6687,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6944,7 +6944,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6999,7 +6999,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7049,7 +7049,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7099,7 +7099,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7206,7 +7206,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7278,7 +7278,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7350,8 +7350,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7482,8 +7482,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7614,8 +7614,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7726,8 +7726,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7828,7 +7828,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7878,7 +7878,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7928,8 +7928,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15318,8 +15318,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -15575,7 +15575,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -15630,7 +15630,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15680,7 +15680,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -15730,7 +15730,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -15837,7 +15837,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -15909,7 +15909,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -15981,8 +15981,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16113,8 +16113,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16245,8 +16245,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16357,8 +16357,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -16459,7 +16459,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16509,7 +16509,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -16559,8 +16559,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3AG.json b/data/chips/STM32H7A3AG.json index 60438be..8f6e4fb 100644 --- a/data/chips/STM32H7A3AG.json +++ b/data/chips/STM32H7A3AG.json @@ -7373,8 +7373,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7630,7 +7630,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7685,7 +7685,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7740,7 +7740,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7795,7 +7795,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7912,7 +7912,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7999,7 +7999,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8086,8 +8086,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8218,8 +8218,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8350,8 +8350,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8462,8 +8462,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8579,7 +8579,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8629,7 +8629,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8679,8 +8679,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3AI.json b/data/chips/STM32H7A3AI.json index 032c950..1838c6e 100644 --- a/data/chips/STM32H7A3AI.json +++ b/data/chips/STM32H7A3AI.json @@ -7373,8 +7373,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7630,7 +7630,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7685,7 +7685,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7740,7 +7740,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7795,7 +7795,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7912,7 +7912,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7999,7 +7999,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8086,8 +8086,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8218,8 +8218,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8350,8 +8350,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8462,8 +8462,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8579,7 +8579,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8629,7 +8629,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8679,8 +8679,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3IG.json b/data/chips/STM32H7A3IG.json index 2f1925a..6f44e25 100644 --- a/data/chips/STM32H7A3IG.json +++ b/data/chips/STM32H7A3IG.json @@ -11397,8 +11397,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -11699,7 +11699,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -11764,7 +11764,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11819,7 +11819,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11874,7 +11874,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -11991,7 +11991,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12078,7 +12078,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12165,8 +12165,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12297,8 +12297,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12429,8 +12429,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12541,8 +12541,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12668,7 +12668,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12718,7 +12718,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12768,8 +12768,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3II.json b/data/chips/STM32H7A3II.json index 7231b2b..22b6e42 100644 --- a/data/chips/STM32H7A3II.json +++ b/data/chips/STM32H7A3II.json @@ -11397,8 +11397,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -11699,7 +11699,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -11764,7 +11764,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11819,7 +11819,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11874,7 +11874,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -11991,7 +11991,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12078,7 +12078,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12165,8 +12165,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12297,8 +12297,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12429,8 +12429,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12541,8 +12541,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12668,7 +12668,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12718,7 +12718,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12768,8 +12768,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3LG.json b/data/chips/STM32H7A3LG.json index 117eb77..a3ad043 100644 --- a/data/chips/STM32H7A3LG.json +++ b/data/chips/STM32H7A3LG.json @@ -8369,8 +8369,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8671,7 +8671,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8736,7 +8736,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8791,7 +8791,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8846,7 +8846,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8963,7 +8963,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9050,7 +9050,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9137,8 +9137,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9269,8 +9269,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9401,8 +9401,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9513,8 +9513,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9640,7 +9640,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9690,7 +9690,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9740,8 +9740,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3LI.json b/data/chips/STM32H7A3LI.json index e3262f2..642e87e 100644 --- a/data/chips/STM32H7A3LI.json +++ b/data/chips/STM32H7A3LI.json @@ -8375,8 +8375,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8677,7 +8677,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8742,7 +8742,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8797,7 +8797,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8852,7 +8852,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8969,7 +8969,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9056,7 +9056,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9143,8 +9143,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9275,8 +9275,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9407,8 +9407,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9519,8 +9519,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9646,7 +9646,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9696,7 +9696,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9746,8 +9746,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3NG.json b/data/chips/STM32H7A3NG.json index 8e0f5a7..49ffc8c 100644 --- a/data/chips/STM32H7A3NG.json +++ b/data/chips/STM32H7A3NG.json @@ -8277,8 +8277,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8579,7 +8579,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8644,7 +8644,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8699,7 +8699,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8754,7 +8754,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8871,7 +8871,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8958,7 +8958,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9045,8 +9045,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9177,8 +9177,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9309,8 +9309,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9421,8 +9421,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9548,7 +9548,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9598,7 +9598,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9648,8 +9648,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3NI.json b/data/chips/STM32H7A3NI.json index 6caabee..2fcccc1 100644 --- a/data/chips/STM32H7A3NI.json +++ b/data/chips/STM32H7A3NI.json @@ -8277,8 +8277,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8579,7 +8579,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8644,7 +8644,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8699,7 +8699,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8754,7 +8754,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8871,7 +8871,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8958,7 +8958,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9045,8 +9045,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9177,8 +9177,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9309,8 +9309,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9421,8 +9421,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9548,7 +9548,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9598,7 +9598,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9648,8 +9648,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3QI.json b/data/chips/STM32H7A3QI.json index 981f1ef..43c8fd9 100644 --- a/data/chips/STM32H7A3QI.json +++ b/data/chips/STM32H7A3QI.json @@ -6464,8 +6464,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6701,7 +6701,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6756,7 +6756,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6806,7 +6806,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6856,7 +6856,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6973,7 +6973,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7045,7 +7045,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7117,8 +7117,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7249,8 +7249,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7376,8 +7376,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7488,8 +7488,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7590,7 +7590,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7640,7 +7640,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7690,8 +7690,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3RG.json b/data/chips/STM32H7A3RG.json index 94e25f0..5184245 100644 --- a/data/chips/STM32H7A3RG.json +++ b/data/chips/STM32H7A3RG.json @@ -4622,8 +4622,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4779,7 +4779,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4834,7 +4834,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4884,7 +4884,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4934,7 +4934,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5031,7 +5031,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5103,7 +5103,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5175,8 +5175,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5302,8 +5302,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5429,8 +5429,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5516,8 +5516,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5618,7 +5618,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5668,7 +5668,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5718,8 +5718,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3RI.json b/data/chips/STM32H7A3RI.json index 535c8d6..d97b1c9 100644 --- a/data/chips/STM32H7A3RI.json +++ b/data/chips/STM32H7A3RI.json @@ -4622,8 +4622,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4779,7 +4779,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4834,7 +4834,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4884,7 +4884,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4934,7 +4934,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5031,7 +5031,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5103,7 +5103,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5175,8 +5175,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5302,8 +5302,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5429,8 +5429,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5516,8 +5516,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5618,7 +5618,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5668,7 +5668,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5718,8 +5718,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3VG.json b/data/chips/STM32H7A3VG.json index 95b4c35..cb24480 100644 --- a/data/chips/STM32H7A3VG.json +++ b/data/chips/STM32H7A3VG.json @@ -7855,8 +7855,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8092,7 +8092,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8147,7 +8147,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8197,7 +8197,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8247,7 +8247,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8364,7 +8364,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8436,7 +8436,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8508,8 +8508,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8640,8 +8640,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8772,8 +8772,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8884,8 +8884,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8986,7 +8986,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9036,7 +9036,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9086,8 +9086,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3VI.json b/data/chips/STM32H7A3VI.json index c2f274c..f3f2bf4 100644 --- a/data/chips/STM32H7A3VI.json +++ b/data/chips/STM32H7A3VI.json @@ -7855,8 +7855,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8092,7 +8092,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8147,7 +8147,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8197,7 +8197,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8247,7 +8247,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8364,7 +8364,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8436,7 +8436,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8508,8 +8508,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8640,8 +8640,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8772,8 +8772,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8884,8 +8884,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8986,7 +8986,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9036,7 +9036,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9086,8 +9086,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3ZG.json b/data/chips/STM32H7A3ZG.json index dfad684..c7264ac 100644 --- a/data/chips/STM32H7A3ZG.json +++ b/data/chips/STM32H7A3ZG.json @@ -7889,8 +7889,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8146,7 +8146,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8201,7 +8201,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8256,7 +8256,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8311,7 +8311,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8428,7 +8428,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8515,7 +8515,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8602,8 +8602,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8734,8 +8734,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8866,8 +8866,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8978,8 +8978,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9080,7 +9080,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9130,7 +9130,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9180,8 +9180,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7A3ZI.json b/data/chips/STM32H7A3ZI.json index 53300ce..f8922a9 100644 --- a/data/chips/STM32H7A3ZI.json +++ b/data/chips/STM32H7A3ZI.json @@ -7889,8 +7889,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8146,7 +8146,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8201,7 +8201,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8256,7 +8256,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8311,7 +8311,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8428,7 +8428,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8515,7 +8515,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8602,8 +8602,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8734,8 +8734,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8866,8 +8866,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8978,8 +8978,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9080,7 +9080,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9130,7 +9130,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9180,8 +9180,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B0AB.json b/data/chips/STM32H7B0AB.json index f38d680..1d717a4 100644 --- a/data/chips/STM32H7B0AB.json +++ b/data/chips/STM32H7B0AB.json @@ -7471,8 +7471,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7728,7 +7728,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7783,7 +7783,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7838,7 +7838,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7893,7 +7893,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8010,7 +8010,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8097,7 +8097,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8184,8 +8184,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8316,8 +8316,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8448,8 +8448,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8560,8 +8560,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8677,7 +8677,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8727,7 +8727,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8777,8 +8777,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B0IB.json b/data/chips/STM32H7B0IB.json index 763f254..33fd9a2 100644 --- a/data/chips/STM32H7B0IB.json +++ b/data/chips/STM32H7B0IB.json @@ -9166,8 +9166,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9423,7 +9423,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9488,7 +9488,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9543,7 +9543,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9598,7 +9598,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9715,7 +9715,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9802,7 +9802,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9889,8 +9889,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10021,8 +10021,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10153,8 +10153,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10265,8 +10265,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10392,7 +10392,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10442,7 +10442,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10492,8 +10492,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B0RB.json b/data/chips/STM32H7B0RB.json index 46342d9..9ac1a37 100644 --- a/data/chips/STM32H7B0RB.json +++ b/data/chips/STM32H7B0RB.json @@ -4705,8 +4705,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4862,7 +4862,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4917,7 +4917,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4967,7 +4967,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5017,7 +5017,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5114,7 +5114,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5186,7 +5186,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5258,8 +5258,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5385,8 +5385,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5512,8 +5512,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5599,8 +5599,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5701,7 +5701,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5751,7 +5751,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5801,8 +5801,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B0VB.json b/data/chips/STM32H7B0VB.json index 4ddfce0..a1dd960 100644 --- a/data/chips/STM32H7B0VB.json +++ b/data/chips/STM32H7B0VB.json @@ -6120,8 +6120,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6357,7 +6357,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6412,7 +6412,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6462,7 +6462,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6512,7 +6512,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6629,7 +6629,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6701,7 +6701,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6773,8 +6773,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6905,8 +6905,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7037,8 +7037,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7149,8 +7149,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7251,7 +7251,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7301,7 +7301,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7351,8 +7351,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B0ZB.json b/data/chips/STM32H7B0ZB.json index 9dadc7f..3da69d5 100644 --- a/data/chips/STM32H7B0ZB.json +++ b/data/chips/STM32H7B0ZB.json @@ -7117,8 +7117,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7374,7 +7374,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7429,7 +7429,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7484,7 +7484,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7539,7 +7539,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7656,7 +7656,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7743,7 +7743,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7830,8 +7830,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7962,8 +7962,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8094,8 +8094,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8206,8 +8206,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8308,7 +8308,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8358,7 +8358,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8408,8 +8408,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3AI.json b/data/chips/STM32H7B3AI.json index 4092f2d..4d6ef33 100644 --- a/data/chips/STM32H7B3AI.json +++ b/data/chips/STM32H7B3AI.json @@ -7493,8 +7493,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7750,7 +7750,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7805,7 +7805,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7860,7 +7860,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7915,7 +7915,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8032,7 +8032,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8119,7 +8119,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8206,8 +8206,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8338,8 +8338,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8470,8 +8470,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8582,8 +8582,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8699,7 +8699,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8749,7 +8749,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8799,8 +8799,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3II.json b/data/chips/STM32H7B3II.json index be6b4f6..af9875d 100644 --- a/data/chips/STM32H7B3II.json +++ b/data/chips/STM32H7B3II.json @@ -11517,8 +11517,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -11819,7 +11819,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -11884,7 +11884,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11939,7 +11939,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -11994,7 +11994,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -12111,7 +12111,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12198,7 +12198,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -12285,8 +12285,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12417,8 +12417,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12549,8 +12549,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12661,8 +12661,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -12788,7 +12788,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12838,7 +12838,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -12888,8 +12888,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3LI.json b/data/chips/STM32H7B3LI.json index e39e08b..d803350 100644 --- a/data/chips/STM32H7B3LI.json +++ b/data/chips/STM32H7B3LI.json @@ -8495,8 +8495,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8797,7 +8797,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8862,7 +8862,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8917,7 +8917,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8972,7 +8972,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9089,7 +9089,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9176,7 +9176,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9263,8 +9263,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9395,8 +9395,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9527,8 +9527,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9639,8 +9639,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9766,7 +9766,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9816,7 +9816,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9866,8 +9866,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3NI.json b/data/chips/STM32H7B3NI.json index 07231ea..8e1ade2 100644 --- a/data/chips/STM32H7B3NI.json +++ b/data/chips/STM32H7B3NI.json @@ -8397,8 +8397,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8699,7 +8699,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8764,7 +8764,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8819,7 +8819,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8874,7 +8874,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8991,7 +8991,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9078,7 +9078,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9165,8 +9165,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9297,8 +9297,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9429,8 +9429,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9541,8 +9541,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9668,7 +9668,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9718,7 +9718,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9768,8 +9768,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3QI.json b/data/chips/STM32H7B3QI.json index 8aca494..9d95953 100644 --- a/data/chips/STM32H7B3QI.json +++ b/data/chips/STM32H7B3QI.json @@ -6569,8 +6569,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6806,7 +6806,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6861,7 +6861,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6911,7 +6911,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6961,7 +6961,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7078,7 +7078,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7150,7 +7150,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7222,8 +7222,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7354,8 +7354,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7481,8 +7481,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7593,8 +7593,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7695,7 +7695,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7745,7 +7745,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7795,8 +7795,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3RI.json b/data/chips/STM32H7B3RI.json index ae1ef71..c3a5972 100644 --- a/data/chips/STM32H7B3RI.json +++ b/data/chips/STM32H7B3RI.json @@ -4727,8 +4727,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -4884,7 +4884,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -4939,7 +4939,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -4989,7 +4989,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5039,7 +5039,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5136,7 +5136,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5208,7 +5208,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5280,8 +5280,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5407,8 +5407,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5534,8 +5534,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5621,8 +5621,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5723,7 +5723,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5773,7 +5773,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5823,8 +5823,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3VI.json b/data/chips/STM32H7B3VI.json index cde0124..4aff392 100644 --- a/data/chips/STM32H7B3VI.json +++ b/data/chips/STM32H7B3VI.json @@ -7960,8 +7960,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8197,7 +8197,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8252,7 +8252,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8302,7 +8302,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8352,7 +8352,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8469,7 +8469,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8541,7 +8541,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8613,8 +8613,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8745,8 +8745,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8877,8 +8877,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8989,8 +8989,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9091,7 +9091,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9141,7 +9141,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9191,8 +9191,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7B3ZI.json b/data/chips/STM32H7B3ZI.json index 241c075..41ca4d4 100644 --- a/data/chips/STM32H7B3ZI.json +++ b/data/chips/STM32H7B3ZI.json @@ -8009,8 +8009,8 @@ "address": 1073807360, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8266,7 +8266,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8321,7 +8321,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8376,7 +8376,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8431,7 +8431,7 @@ "address": 1073823744, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8548,7 +8548,7 @@ "address": 1073824768, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8635,7 +8635,7 @@ "address": 1073825792, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8722,8 +8722,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8854,8 +8854,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8986,8 +8986,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9098,8 +9098,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9200,7 +9200,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9250,7 +9250,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9300,8 +9300,8 @@ "address": 1073808384, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", diff --git a/data/chips/STM32H7R3A8.json b/data/chips/STM32H7R3A8.json index 4ade7fe..98f1935 100644 --- a/data/chips/STM32H7R3A8.json +++ b/data/chips/STM32H7R3A8.json @@ -6119,8 +6119,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6351,7 +6351,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6406,7 +6406,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6461,7 +6461,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6516,7 +6516,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6633,7 +6633,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6720,7 +6720,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6807,8 +6807,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6924,8 +6924,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7041,8 +7041,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7148,8 +7148,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7235,7 +7235,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7285,7 +7285,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R3I8.json b/data/chips/STM32H7R3I8.json index 728e34a..d007559 100644 --- a/data/chips/STM32H7R3I8.json +++ b/data/chips/STM32H7R3I8.json @@ -7525,8 +7525,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7767,7 +7767,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7822,7 +7822,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7877,7 +7877,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7932,7 +7932,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8049,7 +8049,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8141,7 +8141,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8228,8 +8228,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8345,8 +8345,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8462,8 +8462,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8569,8 +8569,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8656,7 +8656,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8706,7 +8706,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R3L8.json b/data/chips/STM32H7R3L8.json index 2ae691e..18554c6 100644 --- a/data/chips/STM32H7R3L8.json +++ b/data/chips/STM32H7R3L8.json @@ -8460,8 +8460,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8712,7 +8712,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8767,7 +8767,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8822,7 +8822,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8877,7 +8877,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8994,7 +8994,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9086,7 +9086,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9178,8 +9178,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9295,8 +9295,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9412,8 +9412,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9519,8 +9519,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9606,7 +9606,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9656,7 +9656,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R3R8.json b/data/chips/STM32H7R3R8.json index 4c75aef..b18709c 100644 --- a/data/chips/STM32H7R3R8.json +++ b/data/chips/STM32H7R3R8.json @@ -3141,8 +3141,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -3273,7 +3273,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -3328,7 +3328,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -3378,7 +3378,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -3428,7 +3428,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -3515,7 +3515,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -3592,8 +3592,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -3709,8 +3709,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -3796,7 +3796,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -3846,7 +3846,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R3V8.json b/data/chips/STM32H7R3V8.json index 0bf9671..d9ac338 100644 --- a/data/chips/STM32H7R3V8.json +++ b/data/chips/STM32H7R3V8.json @@ -5077,8 +5077,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -5224,7 +5224,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -5279,7 +5279,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5329,7 +5329,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5379,7 +5379,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5471,7 +5471,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5548,7 +5548,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5625,8 +5625,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5742,8 +5742,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5829,7 +5829,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -5879,7 +5879,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R3Z8.json b/data/chips/STM32H7R3Z8.json index 8afa5b7..4fed13b 100644 --- a/data/chips/STM32H7R3Z8.json +++ b/data/chips/STM32H7R3Z8.json @@ -6585,8 +6585,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6777,7 +6777,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6832,7 +6832,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6882,7 +6882,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6932,7 +6932,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7049,7 +7049,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7126,7 +7126,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7203,8 +7203,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7320,8 +7320,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7437,8 +7437,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7544,8 +7544,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7631,7 +7631,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7681,7 +7681,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R7A8.json b/data/chips/STM32H7R7A8.json index d653ea4..4eb7305 100644 --- a/data/chips/STM32H7R7A8.json +++ b/data/chips/STM32H7R7A8.json @@ -6282,8 +6282,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6514,7 +6514,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6569,7 +6569,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6624,7 +6624,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6679,7 +6679,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6796,7 +6796,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6883,7 +6883,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6970,8 +6970,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7087,8 +7087,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7204,8 +7204,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7291,8 +7291,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7378,7 +7378,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7428,7 +7428,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R7I8.json b/data/chips/STM32H7R7I8.json index 2fec443..f1b0afa 100644 --- a/data/chips/STM32H7R7I8.json +++ b/data/chips/STM32H7R7I8.json @@ -7660,8 +7660,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7892,7 +7892,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7947,7 +7947,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8002,7 +8002,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8057,7 +8057,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8174,7 +8174,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8266,7 +8266,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8353,8 +8353,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8470,8 +8470,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8587,8 +8587,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8674,8 +8674,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8761,7 +8761,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8811,7 +8811,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R7L8.json b/data/chips/STM32H7R7L8.json index 2cd8c32..39fde21 100644 --- a/data/chips/STM32H7R7L8.json +++ b/data/chips/STM32H7R7L8.json @@ -8748,8 +8748,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9000,7 +9000,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9055,7 +9055,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9110,7 +9110,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9165,7 +9165,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9282,7 +9282,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9374,7 +9374,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9466,8 +9466,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9583,8 +9583,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9700,8 +9700,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9807,8 +9807,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9894,7 +9894,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9944,7 +9944,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7R7Z8.json b/data/chips/STM32H7R7Z8.json index e0b40b8..a08e58c 100644 --- a/data/chips/STM32H7R7Z8.json +++ b/data/chips/STM32H7R7Z8.json @@ -5576,8 +5576,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -5758,7 +5758,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -5813,7 +5813,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5863,7 +5863,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5913,7 +5913,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6025,7 +6025,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6102,7 +6102,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6179,8 +6179,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6296,8 +6296,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6413,8 +6413,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6500,7 +6500,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -6550,7 +6550,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3A8.json b/data/chips/STM32H7S3A8.json index c9747fd..5f3bdf5 100644 --- a/data/chips/STM32H7S3A8.json +++ b/data/chips/STM32H7S3A8.json @@ -6244,8 +6244,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6476,7 +6476,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6531,7 +6531,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6586,7 +6586,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6641,7 +6641,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6758,7 +6758,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6845,7 +6845,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6932,8 +6932,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7049,8 +7049,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7166,8 +7166,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7273,8 +7273,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7360,7 +7360,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7410,7 +7410,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3I8.json b/data/chips/STM32H7S3I8.json index d70e015..8acffbf 100644 --- a/data/chips/STM32H7S3I8.json +++ b/data/chips/STM32H7S3I8.json @@ -7650,8 +7650,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -7892,7 +7892,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -7947,7 +7947,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8002,7 +8002,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8057,7 +8057,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8174,7 +8174,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8266,7 +8266,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8353,8 +8353,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8470,8 +8470,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8587,8 +8587,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8694,8 +8694,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8781,7 +8781,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8831,7 +8831,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3L8.json b/data/chips/STM32H7S3L8.json index de3d4fe..18c7ef7 100644 --- a/data/chips/STM32H7S3L8.json +++ b/data/chips/STM32H7S3L8.json @@ -8585,8 +8585,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8837,7 +8837,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8892,7 +8892,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8947,7 +8947,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9002,7 +9002,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9119,7 +9119,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9211,7 +9211,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9303,8 +9303,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9420,8 +9420,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9537,8 +9537,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9644,8 +9644,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9731,7 +9731,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -9781,7 +9781,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3R8.json b/data/chips/STM32H7S3R8.json index 66e551c..05fd83e 100644 --- a/data/chips/STM32H7S3R8.json +++ b/data/chips/STM32H7S3R8.json @@ -3266,8 +3266,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -3398,7 +3398,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -3453,7 +3453,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -3503,7 +3503,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -3553,7 +3553,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -3640,7 +3640,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -3717,8 +3717,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -3834,8 +3834,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -3921,7 +3921,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -3971,7 +3971,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3V8.json b/data/chips/STM32H7S3V8.json index df4013f..21a5bc1 100644 --- a/data/chips/STM32H7S3V8.json +++ b/data/chips/STM32H7S3V8.json @@ -5202,8 +5202,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -5349,7 +5349,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -5404,7 +5404,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5454,7 +5454,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5504,7 +5504,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -5596,7 +5596,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5673,7 +5673,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -5750,8 +5750,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5867,8 +5867,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -5954,7 +5954,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -6004,7 +6004,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S3Z8.json b/data/chips/STM32H7S3Z8.json index 56cf61d..bf2b977 100644 --- a/data/chips/STM32H7S3Z8.json +++ b/data/chips/STM32H7S3Z8.json @@ -6710,8 +6710,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6902,7 +6902,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6957,7 +6957,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7007,7 +7007,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -7057,7 +7057,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -7174,7 +7174,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7251,7 +7251,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7328,8 +7328,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7445,8 +7445,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7562,8 +7562,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7669,8 +7669,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7756,7 +7756,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7806,7 +7806,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S7A8.json b/data/chips/STM32H7S7A8.json index a4a897c..5129a4f 100644 --- a/data/chips/STM32H7S7A8.json +++ b/data/chips/STM32H7S7A8.json @@ -6407,8 +6407,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -6639,7 +6639,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -6694,7 +6694,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6749,7 +6749,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6804,7 +6804,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6921,7 +6921,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7008,7 +7008,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -7095,8 +7095,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7212,8 +7212,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7329,8 +7329,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7416,8 +7416,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -7503,7 +7503,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -7553,7 +7553,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S7I8.json b/data/chips/STM32H7S7I8.json index cb62c5c..116a8a7 100644 --- a/data/chips/STM32H7S7I8.json +++ b/data/chips/STM32H7S7I8.json @@ -7785,8 +7785,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -8017,7 +8017,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -8072,7 +8072,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8127,7 +8127,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -8182,7 +8182,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -8299,7 +8299,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8391,7 +8391,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -8478,8 +8478,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8595,8 +8595,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8712,8 +8712,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8799,8 +8799,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -8886,7 +8886,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -8936,7 +8936,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S7L8.json b/data/chips/STM32H7S7L8.json index 7ef3e1f..239ba96 100644 --- a/data/chips/STM32H7S7L8.json +++ b/data/chips/STM32H7S7L8.json @@ -8873,8 +8873,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -9125,7 +9125,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -9180,7 +9180,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9235,7 +9235,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -9290,7 +9290,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -9407,7 +9407,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9499,7 +9499,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -9591,8 +9591,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9708,8 +9708,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9825,8 +9825,8 @@ "address": 1073743872, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -9932,8 +9932,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -10019,7 +10019,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -10069,7 +10069,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/chips/STM32H7S7Z8.json b/data/chips/STM32H7S7Z8.json index 30cb596..9ec3e07 100644 --- a/data/chips/STM32H7S7Z8.json +++ b/data/chips/STM32H7S7Z8.json @@ -5701,8 +5701,8 @@ "address": 1107296256, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_ADV" + "version": "h7", + "block": "TIM_ADV_V2" }, "rcc": { "bus_clock": "PCLK2", @@ -5883,7 +5883,7 @@ "address": 1073747968, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH" }, "rcc": { @@ -5938,7 +5938,7 @@ "address": 1073748992, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -5988,7 +5988,7 @@ "address": 1073750016, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH" }, "rcc": { @@ -6038,7 +6038,7 @@ "address": 1107312640, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_2CH_CMP" }, "rcc": { @@ -6150,7 +6150,7 @@ "address": 1107313664, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6227,7 +6227,7 @@ "address": 1107314688, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_1CH_CMP" }, "rcc": { @@ -6304,8 +6304,8 @@ "address": 1073741824, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6421,8 +6421,8 @@ "address": 1073742848, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP16" + "version": "h7", + "block": "TIM_GP16_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6538,8 +6538,8 @@ "address": 1073744896, "registers": { "kind": "timer", - "version": "v1", - "block": "TIM_GP32" + "version": "h7", + "block": "TIM_GP32_V2" }, "rcc": { "bus_clock": "PCLK1", @@ -6625,7 +6625,7 @@ "address": 1073745920, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { @@ -6675,7 +6675,7 @@ "address": 1073746944, "registers": { "kind": "timer", - "version": "v1", + "version": "h7", "block": "TIM_BASIC" }, "rcc": { diff --git a/data/registers/timer_h7.json b/data/registers/timer_h7.json new file mode 100644 index 0000000..931842a --- /dev/null +++ b/data/registers/timer_h7.json @@ -0,0 +1,5469 @@ +{ + "block/TIM_1CH": { + "extends": "TIM_CORE", + "description": "1-channel timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_1CH" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_1CH" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_1CH" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_1CH" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_1CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_1CH" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_1CH" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 104, + "fieldset": "TISEL_1CH" + }, + { + "name": "OR", + "description": "Option register 1\nNote: Check Reference Manual to parse this register content", + "byte_offset": 80 + } + ] + }, + "block/TIM_1CH_CMP": { + "extends": "TIM_1CH", + "description": "1-channel with one complementary output timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_1CH_CMP" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_1CH_CMP" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_1CH_CMP" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_1CH_CMP" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_1CH_CMP" + }, + { + "name": "RCR", + "description": "repetition counter register", + "byte_offset": 48, + "bit_size": 16, + "fieldset": "RCR_1CH_CMP" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_1CH_CMP" + }, + { + "name": "DCR", + "description": "DMA control register", + "byte_offset": 72, + "fieldset": "DCR_1CH_CMP" + }, + { + "name": "DMAR", + "description": "DMA address for full transfer", + "byte_offset": 76, + "fieldset": "DMAR_GP16" + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_1CH_CMP" + } + ] + }, + "block/TIM_1CH_CMP_V2": { + "extends": "TIM_1CH_V2", + "description": "1-channel with one complementary output timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_1CH_CMP" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_1CH_CMP" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_1CH_CMP" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_1CH_CMP" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_1CH_CMP" + }, + { + "name": "RCR", + "description": "repetition counter register", + "byte_offset": 48, + "bit_size": 16, + "fieldset": "RCR_1CH_CMP" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_1CH_CMP_V2" + }, + { + "name": "DTR2", + "description": "break and dead-time register", + "byte_offset": 84, + "fieldset": "DTR2_1CH_CMP_V2" + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_1CH_CMP_V2" + }, + { + "name": "AF2", + "description": "alternate function register 2", + "byte_offset": 100, + "fieldset": "AF2_1CH_CMP_V2" + }, + { + "name": "DCR", + "description": "DMA control register", + "byte_offset": 988, + "fieldset": "DCR_1CH_CMP_V2" + }, + { + "name": "DMAR", + "description": "DMA address for full transfer", + "byte_offset": 992 + } + ] + }, + "block/TIM_1CH_V2": { + "extends": "TIM_CORE_V2", + "description": "1-channel timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_1CH" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_1CH" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_1CH" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_1CH" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_1CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_1CH_V2" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_1CH" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1) (Dither mode disabled)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "CCR_DITHER", + "description": "capture/compare register x (x=1) (Dither mode enabled)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_DITHER_1CH_V2" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 92, + "fieldset": "TISEL_1CH" + }, + { + "name": "OR", + "description": "Option register 1\nNote: Check Reference Manual to parse this register content", + "byte_offset": 104 + } + ] + }, + "block/TIM_2CH": { + "extends": "TIM_1CH", + "description": "2-channel timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_2CH" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_2CH" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_2CH" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_2CH" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_2CH" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_2CH" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_2CH" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-2)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 104, + "fieldset": "TISEL_2CH" + } + ] + }, + "block/TIM_2CH_CMP": { + "extends": "TIM_1CH_CMP", + "description": "2-channel with one complementary output timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_2CH_CMP" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_2CH" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_2CH_CMP" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_2CH_CMP" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_2CH_CMP" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_1CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_1CH" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_2CH_CMP" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-2)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_1CH_CMP" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 104, + "fieldset": "TISEL_2CH" + } + ] + }, + "block/TIM_2CH_CMP_V2": { + "extends": "TIM_1CH_CMP_V2", + "description": "2-channel with one complementary output timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_2CH_CMP_V2" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_2CH_CMP_V2" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_2CH_CMP" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_2CH_CMP" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_2CH_CMP" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_1CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_1CH_V2" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_2CH_CMP" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-2)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "CCR_DITHER", + "description": "capture/compare register x (x=1-2) (Dither mode enabled)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_DITHER_1CH_V2" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_1CH_CMP_V2" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 92, + "fieldset": "TISEL_2CH" + } + ] + }, + "block/TIM_2CH_V2": { + "extends": "TIM_1CH_V2", + "description": "2-channel timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_2CH_V2" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_2CH_V2" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_2CH" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_2CH" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_2CH" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1 (input mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1 (output mode)", + "array": { + "len": 1, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_2CH_V2" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_2CH" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-2) (Dither mode disabled)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "CCR_DITHER", + "description": "capture/compare register x (x=1-2) (Dither mode enabled)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_DITHER_1CH_V2" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 92, + "fieldset": "TISEL_2CH" + } + ] + }, + "block/TIM_ADV": { + "extends": "TIM_2CH_CMP", + "description": "Advanced Control timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_GP16" + }, + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_ADV" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_GP16" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_ADV" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_ADV" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_ADV" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1-2 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1-2 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_GP16" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_ADV" + }, + { + "name": "RCR", + "description": "repetition counter register", + "byte_offset": 48, + "bit_size": 16, + "fieldset": "RCR_ADV" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_ADV" + }, + { + "name": "DMAR", + "description": "DMA address for full transfer", + "byte_offset": 76 + }, + { + "name": "CCMR3", + "description": "capture/compare mode register 3", + "byte_offset": 84, + "fieldset": "CCMR3_ADV" + }, + { + "name": "CCR5", + "description": "capture/compare register 5", + "byte_offset": 88, + "fieldset": "CCR5_ADV" + }, + { + "name": "CCR6", + "description": "capture/compare register 6", + "byte_offset": 92, + "fieldset": "CCR_1CH" + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_ADV" + }, + { + "name": "AF2", + "description": "alternate function register 2", + "byte_offset": 100, + "fieldset": "AF2_ADV" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 104, + "fieldset": "TISEL_GP16" + } + ] + }, + "block/TIM_ADV_V2": { + "extends": "TIM_2CH_CMP_V2", + "description": "Advanced Control timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_GP16" + }, + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_ADV_V2" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_ADV_V2" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_ADV_V2" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_ADV_V2" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_ADV" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1-2 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1-2 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_GP16" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_ADV_V2" + }, + { + "name": "RCR", + "description": "repetition counter register", + "byte_offset": 48, + "bit_size": 16, + "fieldset": "RCR_ADV" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "ECR", + "description": "encoder control register", + "byte_offset": 88, + "fieldset": "ECR_GP16_V2" + }, + { + "name": "BDTR", + "description": "break and dead-time register", + "byte_offset": 68, + "fieldset": "BDTR_ADV_V2" + }, + { + "name": "CCR5", + "description": "capture/compare register 5 (Dither mode disabled)", + "byte_offset": 72, + "fieldset": "CCR5_ADV_V2" + }, + { + "name": "CCR5_DITHER", + "description": "capture/compare register 5 (Dither mode enabled)", + "byte_offset": 72, + "fieldset": "CCR5_DITHER_ADV_V2" + }, + { + "name": "CCR6", + "description": "capture/compare register 6 (Dither mode disabled)", + "byte_offset": 76, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "CCR6_DITHER", + "description": "capture/compare register 6 (Dither mode enabled)", + "byte_offset": 76, + "fieldset": "CCR_DITHER_1CH_V2" + }, + { + "name": "CCMR3", + "description": "capture/compare mode register 3", + "byte_offset": 80, + "fieldset": "CCMR3_ADV_V2" + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_ADV" + }, + { + "name": "AF2", + "description": "alternate function register 2", + "byte_offset": 100, + "fieldset": "AF2_ADV_V2" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 92, + "fieldset": "TISEL_GP16" + } + ] + }, + "block/TIM_BASIC": { + "extends": "TIM_BASIC_NO_CR2", + "description": "Basic timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_BASIC" + } + ] + }, + "block/TIM_BASIC_NO_CR2": { + "extends": "TIM_CORE", + "description": "Virtual Basic timers without CR2 register for common part of TIM_BASIC and TIM_1CH_CMP", + "items": [ + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_BASIC_NO_CR2" + } + ] + }, + "block/TIM_BASIC_NO_CR2_V2": { + "extends": "TIM_CORE_V2", + "description": "Virtual Basic timers without CR2 register for common part of TIM_BASIC_V2 and TIM_1CH_CMP_V2", + "items": [ + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_BASIC_NO_CR2" + } + ] + }, + "block/TIM_BASIC_V2": { + "extends": "TIM_BASIC_NO_CR2_V2", + "description": "Basic timers", + "items": [ + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_BASIC_V2" + } + ] + }, + "block/TIM_CORE": { + "description": "Virtual timer for common part of TIM_BASIC and TIM_1CH", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_CORE" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_CORE" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_CORE" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_CORE" + }, + { + "name": "CNT", + "description": "counter", + "byte_offset": 36, + "fieldset": "CNT_CORE" + }, + { + "name": "PSC", + "description": "prescaler", + "byte_offset": 40, + "bit_size": 16 + }, + { + "name": "ARR", + "description": "auto-reload register", + "byte_offset": 44, + "fieldset": "ARR_CORE" + } + ] + }, + "block/TIM_CORE_V2": { + "description": "Virtual timer for common part of TIM_BASIC_V2 and TIM_1CH_V2", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_CORE_V2" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_CORE" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_CORE" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_CORE" + }, + { + "name": "CNT", + "description": "counter", + "byte_offset": 36, + "fieldset": "CNT_CORE" + }, + { + "name": "PSC", + "description": "prescaler", + "byte_offset": 40, + "bit_size": 16 + }, + { + "name": "ARR", + "description": "auto-reload register (Dither mode disabled)", + "byte_offset": 44, + "fieldset": "ARR_CORE_V2" + }, + { + "name": "ARR_DITHER", + "description": "auto-reload register (Dither mode enabled)", + "byte_offset": 44, + "fieldset": "ARR_DITHER_CORE_V2" + } + ] + }, + "block/TIM_GP16": { + "extends": "TIM_2CH", + "description": "General purpose 16-bit timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_GP16" + }, + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_GP16" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_GP16" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_GP16" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_GP16" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_GP16" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1-2 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1-2 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_GP16" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_GP16" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH" + }, + { + "name": "DCR", + "description": "DMA control register", + "byte_offset": 72, + "fieldset": "DCR_1CH_CMP" + }, + { + "name": "DMAR", + "description": "DMA address for full transfer", + "byte_offset": 76, + "fieldset": "DMAR_GP16" + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_GP16" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 104, + "fieldset": "TISEL_GP16" + } + ] + }, + "block/TIM_GP16_V2": { + "extends": "TIM_2CH_V2", + "description": "General purpose 16-bit timers", + "items": [ + { + "name": "CR1", + "description": "control register 1", + "byte_offset": 0, + "bit_size": 16, + "fieldset": "CR1_GP16" + }, + { + "name": "CR2", + "description": "control register 2", + "byte_offset": 4, + "fieldset": "CR2_GP16" + }, + { + "name": "SMCR", + "description": "slave mode control register", + "byte_offset": 8, + "fieldset": "SMCR_GP16_V2" + }, + { + "name": "DIER", + "description": "DMA/Interrupt enable register", + "byte_offset": 12, + "fieldset": "DIER_GP16_V2" + }, + { + "name": "SR", + "description": "status register", + "byte_offset": 16, + "fieldset": "SR_GP16_V2" + }, + { + "name": "EGR", + "description": "event generation register", + "byte_offset": 20, + "access": "Write", + "bit_size": 16, + "fieldset": "EGR_GP16" + }, + { + "name": "CCMR_Input", + "description": "capture/compare mode register 1-2 (input mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Input_2CH" + }, + { + "name": "CCMR_Output", + "description": "capture/compare mode register 1-2 (output mode)", + "array": { + "len": 2, + "stride": 4 + }, + "byte_offset": 24, + "fieldset": "CCMR_Output_GP16" + }, + { + "name": "CCER", + "description": "capture/compare enable register", + "byte_offset": 32, + "fieldset": "CCER_GP16" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4) (Dither mode disabled)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_1CH_V2" + }, + { + "name": "CCR_DITHER", + "description": "capture/compare register x (x=1-4) (Dither mode enabled)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_DITHER_1CH_V2" + }, + { + "name": "ECR", + "description": "encoder control register", + "byte_offset": 88, + "fieldset": "ECR_GP16_V2" + }, + { + "name": "DCR", + "description": "DMA control register", + "byte_offset": 988, + "fieldset": "DCR_1CH_CMP_V2" + }, + { + "name": "DMAR", + "description": "DMA address for full transfer", + "byte_offset": 992 + }, + { + "name": "AF1", + "description": "alternate function register 1", + "byte_offset": 96, + "fieldset": "AF1_GP16" + }, + { + "name": "AF2", + "description": "alternate function register 2", + "byte_offset": 100, + "fieldset": "AF2_1CH_CMP_V2" + }, + { + "name": "TISEL", + "description": "input selection register", + "byte_offset": 92, + "fieldset": "TISEL_GP16" + } + ] + }, + "block/TIM_GP32": { + "extends": "TIM_GP16", + "description": "General purpose 32-bit timers", + "items": [ + { + "name": "CNT", + "description": "counter", + "byte_offset": 36 + }, + { + "name": "ARR", + "description": "auto-reload register", + "byte_offset": 44 + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52 + } + ] + }, + "block/TIM_GP32_V2": { + "extends": "TIM_GP16_V2", + "description": "General purpose 32-bit timers", + "items": [ + { + "name": "CNT", + "description": "counter (Dither mode disabled)", + "byte_offset": 36 + }, + { + "name": "CNT_DITHER", + "description": "counter (Dither mode enbled)", + "byte_offset": 36, + "fieldset": "CNT_DITHER_GP32_V2" + }, + { + "name": "ARR", + "description": "auto-reload register (Dither mode disabled)", + "byte_offset": 44 + }, + { + "name": "ARR_DITHER", + "description": "auto-reload register (Dither mode enabled)", + "byte_offset": 44, + "fieldset": "ARR_DITHER_GP32_V2" + }, + { + "name": "CCR", + "description": "capture/compare register x (x=1-4) (Dither mode disabled)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52 + }, + { + "name": "CCR_DITHER", + "description": "capture/compare register x (x=1-4) (Dither mode enabled)", + "array": { + "len": 4, + "stride": 4 + }, + "byte_offset": 52, + "fieldset": "CCR_DITHER_GP32_V2" + } + ] + }, + "fieldset/AF1_1CH_CMP": { + "description": "alternate function register 1", + "fields": [ + { + "name": "BKINE", + "description": "TIMx_BKIN input enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "BKCMPE", + "description": "TIM_BRK_CMPx (x=1-2) enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "BKDF1BKE", + "description": "BRK DFSDM1_BREAKx enable (x=0 if TIM15, x=1 if TIM16, x=2 if TIM17)", + "bit_offset": 8, + "bit_size": 1 + }, + { + "name": "BKINP", + "description": "TIMx_BKIN input polarity", + "bit_offset": 9, + "bit_size": 1, + "enum": "BKINP" + }, + { + "name": "BKCMPP", + "description": "TIM_BRK_CMPx (x=1-2) input polarity", + "bit_offset": 10, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + }, + "enum": "BKINP" + } + ] + }, + "fieldset/AF1_1CH_CMP_V2": { + "description": "alternate function register 1", + "fields": [ + { + "name": "BKINE", + "description": "TIMx_BKIN input enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "BKCMPE", + "description": "TIM_BRK_CMPx (x=1-8) enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 8, + "stride": 1 + } + }, + { + "name": "BKINP", + "description": "TIMx_BKIN input polarity", + "bit_offset": 9, + "bit_size": 1, + "enum": "BKINP" + }, + { + "name": "BKCMPP", + "description": "TIM_BRK_CMPx (x=1-4) input polarity", + "bit_offset": 10, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + }, + "enum": "BKINP" + } + ] + }, + "fieldset/AF1_ADV": { + "extends": "AF1_1CH_CMP", + "description": "alternate function register 1", + "fields": [ + { + "name": "ETRSEL", + "description": "etr_in source selection", + "bit_offset": 14, + "bit_size": 4 + } + ] + }, + "fieldset/AF1_GP16": { + "description": "alternate function register 1", + "fields": [ + { + "name": "ETRSEL", + "description": "etr_in source selection", + "bit_offset": 14, + "bit_size": 4 + } + ] + }, + "fieldset/AF2_1CH_CMP_V2": { + "description": "alternate function register 2", + "fields": [ + { + "name": "OCRSEL", + "description": "ocref_clr source selection", + "bit_offset": 16, + "bit_size": 3 + } + ] + }, + "fieldset/AF2_ADV": { + "description": "alternate function register 2", + "fields": [ + { + "name": "BK2INE", + "description": "TIMx_BKIN2 input enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "BK2CMPE", + "description": "TIM_BRK2_CMPx (x=1-8) enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "BK2DF1BK1E", + "description": "BRK2 DFSDM1_BREAK1 enable", + "bit_offset": 8, + "bit_size": 1 + }, + { + "name": "BK2INP", + "description": "TIMx_BK2IN input polarity", + "bit_offset": 9, + "bit_size": 1, + "enum": "BKINP" + }, + { + "name": "BK2CMPP", + "description": "TIM_BRK2_CMPx (x=1-4) input polarity", + "bit_offset": 10, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + }, + "enum": "BKINP" + } + ] + }, + "fieldset/AF2_ADV_V2": { + "extends": "AF2_1CH_CMP_V2", + "description": "alternate function register 2", + "fields": [ + { + "name": "BK2INE", + "description": "TIMx_BKIN2 input enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "BK2CMPE", + "description": "TIM_BRK2_CMPx (x=1-8) enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 8, + "stride": 1 + } + }, + { + "name": "BK2INP", + "description": "TIMx_BK2IN input polarity", + "bit_offset": 9, + "bit_size": 1, + "enum": "BKINP" + }, + { + "name": "BK2CMPP", + "description": "TIM_BRK2_CMPx (x=1-4) input polarity", + "bit_offset": 10, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + }, + "enum": "BKINP" + } + ] + }, + "fieldset/ARR_CORE": { + "description": "auto-reload register", + "fields": [ + { + "name": "ARR", + "description": "Auto-reload value", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/ARR_CORE_V2": { + "description": "auto-reload register (Dither mode disabled)", + "fields": [ + { + "name": "ARR", + "description": "Auto-reload value", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/ARR_DITHER_CORE_V2": { + "description": "auto-reload register (Dither mode enabled)", + "fields": [ + { + "name": "DITHER", + "description": "Dither value", + "bit_offset": 0, + "bit_size": 4 + }, + { + "name": "ARR", + "description": "Auto-reload value", + "bit_offset": 4, + "bit_size": 16 + } + ] + }, + "fieldset/ARR_DITHER_GP32_V2": { + "description": "auto-reload register (Dither mode enabled)", + "fields": [ + { + "name": "DITHER", + "description": "Dither value", + "bit_offset": 0, + "bit_size": 4 + }, + { + "name": "ARR", + "description": "Auto-reload value", + "bit_offset": 4, + "bit_size": 28 + } + ] + }, + "fieldset/BDTR_1CH_CMP": { + "description": "break and dead-time register", + "fields": [ + { + "name": "DTG", + "description": "Dead-time generator setup", + "bit_offset": 0, + "bit_size": 8 + }, + { + "name": "LOCK", + "description": "Lock configuration", + "bit_offset": 8, + "bit_size": 2, + "enum": "LOCK" + }, + { + "name": "OSSI", + "description": "Off-state selection for Idle mode", + "bit_offset": 10, + "bit_size": 1, + "enum": "OSSI" + }, + { + "name": "OSSR", + "description": "Off-state selection for Run mode", + "bit_offset": 11, + "bit_size": 1, + "enum": "OSSR" + }, + { + "name": "BKE", + "description": "Break x (x=1) enable", + "bit_offset": 12, + "bit_size": 1, + "array": { + "len": 1, + "stride": 12 + } + }, + { + "name": "BKP", + "description": "Break x (x=1) polarity", + "bit_offset": 13, + "bit_size": 1, + "array": { + "len": 1, + "stride": 12 + }, + "enum": "BKP" + }, + { + "name": "AOE", + "description": "Automatic output enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "MOE", + "description": "Main output enable", + "bit_offset": 15, + "bit_size": 1 + }, + { + "name": "BKF", + "description": "Break x (x=1) filter", + "bit_offset": 16, + "bit_size": 4, + "array": { + "len": 1, + "stride": 4 + }, + "enum": "FilterValue" + } + ] + }, + "fieldset/BDTR_1CH_CMP_V2": { + "description": "break and dead-time register", + "fields": [ + { + "name": "DTG", + "description": "Dead-time generator setup", + "bit_offset": 0, + "bit_size": 8 + }, + { + "name": "LOCK", + "description": "Lock configuration", + "bit_offset": 8, + "bit_size": 2, + "enum": "LOCK" + }, + { + "name": "OSSI", + "description": "Off-state selection for Idle mode", + "bit_offset": 10, + "bit_size": 1, + "enum": "OSSI" + }, + { + "name": "OSSR", + "description": "Off-state selection for Run mode", + "bit_offset": 11, + "bit_size": 1, + "enum": "OSSR" + }, + { + "name": "BKE", + "description": "Break x (x=1) enable", + "bit_offset": 12, + "bit_size": 1, + "array": { + "len": 1, + "stride": 12 + } + }, + { + "name": "BKP", + "description": "Break x (x=1) polarity", + "bit_offset": 13, + "bit_size": 1, + "array": { + "len": 1, + "stride": 12 + }, + "enum": "BKP" + }, + { + "name": "AOE", + "description": "Automatic output enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "MOE", + "description": "Main output enable", + "bit_offset": 15, + "bit_size": 1 + }, + { + "name": "BKF", + "description": "Break x (x=1) filter", + "bit_offset": 16, + "bit_size": 4, + "array": { + "len": 1, + "stride": 4 + }, + "enum": "FilterValue" + }, + { + "name": "BKDSRM", + "description": "Break x (x=1) Disarm", + "bit_offset": 26, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + }, + "enum": "BKDSRM_V2" + }, + { + "name": "BKBID", + "description": "Break x (x=1) bidirectional", + "bit_offset": 28, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + }, + "enum": "BKBID_V2" + } + ] + }, + "fieldset/BDTR_ADV": { + "extends": "BDTR_1CH_CMP", + "description": "break and dead-time register", + "fields": [ + { + "name": "BKE", + "description": "Break x (x=1,2) enable", + "bit_offset": 12, + "bit_size": 1, + "array": { + "len": 2, + "stride": 12 + } + }, + { + "name": "BKP", + "description": "Break x (x=1,2) polarity", + "bit_offset": 13, + "bit_size": 1, + "array": { + "len": 2, + "stride": 12 + }, + "enum": "BKP" + }, + { + "name": "BKF", + "description": "Break x (x=1,2) filter", + "bit_offset": 16, + "bit_size": 4, + "array": { + "len": 2, + "stride": 4 + }, + "enum": "FilterValue" + } + ] + }, + "fieldset/BDTR_ADV_V2": { + "extends": "BDTR_1CH_CMP", + "description": "break and dead-time register", + "fields": [ + { + "name": "BKE", + "description": "Break x (x=1,2) enable", + "bit_offset": 12, + "bit_size": 1, + "array": { + "len": 2, + "stride": 12 + } + }, + { + "name": "BKP", + "description": "Break x (x=1,2) polarity", + "bit_offset": 13, + "bit_size": 1, + "array": { + "len": 2, + "stride": 12 + }, + "enum": "BKP" + }, + { + "name": "BKF", + "description": "Break x (x=1,2) filter", + "bit_offset": 16, + "bit_size": 4, + "array": { + "len": 2, + "stride": 4 + }, + "enum": "FilterValue" + }, + { + "name": "BKDSRM", + "description": "Break x (x=1,2) Disarm", + "bit_offset": 26, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + }, + "enum": "BKDSRM_V2" + }, + { + "name": "BKBID", + "description": "Break x (x=1,2) bidirectional", + "bit_offset": 28, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + }, + "enum": "BKBID_V2" + } + ] + }, + "fieldset/CCER_1CH": { + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCE", + "description": "Capture/Compare x (x=1) output enable", + "bit_offset": 0, + "bit_size": 1, + "array": { + "len": 1, + "stride": 4 + } + }, + { + "name": "CCP", + "description": "Capture/Compare x (x=1) output Polarity", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 1, + "stride": 4 + } + }, + { + "name": "CCNP", + "description": "Capture/Compare x (x=1) output Polarity", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 1, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_1CH_CMP": { + "extends": "CCER_1CH", + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCNE", + "description": "Capture/Compare x (x=1) complementary output enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 1, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_2CH": { + "extends": "CCER_1CH", + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCE", + "description": "Capture/Compare x (x=1-2) output enable", + "bit_offset": 0, + "bit_size": 1, + "array": { + "len": 2, + "stride": 4 + } + }, + { + "name": "CCP", + "description": "Capture/Compare x (x=1-2) output Polarity", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 4 + } + }, + { + "name": "CCNP", + "description": "Capture/Compare x (x=1-2) output Polarity", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 2, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_2CH_CMP": { + "extends": "CCER_2CH", + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCNE", + "description": "Capture/Compare x (x=1) complementary output enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 1, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_ADV": { + "extends": "CCER_2CH_CMP", + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCE", + "description": "Capture/Compare x (x=1-6) output enable", + "bit_offset": 0, + "bit_size": 1, + "array": { + "len": 6, + "stride": 4 + } + }, + { + "name": "CCP", + "description": "Capture/Compare x (x=1-6) output Polarity", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 6, + "stride": 4 + } + }, + { + "name": "CCNE", + "description": "Capture/Compare x (x=1-3) complementary output enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 3, + "stride": 4 + } + }, + { + "name": "CCNP", + "description": "Capture/Compare x (x=1-4) output Polarity", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_ADV_V2": { + "extends": "CCER_2CH_CMP", + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCE", + "description": "Capture/Compare x (x=1-6) output enable", + "bit_offset": 0, + "bit_size": 1, + "array": { + "len": 6, + "stride": 4 + } + }, + { + "name": "CCP", + "description": "Capture/Compare x (x=1-6) output Polarity", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 6, + "stride": 4 + } + }, + { + "name": "CCNE", + "description": "Capture/Compare x (x=1-4) complementary output enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + }, + { + "name": "CCNP", + "description": "Capture/Compare x (x=1-4) output Polarity", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + } + ] + }, + "fieldset/CCER_GP16": { + "description": "capture/compare enable register", + "fields": [ + { + "name": "CCE", + "description": "Capture/Compare x (x=1-4) output enable", + "bit_offset": 0, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + }, + { + "name": "CCP", + "description": "Capture/Compare x (x=1-4) output Polarity", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + }, + { + "name": "CCNP", + "description": "Capture/Compare x (x=1-4) output Polarity", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 4, + "stride": 4 + } + } + ] + }, + "fieldset/CCMR3_ADV": { + "description": "capture/compare mode register 3", + "fields": [ + { + "name": "OCFE", + "description": "Output compare x (x=5,6) fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare x (x=5,6) preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare x (x=5,6) mode", + "bit_offset": 4, + "bit_size": 3, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "OCM" + }, + { + "name": "OCCE", + "description": "Output compare x (x=5,6) clear enable", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + } + ] + }, + "fieldset/CCMR3_ADV_V2": { + "description": "capture/compare mode register 3", + "fields": [ + { + "name": "OCFE", + "description": "Output compare x (x=5,6) fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare x (x=5,6) preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare x (x=5,6) mode", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 16, + "end": 16 + } + ], + "bit_size": 4, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "OCM_V2" + }, + { + "name": "OCCE", + "description": "Output compare x (x=5,6) clear enable", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + } + ] + }, + "fieldset/CCMR_Input_1CH": { + "description": "capture/compare mode register x (x=1) (input mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "CCMR_Input_CCS" + }, + { + "name": "ICPSC", + "description": "Input capture y prescaler", + "bit_offset": 2, + "bit_size": 2, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "ICF", + "description": "Input capture y filter", + "bit_offset": 4, + "bit_size": 4, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "FilterValue" + } + ] + }, + "fieldset/CCMR_Input_2CH": { + "extends": "CCMR_Input_1CH", + "description": "capture/compare mode register x (x=1) (input mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "CCMR_Input_CCS" + }, + { + "name": "ICPSC", + "description": "Input capture y prescaler", + "bit_offset": 2, + "bit_size": 2, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "ICF", + "description": "Input capture y filter", + "bit_offset": 4, + "bit_size": 4, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "FilterValue" + } + ] + }, + "fieldset/CCMR_Output_1CH": { + "description": "capture/compare mode register x (x=1) (output mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "CCMR_Output_CCS" + }, + { + "name": "OCFE", + "description": "Output compare y fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare y preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare y mode", + "bit_offset": 4, + "bit_size": 3, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "OCM" + } + ] + }, + "fieldset/CCMR_Output_1CH_V2": { + "description": "capture/compare mode register x (x=1) (output mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "CCMR_Output_CCS" + }, + { + "name": "OCFE", + "description": "Output compare y fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare y preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 1, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare y mode", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 16, + "end": 16 + } + ], + "bit_size": 4, + "array": { + "len": 1, + "stride": 8 + }, + "enum": "OCM_V2" + } + ] + }, + "fieldset/CCMR_Output_2CH": { + "extends": "CCMR_Output_1CH", + "description": "capture/compare mode register x (x=1) (output mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "CCMR_Output_CCS" + }, + { + "name": "OCFE", + "description": "Output compare y fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare y preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare y mode", + "bit_offset": 4, + "bit_size": 3, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "OCM" + } + ] + }, + "fieldset/CCMR_Output_2CH_V2": { + "extends": "CCMR_Output_1CH", + "description": "capture/compare mode register x (x=1) (output mode)", + "fields": [ + { + "name": "CCS", + "description": "Capture/Compare y selection", + "bit_offset": 0, + "bit_size": 2, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "CCMR_Output_CCS" + }, + { + "name": "OCFE", + "description": "Output compare y fast enable", + "bit_offset": 2, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCPE", + "description": "Output compare y preload enable", + "bit_offset": 3, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + }, + { + "name": "OCM", + "description": "Output compare y mode", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 16, + "end": 16 + } + ], + "bit_size": 4, + "array": { + "len": 2, + "stride": 8 + }, + "enum": "OCM_V2" + } + ] + }, + "fieldset/CCMR_Output_GP16": { + "extends": "CCMR_Output_2CH", + "description": "capture/compare mode register x (x=1-2) (output mode)", + "fields": [ + { + "name": "OCCE", + "description": "Output compare y clear enable", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 8 + } + } + ] + }, + "fieldset/CCR5_ADV": { + "extends": "CCR_1CH", + "description": "capture/compare register 5", + "fields": [ + { + "name": "GC5C", + "description": "Group channel 5 and channel x (x=1-3)", + "bit_offset": 29, + "bit_size": 1, + "array": { + "len": 3, + "stride": 1 + }, + "enum": "GC5C" + } + ] + }, + "fieldset/CCR5_ADV_V2": { + "extends": "CCR_1CH_V2", + "description": "capture/compare register 5 (Dither mode disabled)", + "fields": [ + { + "name": "GC5C", + "description": "Group channel 5 and channel x (x=1-3)", + "bit_offset": 29, + "bit_size": 1, + "array": { + "len": 3, + "stride": 1 + }, + "enum": "GC5C" + } + ] + }, + "fieldset/CCR5_DITHER_ADV_V2": { + "extends": "CCR_DITHER_1CH_V2", + "description": "capture/compare register 5 (Dither mode enabled)", + "fields": [ + { + "name": "GC5C", + "description": "Group channel 5 and channel x (x=1-3)", + "bit_offset": 29, + "bit_size": 1, + "array": { + "len": 3, + "stride": 1 + }, + "enum": "GC5C" + } + ] + }, + "fieldset/CCR_1CH": { + "description": "capture/compare register x (x=1-4,6)", + "fields": [ + { + "name": "CCR", + "description": "capture/compare x (x=1-4,6) value", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/CCR_1CH_V2": { + "description": "capture/compare register x (x=1-4,6) (Dither mode disabled)", + "fields": [ + { + "name": "CCR", + "description": "capture/compare x (x=1-4,6) value", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/CCR_DITHER_1CH_V2": { + "description": "capture/compare register x (x=1-4,6) (Dither mode enabled)", + "fields": [ + { + "name": "DITHER", + "description": "capture/compare x (x=1-4,6) value", + "bit_offset": 0, + "bit_size": 4 + }, + { + "name": "CCR", + "description": "capture/compare x (x=1-4,6) value", + "bit_offset": 4, + "bit_size": 16 + } + ] + }, + "fieldset/CCR_DITHER_GP32_V2": { + "description": "capture/compare register x (x=1-4,6) (Dither mode enabled)", + "fields": [ + { + "name": "DITHER", + "description": "Dither value", + "bit_offset": 0, + "bit_size": 4 + }, + { + "name": "CCR", + "description": "capture/compare x (x=1-4,6) value", + "bit_offset": 4, + "bit_size": 28 + } + ] + }, + "fieldset/CNT_CORE": { + "description": "counter", + "fields": [ + { + "name": "CNT", + "description": "counter value", + "bit_offset": 0, + "bit_size": 16 + }, + { + "name": "UIFCPY", + "description": "UIF copy", + "bit_offset": 31, + "bit_size": 1 + } + ] + }, + "fieldset/CNT_DITHER_GP32_V2": { + "description": "counter (Dither mode enabled)", + "fields": [ + { + "name": "CNT", + "description": "counter value", + "bit_offset": 0, + "bit_size": 31 + }, + { + "name": "UIFCPY", + "description": "UIF copy", + "bit_offset": 31, + "bit_size": 1 + } + ] + }, + "fieldset/CR1_1CH": { + "extends": "CR1_CORE", + "description": "control register 1", + "fields": [ + { + "name": "CKD", + "description": "Clock division", + "bit_offset": 8, + "bit_size": 2, + "enum": "CKD" + } + ] + }, + "fieldset/CR1_CORE": { + "description": "control register 1", + "fields": [ + { + "name": "CEN", + "description": "Counter enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "UDIS", + "description": "Update disable", + "bit_offset": 1, + "bit_size": 1 + }, + { + "name": "URS", + "description": "Update request source", + "bit_offset": 2, + "bit_size": 1, + "enum": "URS" + }, + { + "name": "OPM", + "description": "One-pulse mode enbaled", + "bit_offset": 3, + "bit_size": 1 + }, + { + "name": "ARPE", + "description": "Auto-reload preload enable", + "bit_offset": 7, + "bit_size": 1 + }, + { + "name": "UIFREMAP", + "description": "UIF status bit remapping enable", + "bit_offset": 11, + "bit_size": 1 + } + ] + }, + "fieldset/CR1_CORE_V2": { + "description": "control register 1", + "fields": [ + { + "name": "CEN", + "description": "Counter enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "UDIS", + "description": "Update disable", + "bit_offset": 1, + "bit_size": 1 + }, + { + "name": "URS", + "description": "Update request source", + "bit_offset": 2, + "bit_size": 1, + "enum": "URS" + }, + { + "name": "OPM", + "description": "One-pulse mode enbaled", + "bit_offset": 3, + "bit_size": 1 + }, + { + "name": "ARPE", + "description": "Auto-reload preload enable", + "bit_offset": 7, + "bit_size": 1 + }, + { + "name": "UIFREMAP", + "description": "UIF status bit remapping enable", + "bit_offset": 11, + "bit_size": 1 + }, + { + "name": "DITHEN", + "description": "Dithering enable", + "bit_offset": 12, + "bit_size": 1 + } + ] + }, + "fieldset/CR1_GP16": { + "extends": "CR1_CORE", + "description": "control register 1", + "fields": [ + { + "name": "DIR", + "description": "Direction", + "bit_offset": 4, + "bit_size": 1, + "enum": "DIR" + }, + { + "name": "CMS", + "description": "Center-aligned mode selection", + "bit_offset": 5, + "bit_size": 2, + "enum": "CMS" + }, + { + "name": "CKD", + "description": "Clock division", + "bit_offset": 8, + "bit_size": 2, + "enum": "CKD" + } + ] + }, + "fieldset/CR2_1CH_CMP": { + "description": "control register 2", + "fields": [ + { + "name": "CCPC", + "description": "Capture/compare preloaded control", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "CCUS", + "description": "Capture/compare control update selection", + "bit_offset": 2, + "bit_size": 1 + }, + { + "name": "CCDS", + "description": "Capture/compare DMA selection", + "bit_offset": 3, + "bit_size": 1, + "enum": "CCDS" + }, + { + "name": "OIS", + "description": "Output Idle state x (x=1)", + "bit_offset": 8, + "bit_size": 1, + "array": { + "len": 1, + "stride": 2 + } + }, + { + "name": "OISN", + "description": "Output Idle state x (x=1)", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 1, + "stride": 2 + } + } + ] + }, + "fieldset/CR2_2CH": { + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": 4, + "bit_size": 3, + "enum": "MMS" + }, + { + "name": "TI1S", + "description": "TI1 selection", + "bit_offset": 7, + "bit_size": 1, + "enum": "TI1S" + } + ] + }, + "fieldset/CR2_2CH_CMP": { + "extends": "CR2_1CH_CMP", + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": 4, + "bit_size": 3, + "enum": "MMS" + }, + { + "name": "TI1S", + "description": "TI1 selection", + "bit_offset": 7, + "bit_size": 1, + "enum": "TI1S" + }, + { + "name": "OIS", + "description": "Output Idle state x (x=1,2)", + "bit_offset": 8, + "bit_size": 1, + "array": { + "len": 2, + "stride": 2 + } + } + ] + }, + "fieldset/CR2_2CH_CMP_V2": { + "extends": "CR2_1CH_CMP", + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 25, + "end": 25 + } + ], + "bit_size": 4, + "enum": "MMS_V2" + }, + { + "name": "TI1S", + "description": "TI1 selection", + "bit_offset": 7, + "bit_size": 1, + "enum": "TI1S" + }, + { + "name": "OIS", + "description": "Output Idle state x (x=1,2)", + "bit_offset": 8, + "bit_size": 1, + "array": { + "len": 2, + "stride": 2 + } + } + ] + }, + "fieldset/CR2_2CH_V2": { + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 25, + "end": 25 + } + ], + "bit_size": 4, + "enum": "MMS_V2" + }, + { + "name": "TI1S", + "description": "TI1 selection", + "bit_offset": 7, + "bit_size": 1, + "enum": "TI1S" + } + ] + }, + "fieldset/CR2_ADV": { + "extends": "CR2_2CH_CMP", + "description": "control register 2", + "fields": [ + { + "name": "OIS", + "description": "Output Idle state x (x=1-6)", + "bit_offset": 8, + "bit_size": 1, + "array": { + "len": 6, + "stride": 2 + } + }, + { + "name": "OISN", + "description": "Output Idle state x N x (x=1-4)", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 2 + } + }, + { + "name": "MMS2", + "description": "Master mode selection 2", + "bit_offset": 20, + "bit_size": 4, + "enum": "MMS2" + } + ] + }, + "fieldset/CR2_ADV_V2": { + "extends": "CR2_2CH_CMP_V2", + "description": "control register 2", + "fields": [ + { + "name": "OIS", + "description": "Output Idle state x (x=1-6)", + "bit_offset": 8, + "bit_size": 1, + "array": { + "len": 6, + "stride": 2 + } + }, + { + "name": "OISN", + "description": "Output Idle state x N x (x=1-4)", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 2 + } + }, + { + "name": "MMS2", + "description": "Master mode selection 2", + "bit_offset": 20, + "bit_size": 4, + "enum": "MMS_V2" + } + ] + }, + "fieldset/CR2_BASIC": { + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": 4, + "bit_size": 3, + "enum": "MMS" + } + ] + }, + "fieldset/CR2_BASIC_V2": { + "description": "control register 2", + "fields": [ + { + "name": "MMS", + "description": "Master mode selection", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 25, + "end": 25 + } + ], + "bit_size": 4, + "enum": "MMS_V2" + } + ] + }, + "fieldset/CR2_GP16": { + "extends": "CR2_BASIC", + "description": "control register 2", + "fields": [ + { + "name": "CCDS", + "description": "Capture/compare DMA selection", + "bit_offset": 3, + "bit_size": 1, + "enum": "CCDS" + }, + { + "name": "TI1S", + "description": "TI1 selection", + "bit_offset": 7, + "bit_size": 1, + "enum": "TI1S" + } + ] + }, + "fieldset/DCR_1CH_CMP": { + "description": "DMA control register", + "fields": [ + { + "name": "DBA", + "description": "DMA base address", + "bit_offset": 0, + "bit_size": 5 + }, + { + "name": "DBL", + "description": "DMA burst length", + "bit_offset": 8, + "bit_size": 5 + } + ] + }, + "fieldset/DCR_1CH_CMP_V2": { + "description": "DMA control register", + "fields": [ + { + "name": "DBA", + "description": "DMA base address", + "bit_offset": 0, + "bit_size": 5 + }, + { + "name": "DBL", + "description": "DMA burst length", + "bit_offset": 8, + "bit_size": 5 + }, + { + "name": "DBSS", + "description": "DMA burst source selection", + "bit_offset": 16, + "bit_size": 4, + "enum": "DBSS_V2" + } + ] + }, + "fieldset/DIER_1CH": { + "extends": "DIER_CORE", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/DIER_1CH_CMP": { + "extends": "DIER_1CH", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "COMIE", + "description": "COM interrupt enable", + "bit_offset": 5, + "bit_size": 1 + }, + { + "name": "BIE", + "description": "Break interrupt enable", + "bit_offset": 7, + "bit_size": 1 + }, + { + "name": "UDE", + "description": "Update DMA request enable", + "bit_offset": 8, + "bit_size": 1 + }, + { + "name": "CCDE", + "description": "Capture/Compare x (x=1) DMA request enable", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/DIER_2CH": { + "extends": "DIER_1CH", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1-2) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "TIE", + "description": "Trigger interrupt enable", + "bit_offset": 6, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_2CH_CMP": { + "extends": "DIER_1CH_CMP", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "TIE", + "description": "Trigger interrupt enable", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "COMDE", + "description": "COM DMA request enable", + "bit_offset": 13, + "bit_size": 1 + }, + { + "name": "TDE", + "description": "Trigger DMA request enable", + "bit_offset": 14, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_ADV": { + "extends": "DIER_2CH_CMP", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1-4) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "CCDE", + "description": "Capture/Compare x (x=1-4) DMA request enable", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + } + ] + }, + "fieldset/DIER_ADV_V2": { + "extends": "DIER_2CH_CMP", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1-4) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "BIE", + "description": "Break interrupt enable", + "bit_offset": 7, + "bit_size": 1 + }, + { + "name": "CCDE", + "description": "Capture/Compare x (x=1) DMA request enable", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "IDXIE", + "description": "Index interrupt enable", + "bit_offset": 20, + "bit_size": 1 + }, + { + "name": "DIRIE", + "description": "Direction change interrupt enable", + "bit_offset": 21, + "bit_size": 1 + }, + { + "name": "IERRIE", + "description": "Index error interrupt enable", + "bit_offset": 22, + "bit_size": 1 + }, + { + "name": "TERRIE", + "description": "Transition error interrupt enable", + "bit_offset": 23, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_BASIC_NO_CR2": { + "extends": "DIER_CORE", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "UDE", + "description": "Update DMA request enable", + "bit_offset": 8, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_CORE": { + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "UIE", + "description": "Update interrupt enable", + "bit_offset": 0, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_GP16": { + "extends": "DIER_BASIC_NO_CR2", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1-4) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TIE", + "description": "Trigger interrupt enable", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCDE", + "description": "Capture/Compare x (x=1-4) DMA request enable", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TDE", + "description": "Trigger DMA request enable", + "bit_offset": 14, + "bit_size": 1 + } + ] + }, + "fieldset/DIER_GP16_V2": { + "extends": "DIER_BASIC_NO_CR2", + "description": "DMA/Interrupt enable register", + "fields": [ + { + "name": "CCIE", + "description": "Capture/Compare x (x=1-4) interrupt enable", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TIE", + "description": "Trigger interrupt enable", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCDE", + "description": "Capture/Compare x (x=1-4) DMA request enable", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TDE", + "description": "Trigger DMA request enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "IDXIE", + "description": "Index interrupt enable", + "bit_offset": 20, + "bit_size": 1 + }, + { + "name": "DIRIE", + "description": "Direction change interrupt enable", + "bit_offset": 21, + "bit_size": 1 + }, + { + "name": "IERRIE", + "description": "Index error interrupt enable", + "bit_offset": 22, + "bit_size": 1 + }, + { + "name": "TERRIE", + "description": "Transition error interrupt enable", + "bit_offset": 23, + "bit_size": 1 + } + ] + }, + "fieldset/DMAR_GP16": { + "description": "DMA address for full transfer", + "fields": [ + { + "name": "DMAB", + "description": "DMA register for burst accesses", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/DTR2_1CH_CMP_V2": { + "description": "deadtime register 2", + "fields": [ + { + "name": "DTGF", + "description": "Dead-time falling edge generator setup", + "bit_offset": 0, + "bit_size": 8 + }, + { + "name": "DTAE", + "description": "Deadtime asymmetric enable", + "bit_offset": 16, + "bit_size": 1, + "enum": "DTAE_V2" + }, + { + "name": "DTPE", + "description": "Deadtime preload enable", + "bit_offset": 17, + "bit_size": 1 + } + ] + }, + "fieldset/ECR_GP16_V2": { + "description": "encoder control register", + "fields": [ + { + "name": "IE", + "description": "Index enable", + "bit_offset": 0, + "bit_size": 1 + }, + { + "name": "IDIR", + "description": "Index direction", + "bit_offset": 1, + "bit_size": 2, + "enum": "IDIR_V2" + }, + { + "name": "IBLK", + "description": "Index blanking", + "bit_offset": 3, + "bit_size": 2, + "enum": "IBLK_V2" + }, + { + "name": "FIDX", + "description": "First index", + "bit_offset": 5, + "bit_size": 1, + "enum": "FIDX_V2" + }, + { + "name": "IPOS", + "description": "Index positioning", + "bit_offset": 6, + "bit_size": 2 + }, + { + "name": "PW", + "description": "Pulse width", + "bit_offset": 16, + "bit_size": 8 + }, + { + "name": "PWPRSC", + "description": "Pulse width prescaler", + "bit_offset": 24, + "bit_size": 2 + } + ] + }, + "fieldset/EGR_1CH": { + "extends": "EGR_CORE", + "description": "event generation register", + "fields": [ + { + "name": "CCG", + "description": "Capture/compare x (x=1) generation", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/EGR_1CH_CMP": { + "extends": "EGR_1CH", + "description": "event generation register", + "fields": [ + { + "name": "COMG", + "description": "Capture/Compare control update generation", + "bit_offset": 5, + "bit_size": 1 + }, + { + "name": "BG", + "description": "Break x (x=1) generation", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/EGR_2CH": { + "extends": "EGR_1CH", + "description": "event generation register", + "fields": [ + { + "name": "CCG", + "description": "Capture/compare x (x=1-2) generation", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "TG", + "description": "Trigger generation", + "bit_offset": 6, + "bit_size": 1 + } + ] + }, + "fieldset/EGR_2CH_CMP": { + "extends": "EGR_1CH_CMP", + "description": "event generation register", + "fields": [ + { + "name": "CCG", + "description": "Capture/compare x (x=1,2) generation", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "TG", + "description": "Trigger generation", + "bit_offset": 6, + "bit_size": 1 + } + ] + }, + "fieldset/EGR_ADV": { + "extends": "EGR_2CH_CMP", + "description": "event generation register", + "fields": [ + { + "name": "CCG", + "description": "Capture/compare x (x=1-4) generation", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "BG", + "description": "Break x (x=1-2) generation", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + } + ] + }, + "fieldset/EGR_CORE": { + "description": "event generation register", + "fields": [ + { + "name": "UG", + "description": "Update generation", + "bit_offset": 0, + "bit_size": 1 + } + ] + }, + "fieldset/EGR_GP16": { + "extends": "EGR_CORE", + "description": "event generation register", + "fields": [ + { + "name": "CCG", + "description": "Capture/compare x (x=1-4) generation", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TG", + "description": "Trigger generation", + "bit_offset": 6, + "bit_size": 1 + } + ] + }, + "fieldset/RCR_1CH_CMP": { + "description": "repetition counter register", + "fields": [ + { + "name": "REP", + "description": "Repetition counter value", + "bit_offset": 0, + "bit_size": 8 + } + ] + }, + "fieldset/RCR_ADV": { + "description": "repetition counter register", + "fields": [ + { + "name": "REP", + "description": "Repetition counter value", + "bit_offset": 0, + "bit_size": 16 + } + ] + }, + "fieldset/SMCR_2CH": { + "description": "slave mode control register", + "fields": [ + { + "name": "SMS", + "description": "Slave mode selection", + "bit_offset": [ + { + "start": 0, + "end": 2 + }, + { + "start": 16, + "end": 16 + } + ], + "bit_size": 4, + "enum": "SMS" + }, + { + "name": "TS", + "description": "Trigger selection", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 20, + "end": 21 + } + ], + "bit_size": 5, + "enum": "TS" + }, + { + "name": "MSM", + "description": "Master/Slave mode", + "bit_offset": 7, + "bit_size": 1, + "enum": "MSM" + } + ] + }, + "fieldset/SMCR_2CH_CMP_V2": { + "extends": "SMCR_2CH_V2", + "description": "slave mode control register", + "fields": [ + { + "name": "SMSPE", + "description": "SMS preload enable", + "bit_offset": 24, + "bit_size": 1 + } + ] + }, + "fieldset/SMCR_2CH_V2": { + "description": "slave mode control register", + "fields": [ + { + "name": "SMS", + "description": "Slave mode selection", + "bit_offset": [ + { + "start": 0, + "end": 2 + }, + { + "start": 16, + "end": 16 + } + ], + "bit_size": 4, + "enum": "SMS_V2" + }, + { + "name": "TS", + "description": "Trigger selection", + "bit_offset": [ + { + "start": 4, + "end": 6 + }, + { + "start": 20, + "end": 21 + } + ], + "bit_size": 5, + "enum": "TS_V2" + }, + { + "name": "MSM", + "description": "Master/Slave mode", + "bit_offset": 7, + "bit_size": 1, + "enum": "MSM" + } + ] + }, + "fieldset/SMCR_ADV_V2": { + "extends": "SMCR_2CH_CMP_V2", + "description": "slave mode control register", + "fields": [ + { + "name": "OCCS", + "description": "OCREF clear selection", + "bit_offset": 3, + "bit_size": 1, + "enum": "OCCS_V2" + }, + { + "name": "ETF", + "description": "External trigger filter", + "bit_offset": 8, + "bit_size": 4, + "enum": "FilterValue" + }, + { + "name": "ETPS", + "description": "External trigger prescaler", + "bit_offset": 12, + "bit_size": 2, + "enum": "ETPS" + }, + { + "name": "ECE", + "description": "External clock mode 2 enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "ETP", + "description": "External trigger polarity", + "bit_offset": 15, + "bit_size": 1, + "enum": "ETP" + }, + { + "name": "SMSPS", + "description": "SMS preload source", + "bit_offset": 25, + "bit_size": 1, + "enum": "SMSPS_V2" + } + ] + }, + "fieldset/SMCR_GP16": { + "extends": "SMCR_2CH", + "description": "slave mode control register", + "fields": [ + { + "name": "ETF", + "description": "External trigger filter", + "bit_offset": 8, + "bit_size": 4, + "enum": "FilterValue" + }, + { + "name": "ETPS", + "description": "External trigger prescaler", + "bit_offset": 12, + "bit_size": 2, + "enum": "ETPS" + }, + { + "name": "ECE", + "description": "External clock mode 2 enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "ETP", + "description": "External trigger polarity", + "bit_offset": 15, + "bit_size": 1, + "enum": "ETP" + } + ] + }, + "fieldset/SMCR_GP16_V2": { + "extends": "SMCR_2CH_V2", + "description": "slave mode control register", + "fields": [ + { + "name": "ETF", + "description": "External trigger filter", + "bit_offset": 8, + "bit_size": 4, + "enum": "FilterValue" + }, + { + "name": "ETPS", + "description": "External trigger prescaler", + "bit_offset": 12, + "bit_size": 2, + "enum": "ETPS" + }, + { + "name": "ECE", + "description": "External clock mode 2 enable", + "bit_offset": 14, + "bit_size": 1 + }, + { + "name": "ETP", + "description": "External trigger polarity", + "bit_offset": 15, + "bit_size": 1, + "enum": "ETP" + }, + { + "name": "SMSPE", + "description": "SMS preload enable", + "bit_offset": 24, + "bit_size": 1 + }, + { + "name": "SMSPS", + "description": "SMS preload source", + "bit_offset": 25, + "bit_size": 1, + "enum": "SMSPS_V2" + } + ] + }, + "fieldset/SR_1CH": { + "extends": "SR_CORE", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/SR_1CH_CMP": { + "extends": "SR_1CH", + "description": "status register", + "fields": [ + { + "name": "COMIF", + "description": "COM interrupt flag", + "bit_offset": 5, + "bit_size": 1 + }, + { + "name": "BIF", + "description": "Break x (x=1) interrupt flag", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 1, + "stride": 1 + } + } + ] + }, + "fieldset/SR_2CH": { + "extends": "SR_1CH", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1-2) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "TIF", + "description": "Trigger interrupt flag", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1-2) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + } + ] + }, + "fieldset/SR_2CH_CMP": { + "extends": "SR_1CH_CMP", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1,2) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "TIF", + "description": "Trigger interrupt flag", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1,2) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + } + ] + }, + "fieldset/SR_ADV": { + "extends": "SR_2CH_CMP", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1-4) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "BIF", + "description": "Break x (x=1,2) interrupt flag", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1-4) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "SBIF", + "description": "System break interrupt flag", + "bit_offset": 13, + "bit_size": 1 + }, + { + "name": "CCIF5", + "description": "Capture/compare 5 interrupt flag", + "bit_offset": 16, + "bit_size": 1 + }, + { + "name": "CCIF6", + "description": "Capture/compare 6 interrupt flag", + "bit_offset": 17, + "bit_size": 1 + } + ] + }, + "fieldset/SR_ADV_V2": { + "extends": "SR_2CH_CMP", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1-4) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "BIF", + "description": "Break x (x=1,2) interrupt flag", + "bit_offset": 7, + "bit_size": 1, + "array": { + "len": 2, + "stride": 1 + } + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1-4) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "SBIF", + "description": "System break interrupt flag", + "bit_offset": 13, + "bit_size": 1 + }, + { + "name": "CCIF5", + "description": "Capture/compare 5 interrupt flag", + "bit_offset": 16, + "bit_size": 1 + }, + { + "name": "CCIF6", + "description": "Capture/compare 6 interrupt flag", + "bit_offset": 17, + "bit_size": 1 + }, + { + "name": "IDXIF", + "description": "Index interrupt flag", + "bit_offset": 20, + "bit_size": 1 + }, + { + "name": "DIRIF", + "description": "Direction change interrupt flag", + "bit_offset": 21, + "bit_size": 1 + }, + { + "name": "IERRIF", + "description": "Index error interrupt flag", + "bit_offset": 22, + "bit_size": 1 + }, + { + "name": "TERRIF", + "description": "Transition error interrupt flag", + "bit_offset": 23, + "bit_size": 1 + } + ] + }, + "fieldset/SR_CORE": { + "description": "status register", + "fields": [ + { + "name": "UIF", + "description": "Update interrupt flag", + "bit_offset": 0, + "bit_size": 1 + } + ] + }, + "fieldset/SR_GP16": { + "extends": "SR_CORE", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1-4) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TIF", + "description": "Trigger interrupt flag", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1-4) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + } + ] + }, + "fieldset/SR_GP16_V2": { + "extends": "SR_CORE", + "description": "status register", + "fields": [ + { + "name": "CCIF", + "description": "Capture/compare x (x=1-4) interrupt flag", + "bit_offset": 1, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "TIF", + "description": "Trigger interrupt flag", + "bit_offset": 6, + "bit_size": 1 + }, + { + "name": "CCOF", + "description": "Capture/Compare x (x=1-4) overcapture flag", + "bit_offset": 9, + "bit_size": 1, + "array": { + "len": 4, + "stride": 1 + } + }, + { + "name": "IDXIF", + "description": "Index interrupt flag", + "bit_offset": 20, + "bit_size": 1 + }, + { + "name": "DIRIF", + "description": "Direction change interrupt flag", + "bit_offset": 21, + "bit_size": 1 + }, + { + "name": "IERRIF", + "description": "Index error interrupt flag", + "bit_offset": 22, + "bit_size": 1 + }, + { + "name": "TERRIF", + "description": "Transition error interrupt flag", + "bit_offset": 23, + "bit_size": 1 + } + ] + }, + "fieldset/TISEL_1CH": { + "description": "input selection register", + "fields": [ + { + "name": "TISEL", + "description": "Selects TIM_TIx (x=1) input", + "bit_offset": 0, + "bit_size": 4, + "array": { + "len": 1, + "stride": 8 + } + } + ] + }, + "fieldset/TISEL_2CH": { + "extends": "TISEL_1CH", + "description": "input selection register", + "fields": [ + { + "name": "TISEL", + "description": "Selects TIM_TIx (x=1-2) input", + "bit_offset": 0, + "bit_size": 4, + "array": { + "len": 2, + "stride": 8 + } + } + ] + }, + "fieldset/TISEL_GP16": { + "description": "input selection register", + "fields": [ + { + "name": "TISEL", + "description": "Selects TIM_TIx (x=1-4) input", + "bit_offset": 0, + "bit_size": 4, + "array": { + "len": 4, + "stride": 8 + } + } + ] + }, + "enum/BKBID_V2": { + "bit_size": 1, + "variants": [ + { + "name": "Input", + "description": "Break input tim_brk in input mode", + "value": 0 + }, + { + "name": "Bidirectional", + "description": "Break input tim_brk in bidirectional mode", + "value": 1 + } + ] + }, + "enum/BKDSRM_V2": { + "bit_size": 1, + "variants": [ + { + "name": "Armed", + "description": "Break input tim_brk is armed", + "value": 0 + }, + { + "name": "Disarmed", + "description": "Break input tim_brk is disarmed", + "value": 1 + } + ] + }, + "enum/BKINP": { + "bit_size": 1, + "variants": [ + { + "name": "NotInverted", + "description": "input polarity is not inverted (active low if BKxP = 0, active high if BKxP = 1)", + "value": 0 + }, + { + "name": "Inverted", + "description": "input polarity is inverted (active high if BKxP = 0, active low if BKxP = 1)", + "value": 1 + } + ] + }, + "enum/BKP": { + "bit_size": 1, + "variants": [ + { + "name": "ActiveLow", + "description": "Break input tim_brk is active low", + "value": 0 + }, + { + "name": "ActiveHigh", + "description": "Break input tim_brk is active high", + "value": 1 + } + ] + }, + "enum/CCDS": { + "bit_size": 1, + "variants": [ + { + "name": "OnCompare", + "description": "CCx DMA request sent when CCx event occurs", + "value": 0 + }, + { + "name": "OnUpdate", + "description": "CCx DMA request sent when update event occurs", + "value": 1 + } + ] + }, + "enum/CCMR_Input_CCS": { + "bit_size": 2, + "variants": [ + { + "name": "TI4", + "description": "CCx channel is configured as input, normal mapping: ICx mapped to TIx", + "value": 1 + }, + { + "name": "TI3", + "description": "CCx channel is configured as input, alternate mapping (switches 1 with 2, 3 with 4)", + "value": 2 + }, + { + "name": "TRC", + "description": "CCx channel is configured as input, ICx is mapped on TRC", + "value": 3 + } + ] + }, + "enum/CCMR_Output_CCS": { + "bit_size": 2, + "variants": [ + { + "name": "Output", + "description": "CCx channel is configured as output", + "value": 0 + } + ] + }, + "enum/CKD": { + "bit_size": 2, + "variants": [ + { + "name": "Div1", + "description": "t_DTS = t_CK_INT", + "value": 0 + }, + { + "name": "Div2", + "description": "t_DTS = 2 × t_CK_INT", + "value": 1 + }, + { + "name": "Div4", + "description": "t_DTS = 4 × t_CK_INT", + "value": 2 + } + ] + }, + "enum/CMS": { + "bit_size": 2, + "variants": [ + { + "name": "EdgeAligned", + "description": "The counter counts up or down depending on the direction bit", + "value": 0 + }, + { + "name": "CenterAligned1", + "description": "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting down.", + "value": 1 + }, + { + "name": "CenterAligned2", + "description": "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting up.", + "value": 2 + }, + { + "name": "CenterAligned3", + "description": "The counter counts up and down alternatively. Output compare interrupt flags are set both when the counter is counting up or down.", + "value": 3 + } + ] + }, + "enum/DBSS_V2": { + "bit_size": 4, + "variants": [ + { + "name": "Update", + "description": "Update", + "value": 1 + }, + { + "name": "CC1", + "description": "CC1", + "value": 2 + }, + { + "name": "CC2", + "description": "CC2", + "value": 3 + }, + { + "name": "CC3", + "description": "CC3", + "value": 4 + }, + { + "name": "CC4", + "description": "CC4", + "value": 5 + }, + { + "name": "COM", + "description": "COM", + "value": 6 + }, + { + "name": "Trigger", + "description": "Trigger", + "value": 7 + } + ] + }, + "enum/DIR": { + "bit_size": 1, + "variants": [ + { + "name": "Up", + "description": "Counter used as upcounter", + "value": 0 + }, + { + "name": "Down", + "description": "Counter used as downcounter", + "value": 1 + } + ] + }, + "enum/DTAE_V2": { + "bit_size": 1, + "variants": [ + { + "name": "Identical", + "description": "Deadtime on rising and falling edges are identical, and defined with DTG[7:0] register", + "value": 0 + }, + { + "name": "Distinct", + "description": "Deadtime on rising edge is defined with DTG[7:0] register and deadtime on falling edge is defined with DTGF[7:0] bits.", + "value": 1 + } + ] + }, + "enum/ETP": { + "bit_size": 1, + "variants": [ + { + "name": "NotInverted", + "description": "ETR is noninverted, active at high level or rising edge", + "value": 0 + }, + { + "name": "Inverted", + "description": "ETR is inverted, active at low level or falling edge", + "value": 1 + } + ] + }, + "enum/ETPS": { + "bit_size": 2, + "variants": [ + { + "name": "Div1", + "description": "Prescaler OFF", + "value": 0 + }, + { + "name": "Div2", + "description": "ETRP frequency divided by 2", + "value": 1 + }, + { + "name": "Div4", + "description": "ETRP frequency divided by 4", + "value": 2 + }, + { + "name": "Div8", + "description": "ETRP frequency divided by 8", + "value": 3 + } + ] + }, + "enum/FIDX_V2": { + "bit_size": 1, + "variants": [ + { + "name": "AlwaysActive", + "description": "Index is always active", + "value": 0 + }, + { + "name": "FirstOnly", + "description": "the first Index only resets the counter", + "value": 1 + } + ] + }, + "enum/FilterValue": { + "bit_size": 4, + "variants": [ + { + "name": "NoFilter", + "description": "No filter, sampling is done at fDTS", + "value": 0 + }, + { + "name": "FCK_INT_N2", + "description": "fSAMPLING=fCK_INT, N=2", + "value": 1 + }, + { + "name": "FCK_INT_N4", + "description": "fSAMPLING=fCK_INT, N=4", + "value": 2 + }, + { + "name": "FCK_INT_N8", + "description": "fSAMPLING=fCK_INT, N=8", + "value": 3 + }, + { + "name": "FDTS_Div2_N6", + "description": "fSAMPLING=fDTS/2, N=6", + "value": 4 + }, + { + "name": "FDTS_Div2_N8", + "description": "fSAMPLING=fDTS/2, N=8", + "value": 5 + }, + { + "name": "FDTS_Div4_N6", + "description": "fSAMPLING=fDTS/4, N=6", + "value": 6 + }, + { + "name": "FDTS_Div4_N8", + "description": "fSAMPLING=fDTS/4, N=8", + "value": 7 + }, + { + "name": "FDTS_Div8_N6", + "description": "fSAMPLING=fDTS/8, N=6", + "value": 8 + }, + { + "name": "FDTS_Div8_N8", + "description": "fSAMPLING=fDTS/8, N=8", + "value": 9 + }, + { + "name": "FDTS_Div16_N5", + "description": "fSAMPLING=fDTS/16, N=5", + "value": 10 + }, + { + "name": "FDTS_Div16_N6", + "description": "fSAMPLING=fDTS/16, N=6", + "value": 11 + }, + { + "name": "FDTS_Div16_N8", + "description": "fSAMPLING=fDTS/16, N=8", + "value": 12 + }, + { + "name": "FDTS_Div32_N5", + "description": "fSAMPLING=fDTS/32, N=5", + "value": 13 + }, + { + "name": "FDTS_Div32_N6", + "description": "fSAMPLING=fDTS/32, N=6", + "value": 14 + }, + { + "name": "FDTS_Div32_N8", + "description": "fSAMPLING=fDTS/32, N=8", + "value": 15 + } + ] + }, + "enum/GC5C": { + "bit_size": 1, + "variants": [ + { + "name": "NoEffect", + "description": "No effect of TIM_OC5REF on TIM_OCxREFC (x=1-3)", + "value": 0 + }, + { + "name": "LogicalAND", + "description": "TIM_OCxREFC is the logical AND of TIM_OCxREF and TIM_OC5REF", + "value": 1 + } + ] + }, + "enum/IBLK_V2": { + "bit_size": 2, + "variants": [ + { + "name": "AlwaysActive", + "description": "Index always active", + "value": 0 + }, + { + "name": "CC3P", + "description": "Index disabled when tim_ti3 input is active, as per CC3P bitfield", + "value": 1 + }, + { + "name": "CC4P", + "description": "Index disabled when tim_ti4 input is active, as per CC4P bitfield", + "value": 2 + } + ] + }, + "enum/IDIR_V2": { + "bit_size": 2, + "variants": [ + { + "name": "Both", + "description": "Index resets the counter whatever the direction", + "value": 0 + }, + { + "name": "Up", + "description": "Index resets the counter when up-counting only", + "value": 1 + }, + { + "name": "Down", + "description": "Index resets the counter when down-counting only", + "value": 2 + } + ] + }, + "enum/LOCK": { + "bit_size": 2, + "variants": [ + { + "name": "Disabled", + "description": "No bit is write protected", + "value": 0 + }, + { + "name": "Level1", + "description": "DTG bits in TIMx_BDTR register, OISx and OISxN bits in TIMx_CR2 register and BKBID/BKE/BKP/AOE bits in TIMx_BDTR register can no longer be written", + "value": 1 + }, + { + "name": "Level2", + "description": "LOCK Level 1 + CC Polarity bits (CCxP/CCxNP bits in TIMx_CCER register, as long as the related channel is configured in output through the CCxS bits) as well as OSSR and OSSI bits can no longer be written.", + "value": 2 + }, + { + "name": "Level3", + "description": "LOCK Level 2 + CC Control bits (OCxM and OCxPE bits in TIMx_CCMRx registers, as long as the related channel is configured in output through the CCxS bits) can no longer be written.", + "value": 3 + } + ] + }, + "enum/MMS": { + "bit_size": 3, + "variants": [ + { + "name": "Reset", + "description": "The UG bit from the TIMx_EGR register is used as trigger output", + "value": 0 + }, + { + "name": "Enable", + "description": "The counter enable signal, CNT_EN, is used as trigger output", + "value": 1 + }, + { + "name": "Update", + "description": "The update event is selected as trigger output", + "value": 2 + }, + { + "name": "ComparePulse", + "description": "The trigger output send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred", + "value": 3 + }, + { + "name": "CompareOC1", + "description": "OC1REF signal is used as trigger output", + "value": 4 + }, + { + "name": "CompareOC2", + "description": "OC2REF signal is used as trigger output", + "value": 5 + }, + { + "name": "CompareOC3", + "description": "OC3REF signal is used as trigger output", + "value": 6 + }, + { + "name": "CompareOC4", + "description": "OC4REF signal is used as trigger output", + "value": 7 + } + ] + }, + "enum/MMS2": { + "bit_size": 4, + "variants": [ + { + "name": "Reset", + "description": "The UG bit from the TIMx_EGR register is used as TRGO2", + "value": 0 + }, + { + "name": "Enable", + "description": "The counter enable signal, CNT_EN, is used as TRGO2", + "value": 1 + }, + { + "name": "Update", + "description": "The update event is selected as TRGO2", + "value": 2 + }, + { + "name": "ComparePulse", + "description": "TRGO2 send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred", + "value": 3 + }, + { + "name": "CompareOC1", + "description": "OC1REF signal is used as TRGO2", + "value": 4 + }, + { + "name": "CompareOC2", + "description": "OC2REF signal is used as TRGO2", + "value": 5 + }, + { + "name": "CompareOC3", + "description": "OC3REF signal is used as TRGO2", + "value": 6 + }, + { + "name": "CompareOC4", + "description": "OC4REF signal is used as TRGO2", + "value": 7 + }, + { + "name": "CompareOC5", + "description": "OC5REF signal is used as TRGO2", + "value": 8 + }, + { + "name": "CompareOC6", + "description": "OC6REF signal is used as TRGO2", + "value": 9 + }, + { + "name": "ComparePulse_OC4", + "description": "OC4REF rising or falling edges generate pulses on TRGO2", + "value": 10 + }, + { + "name": "ComparePulse_OC6", + "description": "OC6REF rising or falling edges generate pulses on TRGO2", + "value": 11 + }, + { + "name": "ComparePulse_OC4_Or_OC6_Rising", + "description": "OC4REF or OC6REF rising edges generate pulses on TRGO2", + "value": 12 + }, + { + "name": "ComparePulse_OC4_Rising_Or_OC6_Falling", + "description": "OC4REF rising or OC6REF falling edges generate pulses on TRGO2", + "value": 13 + }, + { + "name": "ComparePulse_OC5_Or_OC6_Rising", + "description": "OC5REF or OC6REF rising edges generate pulses on TRGO2", + "value": 14 + }, + { + "name": "ComparePulse_OC5_Rising_Or_OC6_Falling", + "description": "OC5REF rising or OC6REF falling edges generate pulses on TRGO2", + "value": 15 + } + ] + }, + "enum/MMS_V2": { + "bit_size": 4, + "variants": [ + { + "name": "Reset", + "description": "The UG bit from the TIMx_EGR register is used as trigger output", + "value": 0 + }, + { + "name": "Enable", + "description": "The counter enable signal, CNT_EN, is used as trigger output", + "value": 1 + }, + { + "name": "Update", + "description": "The update event is selected as trigger output", + "value": 2 + }, + { + "name": "ComparePulse", + "description": "The trigger output send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred", + "value": 3 + }, + { + "name": "CompareOC1", + "description": "OC1REF signal is used as trigger output", + "value": 4 + }, + { + "name": "CompareOC2", + "description": "OC2REF signal is used as trigger output", + "value": 5 + }, + { + "name": "CompareOC3", + "description": "OC3REF signal is used as trigger output", + "value": 6 + }, + { + "name": "CompareOC4", + "description": "OC4REF signal is used as trigger output", + "value": 7 + }, + { + "name": "EncoderClockOutput", + "description": "The encoder clock signal is used as trigger output", + "value": 8 + } + ] + }, + "enum/MSM": { + "bit_size": 1, + "variants": [ + { + "name": "NoSync", + "description": "No action", + "value": 0 + }, + { + "name": "Sync", + "description": "The effect of an event on the trigger input (TRGI) is delayed to allow a perfect synchronization between the current timer and its slaves (through TRGO). It is useful if we want to synchronize several timers on a single external event.", + "value": 1 + } + ] + }, + "enum/OCCS_V2": { + "bit_size": 1, + "variants": [ + { + "name": "Input", + "description": "tim_ocref_clr_int is connected to the tim_ocref_clr input", + "value": 0 + }, + { + "name": "ETRF", + "description": "tim_ocref_clr_int is connected to tim_etrf", + "value": 1 + } + ] + }, + "enum/OCM": { + "bit_size": 3, + "variants": [ + { + "name": "Frozen", + "description": "The comparison between the output compare register TIMx_CCRy and the counter TIMx_CNT has no effect on the outputs", + "value": 0 + }, + { + "name": "ActiveOnMatch", + "description": "Set channel to active level on match. OCyREF signal is forced high when the counter matches the capture/compare register", + "value": 1 + }, + { + "name": "InactiveOnMatch", + "description": "Set channel to inactive level on match. OCyREF signal is forced low when the counter matches the capture/compare register", + "value": 2 + }, + { + "name": "Toggle", + "description": "OCyREF toggles when TIMx_CNT=TIMx_CCRy", + "value": 3 + }, + { + "name": "ForceInactive", + "description": "OCyREF is forced low", + "value": 4 + }, + { + "name": "ForceActive", + "description": "OCyREF is forced high", + "value": 5 + }, + { + "name": "PwmMode1", + "description": "In upcounting, channel is active as long as TIMx_CNT<TIMx_CCRy else inactive. In downcounting, channel is inactive as long as TIMx_CNT>TIMx_CCRy else active", + "value": 6 + }, + { + "name": "PwmMode2", + "description": "Inversely to PwmMode1", + "value": 7 + } + ] + }, + "enum/OCM_V2": { + "bit_size": 4, + "variants": [ + { + "name": "Frozen", + "description": "The comparison between the output compare register TIMx_CCRy and the counter TIMx_CNT has no effect on the outputs", + "value": 0 + }, + { + "name": "ActiveOnMatch", + "description": "Set channel to active level on match. OCyREF signal is forced high when the counter matches the capture/compare register", + "value": 1 + }, + { + "name": "InactiveOnMatch", + "description": "Set channel to inactive level on match. OCyREF signal is forced low when the counter matches the capture/compare register", + "value": 2 + }, + { + "name": "Toggle", + "description": "OCyREF toggles when TIMx_CNT=TIMx_CCRy", + "value": 3 + }, + { + "name": "ForceInactive", + "description": "OCyREF is forced low", + "value": 4 + }, + { + "name": "ForceActive", + "description": "OCyREF is forced high", + "value": 5 + }, + { + "name": "PwmMode1", + "description": "In upcounting, channel is active as long as TIMx_CNT<TIMx_CCRy else inactive. In downcounting, channel is inactive as long as TIMx_CNT>TIMx_CCRy else active", + "value": 6 + }, + { + "name": "PwmMode2", + "description": "Inversely to PwmMode1", + "value": 7 + }, + { + "name": "Retrigerrable_OPM_Mode_1", + "description": "In up-counting mode, the channel is active until a trigger\nevent is detected (on tim_trgi signal). Then, a comparison is performed as in PWM\nmode 1 and the channels becomes active again at the next update. In down-counting\nmode, the channel is inactive until a trigger event is detected (on tim_trgi signal).\nThen, a comparison is performed as in PWM mode 1 and the channels becomes\ninactive again at the next update.", + "value": 8 + }, + { + "name": "Retrigerrable_OPM_Mode_2", + "description": "In up-counting mode, the channel is inactive until a\ntrigger event is detected (on tim_trgi signal). Then, a comparison is performed as in\nPWM mode 2 and the channels becomes inactive again at the next update. In down-\ncounting mode, the channel is active until a trigger event is detected (on tim_trgi\nsignal). Then, a comparison is performed as in PWM mode 1 and the channels\nbecomes active again at the next update.", + "value": 9 + }, + { + "name": "_reserved1", + "description": "_reserved1", + "value": 10 + }, + { + "name": "_reserved2", + "description": "_reserved2", + "value": 11 + }, + { + "name": "Combined_PWM_Mode_1", + "description": "tim_oc1ref has the same behavior as in PWM mode 1.\ntim_oc1refc is the logical OR between tim_oc1ref and tim_oc2ref.", + "value": 12 + }, + { + "name": "Combined_PWM_Mode_2", + "description": "tim_oc1ref has the same behavior as in PWM mode 2.\ntim_oc1refc is the logical AND between tim_oc1ref and tim_oc2ref.", + "value": 13 + }, + { + "name": "Asymmetric_PWM_Mode_1", + "description": "tim_oc1ref has the same behavior as in PWM mode 1.\ntim_oc1refc outputs tim_oc1ref when the counter is counting up, tim_oc2ref when it is\ncounting down.", + "value": 14 + }, + { + "name": "Asymmetric_PWM_Mode_2", + "description": "tim_oc1ref has the same behavior as in PWM mode 2.\ntim_oc1refc outputs tim_oc1ref when the counter is counting up, tim_oc2ref when it is\ncounting down.", + "value": 15 + } + ] + }, + "enum/OSSI": { + "bit_size": 1, + "variants": [ + { + "name": "Disabled", + "description": "When inactive, OC/OCN outputs are disabled", + "value": 0 + }, + { + "name": "IdleLevel", + "description": "When inactive, OC/OCN outputs are forced to idle level", + "value": 1 + } + ] + }, + "enum/OSSR": { + "bit_size": 1, + "variants": [ + { + "name": "Disabled", + "description": "When inactive, OC/OCN outputs are disabled", + "value": 0 + }, + { + "name": "IdleLevel", + "description": "When inactive, OC/OCN outputs are enabled with their inactive level", + "value": 1 + } + ] + }, + "enum/SMS": { + "bit_size": 4, + "variants": [ + { + "name": "Disabled", + "description": "Slave mode disabled - if CEN = '1' then the prescaler is clocked directly by the internal clock.", + "value": 0 + }, + { + "name": "Encoder_Mode_1", + "description": "Encoder mode 1 - Counter counts up/down on TI2FP1 edge depending on TI1FP2 level.", + "value": 1 + }, + { + "name": "Encoder_Mode_2", + "description": "Encoder mode 2 - Counter counts up/down on TI1FP2 edge depending on TI2FP1 level.", + "value": 2 + }, + { + "name": "Encoder_Mode_3", + "description": "Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges depending on the level of the other input.", + "value": 3 + }, + { + "name": "Reset_Mode", + "description": "Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes the counter and generates an update of the registers.", + "value": 4 + }, + { + "name": "Gated_Mode", + "description": "Gated Mode - The counter clock is enabled when the trigger input (TRGI) is high. The counter stops (but is not reset) as soon as the trigger becomes low. Both start and stop of the counter are controlled.", + "value": 5 + }, + { + "name": "Trigger_Mode", + "description": "Trigger Mode - The counter starts at a rising edge of the trigger TRGI (but it is not reset). Only the start of the counter is controlled.", + "value": 6 + }, + { + "name": "Ext_Clock_Mode", + "description": "External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock the counter.", + "value": 7 + }, + { + "name": "Combined_Reset_Trigger", + "description": "Rising edge of the selected trigger input (tim_trgi) reinitializes the counter, generates an update of the registers and starts the counter.", + "value": 8 + } + ] + }, + "enum/SMSPS_V2": { + "bit_size": 1, + "variants": [ + { + "name": "Update", + "description": "The transfer is triggered by the Timer’s Update event", + "value": 0 + }, + { + "name": "Index", + "description": "The transfer is triggered by the Index event", + "value": 1 + } + ] + }, + "enum/SMS_V2": { + "bit_size": 4, + "variants": [ + { + "name": "Disabled", + "description": "Slave mode disabled - if CEN = '1' then the prescaler is clocked directly by the internal clock.", + "value": 0 + }, + { + "name": "Encoder_Mode_1", + "description": "Encoder mode 1 - Counter counts up/down on TI2FP1 edge depending on TI1FP2 level.", + "value": 1 + }, + { + "name": "Encoder_Mode_2", + "description": "Encoder mode 2 - Counter counts up/down on TI1FP2 edge depending on TI2FP1 level.", + "value": 2 + }, + { + "name": "Encoder_Mode_3", + "description": "Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges depending on the level of the other input.", + "value": 3 + }, + { + "name": "Reset_Mode", + "description": "Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes the counter and generates an update of the registers.", + "value": 4 + }, + { + "name": "Gated_Mode", + "description": "Gated Mode - The counter clock is enabled when the trigger input (TRGI) is high. The counter stops (but is not reset) as soon as the trigger becomes low. Both start and stop of the counter are controlled.", + "value": 5 + }, + { + "name": "Trigger_Mode", + "description": "Trigger Mode - The counter starts at a rising edge of the trigger TRGI (but it is not reset). Only the start of the counter is controlled.", + "value": 6 + }, + { + "name": "Ext_Clock_Mode", + "description": "External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock the counter.", + "value": 7 + }, + { + "name": "Combined_Reset_Trigger", + "description": "Rising edge of the selected trigger input (tim_trgi) reinitializes the counter, generates an update of the registers and starts the counter.", + "value": 8 + }, + { + "name": "Combined_Gated_Trigger", + "description": "The counter clock is enabled when the trigger input (tim_trgi) is high. The counter stops and is reset) as soon as the trigger becomes low. Both start and stop of the counter are controlled.", + "value": 9 + }, + { + "name": "Encoder_Up_X2", + "description": "Encoder mode, Clock plus direction, x2 mode.", + "value": 10 + }, + { + "name": "Encoder_Up_X1", + "description": "Encoder mode, Clock plus direction, x1 mode, tim_ti2fp2 edge sensitivity is set by CC2P", + "value": 11 + }, + { + "name": "Encoder_Dir_X2", + "description": "Encoder mode, Directional Clock, x2 mode.", + "value": 12 + }, + { + "name": "Encoder_Dir_X1", + "description": "Encoder mode, Directional Clock, x1 mode, tim_ti1fp1 and tim_ti2fp2 edge sensitivity is set by CC1P and CC2P.", + "value": 13 + }, + { + "name": "Quadrature_Encoder_Mode_X1_TI1PF1", + "description": "Quadrature encoder mode, x1 mode, counting on tim_ti1fp1 edges only, edge sensitivity is set by CC1P.", + "value": 14 + }, + { + "name": "Quadrature_Encoder_Mode_X1_TI2PF2", + "description": "Quadrature encoder mode, x1 mode, counting on tim_ti2fp2 edges only, edge sensitivity is set by CC2P.", + "value": 15 + } + ] + }, + "enum/TI1S": { + "bit_size": 1, + "variants": [ + { + "name": "Normal", + "description": "The TIMx_CH1 pin is connected to TI1 input", + "value": 0 + }, + { + "name": "XOR", + "description": "The TIMx_CH1, CH2, CH3 pins are connected to TI1 input", + "value": 1 + } + ] + }, + "enum/TS": { + "bit_size": 5, + "variants": [ + { + "name": "ITR0", + "description": "Internal Trigger 0", + "value": 0 + }, + { + "name": "ITR1", + "description": "Internal Trigger 1", + "value": 1 + }, + { + "name": "ITR2", + "description": "Internal Trigger 2", + "value": 2 + }, + { + "name": "ITR3", + "description": "Internal Trigger 3", + "value": 3 + }, + { + "name": "TI1F_ED", + "description": "TI1 Edge Detector", + "value": 4 + }, + { + "name": "TI1FP1", + "description": "Filtered Timer Input 1", + "value": 5 + }, + { + "name": "TI2FP2", + "description": "Filtered Timer Input 2", + "value": 6 + }, + { + "name": "ETRF", + "description": "External Trigger input", + "value": 7 + } + ] + }, + "enum/TS_V2": { + "bit_size": 5, + "variants": [ + { + "name": "ITR0", + "description": "Internal Trigger 0", + "value": 0 + }, + { + "name": "ITR1", + "description": "Internal Trigger 1", + "value": 1 + }, + { + "name": "ITR2", + "description": "Internal Trigger 2", + "value": 2 + }, + { + "name": "ITR3", + "description": "Internal Trigger 3", + "value": 3 + }, + { + "name": "TI1F_ED", + "description": "TI1 Edge Detector", + "value": 4 + }, + { + "name": "TI1FP1", + "description": "Filtered Timer Input 1", + "value": 5 + }, + { + "name": "TI2FP2", + "description": "Filtered Timer Input 2", + "value": 6 + }, + { + "name": "ETRF", + "description": "External Trigger input", + "value": 7 + }, + { + "name": "ITR4", + "description": "Internal Trigger 4", + "value": 8 + }, + { + "name": "ITR5", + "description": "Internal Trigger 5", + "value": 9 + }, + { + "name": "ITR6", + "description": "Internal Trigger 6", + "value": 10 + }, + { + "name": "ITR7", + "description": "Internal Trigger 7", + "value": 11 + }, + { + "name": "ITR8", + "description": "Internal Trigger 8", + "value": 12 + }, + { + "name": "ITR9", + "description": "Internal Trigger 9", + "value": 13 + }, + { + "name": "ITR10", + "description": "Internal Trigger 10", + "value": 14 + }, + { + "name": "ITR11", + "description": "Internal Trigger 11", + "value": 15 + }, + { + "name": "ITR12", + "description": "Internal Trigger 12", + "value": 16 + }, + { + "name": "ITR13", + "description": "Internal Trigger 13", + "value": 17 + }, + { + "name": "ITR14", + "description": "Internal Trigger 14", + "value": 18 + }, + { + "name": "ITR15", + "description": "Internal Trigger 15", + "value": 19 + } + ] + }, + "enum/URS": { + "bit_size": 1, + "variants": [ + { + "name": "AnyEvent", + "description": "Any of counter overflow/underflow, setting UG, or update through slave mode, generates an update interrupt or DMA request", + "value": 0 + }, + { + "name": "CounterOnly", + "description": "Only counter overflow/underflow generates an update interrupt or DMA request", + "value": 1 + } + ] + } +} \ No newline at end of file