From a5fa69bfcb9a02b599f882700a9afc15ad7614f9 Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Fri, 19 Feb 2021 13:19:05 +0100 Subject: [PATCH 1/5] WWDG fix for H7 --- devices/common_patches/h7_wwdg.yaml | 6 ++++++ devices/stm32g431.yaml | 2 +- devices/stm32g441.yaml | 2 +- devices/stm32g471.yaml | 2 +- devices/stm32g473.yaml | 2 +- devices/stm32g474.yaml | 2 +- devices/stm32g483.yaml | 2 +- devices/stm32g484.yaml | 2 +- devices/stm32g491.yaml | 2 +- devices/stm32g4a1.yaml | 2 +- devices/stm32h743.yaml | 3 ++- devices/stm32h743v.yaml | 3 ++- devices/stm32h747cm4.yaml | 3 ++- devices/stm32h747cm7.yaml | 3 ++- devices/stm32h753.yaml | 3 ++- devices/stm32h753v.yaml | 3 ++- devices/stm32h7b3.yaml | 3 ++- peripherals/wwdg/{g4_wwdg.yaml => wwdg_v2.yaml} | 2 +- 18 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 devices/common_patches/h7_wwdg.yaml rename peripherals/wwdg/{g4_wwdg.yaml => wwdg_v2.yaml} (87%) diff --git a/devices/common_patches/h7_wwdg.yaml b/devices/common_patches/h7_wwdg.yaml new file mode 100644 index 000000000..f5b728455 --- /dev/null +++ b/devices/common_patches/h7_wwdg.yaml @@ -0,0 +1,6 @@ +WWDG: + CFG: + _modify: + WDGTB: + bitWidth: 3 + \ No newline at end of file diff --git a/devices/stm32g431.yaml b/devices/stm32g431.yaml index 4077b7a79..f6013f87b 100644 --- a/devices/stm32g431.yaml +++ b/devices/stm32g431.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g441.yaml b/devices/stm32g441.yaml index 151860714..b11647f6c 100644 --- a/devices/stm32g441.yaml +++ b/devices/stm32g441.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g471.yaml b/devices/stm32g471.yaml index c1c75cd34..2be16aa83 100644 --- a/devices/stm32g471.yaml +++ b/devices/stm32g471.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g473.yaml b/devices/stm32g473.yaml index 088572deb..e11685d29 100644 --- a/devices/stm32g473.yaml +++ b/devices/stm32g473.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g474.yaml b/devices/stm32g474.yaml index cb4e22f08..ed13e0879 100644 --- a/devices/stm32g474.yaml +++ b/devices/stm32g474.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g483.yaml b/devices/stm32g483.yaml index d5d27a348..662aadf72 100644 --- a/devices/stm32g483.yaml +++ b/devices/stm32g483.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g484.yaml b/devices/stm32g484.yaml index 5bee5a9a2..2811d8b0b 100644 --- a/devices/stm32g484.yaml +++ b/devices/stm32g484.yaml @@ -10,7 +10,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/sai/sai_v1.yaml diff --git a/devices/stm32g491.yaml b/devices/stm32g491.yaml index b698a1d75..8722875e6 100644 --- a/devices/stm32g491.yaml +++ b/devices/stm32g491.yaml @@ -21,7 +21,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/rtc/rtc_cr.yaml diff --git a/devices/stm32g4a1.yaml b/devices/stm32g4a1.yaml index 56f341257..3031bf927 100644 --- a/devices/stm32g4a1.yaml +++ b/devices/stm32g4a1.yaml @@ -21,7 +21,7 @@ _include: - ./common_patches/g4_comp.yaml - ./common_patches/g4_adc.yaml - ../peripherals/iwdg/iwdg_with_WINR.yaml - - ../peripherals/wwdg/g4_wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ./common_patches/g4_cordic.yaml - ../peripherals/cordic/cordic_g4.yaml - ./common_patches/rtc/rtc_cr.yaml diff --git a/devices/stm32h743.yaml b/devices/stm32h743.yaml index aa624cc5e..4956a50d8 100644 --- a/devices/stm32h743.yaml +++ b/devices/stm32h743.yaml @@ -64,7 +64,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -75,3 +75,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h743v.yaml b/devices/stm32h743v.yaml index b3ce2957e..c71b589e3 100644 --- a/devices/stm32h743v.yaml +++ b/devices/stm32h743v.yaml @@ -66,7 +66,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -77,3 +77,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h747cm4.yaml b/devices/stm32h747cm4.yaml index f55e06dde..8a15de44d 100644 --- a/devices/stm32h747cm4.yaml +++ b/devices/stm32h747cm4.yaml @@ -82,10 +82,11 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml - ../peripherals/tim/tim1234_1567_ccm_v2.yaml - ../peripherals/sai/sai.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h747cm7.yaml b/devices/stm32h747cm7.yaml index 5a5f21ce7..80e2c3075 100644 --- a/devices/stm32h747cm7.yaml +++ b/devices/stm32h747cm7.yaml @@ -82,7 +82,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -93,3 +93,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h753.yaml b/devices/stm32h753.yaml index 4b4ff46cf..2dbe16147 100644 --- a/devices/stm32h753.yaml +++ b/devices/stm32h753.yaml @@ -73,7 +73,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -84,3 +84,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h753v.yaml b/devices/stm32h753v.yaml index 5696ee61c..477b6b56e 100644 --- a/devices/stm32h753v.yaml +++ b/devices/stm32h753v.yaml @@ -76,7 +76,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdgv2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -87,3 +87,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h7b3.yaml b/devices/stm32h7b3.yaml index 1c3a8c214..15e4996f5 100644 --- a/devices/stm32h7b3.yaml +++ b/devices/stm32h7b3.yaml @@ -152,7 +152,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdg.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml @@ -163,3 +163,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml + - common_patches/h7_wwdg.yaml diff --git a/peripherals/wwdg/g4_wwdg.yaml b/peripherals/wwdg/wwdg_v2.yaml similarity index 87% rename from peripherals/wwdg/g4_wwdg.yaml rename to peripherals/wwdg/wwdg_v2.yaml index 263cf934c..9d0d77e1e 100644 --- a/peripherals/wwdg/g4_wwdg.yaml +++ b/peripherals/wwdg/wwdg_v2.yaml @@ -1,4 +1,4 @@ -# WWDG peripheral for the g4 family. +# WWDG peripheral for the g4 and h7 families. # Extend `wwdg.yaml`. _include: From a3792d2ccabb72ebf61e96b6fec81ac4034593a9 Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Fri, 19 Feb 2021 13:25:55 +0100 Subject: [PATCH 2/5] Small mistake fixed --- devices/stm32h753v.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/stm32h753v.yaml b/devices/stm32h753v.yaml index 477b6b56e..25da11ba3 100644 --- a/devices/stm32h753v.yaml +++ b/devices/stm32h753v.yaml @@ -76,7 +76,7 @@ _include: - ../peripherals/iwdg/iwdg_with_WINR.yaml - ../peripherals/exti/exti_h7.yaml - ../peripherals/i2c/i2c_v2.yaml - - ../peripherals/wwdg/wwdgv2.yaml + - ../peripherals/wwdg/wwdg_v2.yaml - ../peripherals/usart/usart_v2B1.yaml - common_patches/tim/tim_ccr.yaml - ../peripherals/tim/tim_ccm_v2.yaml From 0193f3d352633a067068378ea72c5b789b377a5f Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Fri, 19 Feb 2021 13:41:39 +0100 Subject: [PATCH 3/5] Typo fix --- devices/common_patches/h7_wwdg.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/devices/common_patches/h7_wwdg.yaml b/devices/common_patches/h7_wwdg.yaml index f5b728455..d9da1b454 100644 --- a/devices/common_patches/h7_wwdg.yaml +++ b/devices/common_patches/h7_wwdg.yaml @@ -1,6 +1,5 @@ WWDG: - CFG: + CFR: _modify: WDGTB: bitWidth: 3 - \ No newline at end of file From 012135527a3cfe215e6d00dda4595603084df565 Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Fri, 19 Feb 2021 14:05:07 +0100 Subject: [PATCH 4/5] Added wwdg1 --- devices/common_patches/h7_wwdg1.yaml | 5 +++++ devices/stm32h747cm4.yaml | 2 +- devices/stm32h747cm7.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 devices/common_patches/h7_wwdg1.yaml diff --git a/devices/common_patches/h7_wwdg1.yaml b/devices/common_patches/h7_wwdg1.yaml new file mode 100644 index 000000000..e112c0c67 --- /dev/null +++ b/devices/common_patches/h7_wwdg1.yaml @@ -0,0 +1,5 @@ +WWDG1: + CFR: + _modify: + WDGTB: + bitWidth: 3 diff --git a/devices/stm32h747cm4.yaml b/devices/stm32h747cm4.yaml index 8a15de44d..98cb5ac85 100644 --- a/devices/stm32h747cm4.yaml +++ b/devices/stm32h747cm4.yaml @@ -89,4 +89,4 @@ _include: - ../peripherals/tim/tim1234_1567_ccm_v2.yaml - ../peripherals/sai/sai.yaml - common_patches/h7_crc_addr_fix.yaml - - common_patches/h7_wwdg.yaml + - common_patches/h7_wwdg1.yaml diff --git a/devices/stm32h747cm7.yaml b/devices/stm32h747cm7.yaml index 80e2c3075..cbd5313b8 100644 --- a/devices/stm32h747cm7.yaml +++ b/devices/stm32h747cm7.yaml @@ -93,4 +93,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml - - common_patches/h7_wwdg.yaml + - common_patches/h7_wwdg1.yaml From 4dd2d3c2fcca69685ba51f4a36897220a78e682d Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Fri, 19 Feb 2021 14:17:40 +0100 Subject: [PATCH 5/5] Now generic over the wwdg name --- devices/common_patches/h7_wwdg.yaml | 2 +- devices/common_patches/h7_wwdg1.yaml | 5 ----- devices/stm32h747cm4.yaml | 2 +- devices/stm32h747cm7.yaml | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 devices/common_patches/h7_wwdg1.yaml diff --git a/devices/common_patches/h7_wwdg.yaml b/devices/common_patches/h7_wwdg.yaml index d9da1b454..36f481a8f 100644 --- a/devices/common_patches/h7_wwdg.yaml +++ b/devices/common_patches/h7_wwdg.yaml @@ -1,4 +1,4 @@ -WWDG: +"WWDG,WWDG?": CFR: _modify: WDGTB: diff --git a/devices/common_patches/h7_wwdg1.yaml b/devices/common_patches/h7_wwdg1.yaml deleted file mode 100644 index e112c0c67..000000000 --- a/devices/common_patches/h7_wwdg1.yaml +++ /dev/null @@ -1,5 +0,0 @@ -WWDG1: - CFR: - _modify: - WDGTB: - bitWidth: 3 diff --git a/devices/stm32h747cm4.yaml b/devices/stm32h747cm4.yaml index 98cb5ac85..8a15de44d 100644 --- a/devices/stm32h747cm4.yaml +++ b/devices/stm32h747cm4.yaml @@ -89,4 +89,4 @@ _include: - ../peripherals/tim/tim1234_1567_ccm_v2.yaml - ../peripherals/sai/sai.yaml - common_patches/h7_crc_addr_fix.yaml - - common_patches/h7_wwdg1.yaml + - common_patches/h7_wwdg.yaml diff --git a/devices/stm32h747cm7.yaml b/devices/stm32h747cm7.yaml index cbd5313b8..80e2c3075 100644 --- a/devices/stm32h747cm7.yaml +++ b/devices/stm32h747cm7.yaml @@ -93,4 +93,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/rtc/rtc_h7.yaml - common_patches/h7_crc_addr_fix.yaml - - common_patches/h7_wwdg1.yaml + - common_patches/h7_wwdg.yaml pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy