Skip to content

Commit fca3779

Browse files
committed
[ext] Update modm-devices and STM32 CMSIS headers
1 parent 4598d17 commit fca3779

File tree

6 files changed

+107
-3
lines changed

6 files changed

+107
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ git clone --recurse-submodules https://github.com/modm-io/modm.git
7171
## Targets
7272

7373
modm can generate code for <!--avrcount-->506<!--/avrcount-->
74-
AVR, <!--samcount-->163<!--/samcount--> SAM and <!--stmcount-->2010<!--/stmcount-->
74+
AVR, <!--samcount-->163<!--/samcount--> SAM and <!--stmcount-->2185<!--/stmcount-->
7575
STM32 devices, however, there are different levels of support and testing.
7676

7777
<center>

ext/modm-devices

Submodule modm-devices updated 59 files

ext/st/device.hpp.in

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,31 @@
2929
#include <{{ header }}>
3030
%% endfor
3131

32+
%% if target.family in ["g0"]
33+
// these defines are missing from the STM32G0 header files
34+
#define RCC_CFGR_SW_HSI (0UL) /*!< HSI selected as system clock */
35+
#define RCC_CFGR_SW_HSE (0x00000001UL) /*!< HSE selected as system clock */
36+
#define RCC_CFGR_SW_PLL (0x00000002UL) /*!< PLL selected as system clock */
37+
#define RCC_CFGR_SW_LSI (0x00000003UL) /*!< LSI selected as system clock */
38+
#define RCC_CFGR_SW_LSE (0x00000004UL) /*!< LSE selected as system clock */
39+
40+
#define RCC_CFGR_HPRE_DIV1 (0x0UL) /*!< SYSCLK not divided */
41+
#define RCC_CFGR_HPRE_DIV2 (0x00000800UL) /*!< SYSCLK divided by 2 */
42+
#define RCC_CFGR_HPRE_DIV4 (0x00000900UL) /*!< SYSCLK divided by 4 */
43+
#define RCC_CFGR_HPRE_DIV8 (0x00000A00UL) /*!< SYSCLK divided by 8 */
44+
#define RCC_CFGR_HPRE_DIV16 (0x00000B00UL) /*!< SYSCLK divided by 16 */
45+
#define RCC_CFGR_HPRE_DIV64 (0x00000C00UL) /*!< SYSCLK divided by 64 */
46+
#define RCC_CFGR_HPRE_DIV128 (0x00000D00UL) /*!< SYSCLK divided by 128 */
47+
#define RCC_CFGR_HPRE_DIV256 (0x00000E00UL) /*!< SYSCLK divided by 256 */
48+
#define RCC_CFGR_HPRE_DIV512 (0x00000F00UL) /*!< SYSCLK divided by 512 */
49+
50+
#define RCC_CFGR_PPRE_DIV1 (0x0UL) /*!< HCLK not divided */
51+
#define RCC_CFGR_PPRE_DIV2 (0x00004000UL) /*!< HCLK divided by 2 */
52+
#define RCC_CFGR_PPRE_DIV4 (0x00005000UL) /*!< HCLK divided by 4 */
53+
#define RCC_CFGR_PPRE_DIV8 (0x00006000UL) /*!< HCLK divided by 8 */
54+
#define RCC_CFGR_PPRE_DIV16 (0x00007000UL) /*!< HCLK divided by 16 */
55+
%% endif
56+
3257
/// @cond
3358
// This is a hack to make the *_Typedef's known to GDB, so that you can debug
3459
// the peripherals directly in GDB in any context.

ext/st/module.lb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def build(env):
152152
env.substitutions.update({
153153
"headers": [bprops["device_header"], bprops["system_header"]],
154154
"defines": [bprops["define"]],
155+
"target": env[":target"].identifier,
155156
})
156157
env.outbasepath = "modm/src/modm/platform"
157158
env.template("device.hpp.in")

ext/st/stm32

Submodule stm32 updated 175 files

test/all/ignored.txt

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,81 @@ samd21e15c-uf
103103
samd21e15c-uu
104104
samd21e16c-uf
105105
samd21e16c-uu
106+
# FIXME: Shared IRQs on UART, SPI, I2C
107+
stm32g0b0cet6
108+
stm32g0b0ket6
109+
stm32g0b0ret6
110+
stm32g0b0vet6
111+
stm32g0b1cbt6
112+
stm32g0b1cbt6n
113+
stm32g0b1cbu6
114+
stm32g0b1cbu6n
115+
stm32g0b1cct6
116+
stm32g0b1cct6n
117+
stm32g0b1ccu6
118+
stm32g0b1ccu6n
119+
stm32g0b1cet6
120+
stm32g0b1cet6n
121+
stm32g0b1ceu6
122+
stm32g0b1ceu6n
123+
stm32g0b1kbt6
124+
stm32g0b1kbt6n
125+
stm32g0b1kbu6
126+
stm32g0b1kbu6n
127+
stm32g0b1kct6
128+
stm32g0b1kct6n
129+
stm32g0b1kcu6
130+
stm32g0b1kcu6n
131+
stm32g0b1ket6
132+
stm32g0b1ket6n
133+
stm32g0b1keu6
134+
stm32g0b1keu6n
135+
stm32g0b1mbt6
136+
stm32g0b1mct6
137+
stm32g0b1met6
138+
stm32g0b1ney6
139+
stm32g0b1rbi6n
140+
stm32g0b1rbt6
141+
stm32g0b1rbt6n
142+
stm32g0b1rci6n
143+
stm32g0b1rct6
144+
stm32g0b1rct6n
145+
stm32g0b1rei6n
146+
stm32g0b1ret6
147+
stm32g0b1ret6n
148+
stm32g0b1vbi6
149+
stm32g0b1vbt6
150+
stm32g0b1vci6
151+
stm32g0b1vct6
152+
stm32g0b1vei6
153+
stm32g0b1vet6
154+
stm32g0c1cct6
155+
stm32g0c1cct6n
156+
stm32g0c1ccu6
157+
stm32g0c1ccu6n
158+
stm32g0c1cet6
159+
stm32g0c1cet6n
160+
stm32g0c1ceu6
161+
stm32g0c1ceu6n
162+
stm32g0c1kct6
163+
stm32g0c1kct6n
164+
stm32g0c1kcu6
165+
stm32g0c1kcu6n
166+
stm32g0c1ket6
167+
stm32g0c1ket6n
168+
stm32g0c1keu6
169+
stm32g0c1keu6n
170+
stm32g0c1mct6
171+
stm32g0c1met6
172+
stm32g0c1ney6
173+
stm32g0c1rci6n
174+
stm32g0c1rct6
175+
stm32g0c1rct6n
176+
stm32g0c1rei6n
177+
stm32g0c1ret6
178+
stm32g0c1ret6n
179+
stm32g0c1vci6
180+
stm32g0c1vct6
181+
stm32g0c1vei6
182+
stm32g0c1vet6
183+

0 commit comments

Comments
 (0)