Skip to content

Commit 8165bca

Browse files
jeromecoutantAGlass0fMilk
jeromecoutant
authored and
AGlass0fMilk
committed
STM32G0 review and test
1 parent ab6fd6e commit 8165bca

File tree

8 files changed

+135
-224
lines changed

8 files changed

+135
-224
lines changed

‎targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3074,7 +3074,7 @@ __STATIC_INLINE void LL_RTC_BKP_SetRegister(TAMP_TypeDef *TAMPx, uint32_t Backup
30743074
*/
30753075
__STATIC_INLINE uint32_t LL_RTC_BKP_GetRegister(TAMP_TypeDef *TAMPx, uint32_t BackupRegister)
30763076
{
3077-
register __IO uint32_t *tmp;
3077+
const register __IO uint32_t *tmp;
30783078

30793079
tmp = &(TAMPx->BKP0R) + BackupRegister;
30803080

‎targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PeripheralPins.c

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: BSD-3-Clause
33
******************************************************************************
44
*
5-
* Copyright (c) 2018 STMicroelectronics.
5+
* Copyright (c) 2016-2020 STMicroelectronics.
66
* All rights reserved.
77
*
88
* This software component is licensed by ST under BSD 3-Clause license,
@@ -11,6 +11,8 @@
1111
* opensource.org/licenses/BSD-3-Clause
1212
*
1313
******************************************************************************
14+
*
15+
* Automatically generated from STM32CubeMX/db/mcu/STM32G031K(4-6-8)Tx.xml
1416
*/
1517

1618
#include "PeripheralPins.h"
@@ -86,15 +88,14 @@ MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
8688
//*** PWM ***
8789

8890
// TIM2 cannot be used because already used by the us_ticker
89-
// You have to comment all PWM using TIM_MST defined in hal_tick.h file
90-
// or update python script (check TIM_MST_LIST) and re-run it
91+
// (update us_ticker_data.h file if another timer is chosen)
9192
MBED_WEAK const PinMap PinMap_PWM[] = {
92-
// {PA_0, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
93-
// {PA_1, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
94-
// {PA_2, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 // Connected to STDIO_UART_TX
95-
// {PA_3, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4 // Connected to STDIO_UART_RX
93+
// {PA_0, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
94+
// {PA_1, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
95+
// {PA_2, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 // Connected to STDIO_UART_TX
96+
// {PA_3, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4 // Connected to STDIO_UART_RX
9697
{PA_4, PWM_14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
97-
// {PA_5, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
98+
// {PA_5, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
9899
{PA_6, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
99100
{PA_6_ALT0, PWM_16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
100101
{PA_7, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
@@ -107,61 +108,61 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
107108
{PA_10, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
108109
{PA_10_ALT0, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
109110
{PA_11, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
110-
// {PA_15, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
111+
// {PA_15, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
111112
{PB_0, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
112113
{PB_0_ALT0, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
113114
{PB_1, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
114115
{PB_1_ALT0, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 4, 0)}, // TIM3_CH4
115116
{PB_1_ALT1, PWM_14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
116117
{PB_3, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
117-
// {PB_3_ALT0, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
118+
// {PB_3, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
118119
{PB_4, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
119120
{PB_5, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
120121
{PB_6, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
121122
{PB_6_ALT0, PWM_16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM16, 1, 1)}, // TIM16_CH1N
122123
{PB_7, PWM_17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 1)}, // TIM17_CH1N
123124
{PB_8, PWM_16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM16, 1, 0)}, // TIM16_CH1
124125
{PB_9, PWM_17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 0)}, // TIM17_CH1
125-
{PC_6, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 // Connected to LD3 [Green]
126-
{PC_6_ALT0, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1 // Connected to LD3 [Green]
126+
// {PC_6, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 // Connected to LD3 [Green]
127+
{PC_6, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1 // Connected to LD3 [Green]
127128
{NC, NC, 0}
128129
};
129130

130131
//*** SERIAL ***
131132

132133
MBED_WEAK const PinMap PinMap_UART_TX[] = {
133-
{PA_2, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_TX
134-
{PA_2_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_TX
135-
{PA_9, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
136-
{PA_9_ALT0, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
137-
{PA_14, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to T_JTCK
138-
{PB_6, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
134+
{PA_2, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_TX
135+
// {PA_2_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_TX
136+
{PA_9, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
137+
{PA_9_ALT0, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
138+
// {PA_14, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to T_JTCK
139+
{PB_6, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
139140
{NC, NC, 0}
140141
};
141142

142143
MBED_WEAK const PinMap PinMap_UART_RX[] = {
143-
{PA_3, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_RX
144-
{PA_3_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_RX
145-
{PA_10, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
146-
{PA_10_ALT0, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
147-
{PA_15, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
148-
{PB_7, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
144+
{PA_3, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_RX
145+
// {PA_3_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_RX
146+
{PA_10, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
147+
{PA_10_ALT0, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
148+
// {PA_15, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
149+
{PB_7, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
149150
{NC, NC, 0}
150151
};
151152

152153
MBED_WEAK const PinMap PinMap_UART_RTS[] = {
153-
{PA_1, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
154-
{PA_12, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
155-
{PB_1, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
156-
{PB_3, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
154+
{PA_1, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
155+
{PA_12, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
156+
{PB_1, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
157+
{PB_3, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
157158
{NC, NC, 0}
158159
};
159160

160161
MBED_WEAK const PinMap PinMap_UART_CTS[] = {
161-
{PA_0, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
162-
{PA_6, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
163-
{PA_11, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
164-
{PB_4, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
162+
{PA_0, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
163+
{PA_6, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
164+
{PA_11, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
165+
{PB_4, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
165166
{NC, NC, 0}
166167
};
167168

‎targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h

Lines changed: 55 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: BSD-3-Clause
33
******************************************************************************
44
*
5-
* Copyright (c) 2018 STMicroelectronics.
5+
* Copyright (c) 2016-2020 STMicroelectronics.
66
* All rights reserved.
77
*
88
* This software component is licensed by ST under BSD 3-Clause license,
@@ -11,6 +11,8 @@
1111
* opensource.org/licenses/BSD-3-Clause
1212
*
1313
******************************************************************************
14+
*
15+
* Automatically generated from STM32CubeMX/db/mcu/STM32G031K(4-6-8)Tx.xml
1416
*/
1517

1618
#ifndef MBED_PINNAMES_H
@@ -31,109 +33,56 @@ typedef enum {
3133
} ALTx;
3234

3335
typedef enum {
34-
PA_0 = 0x00,
35-
PA_1 = 0x01,
36-
PA_1_ALT0 = PA_1 | ALT0,
37-
PA_2 = 0x02,
38-
PA_2_ALT0 = PA_2 | ALT0,
39-
PA_2_ALT1 = PA_2 | ALT1,
40-
PA_3 = 0x03,
41-
PA_3_ALT0 = PA_3 | ALT0,
42-
PA_3_ALT1 = PA_3 | ALT1,
43-
PA_4 = 0x04,
44-
PA_5 = 0x05,
45-
PA_6 = 0x06,
46-
PA_6_ALT0 = PA_6 | ALT0,
47-
PA_7 = 0x07,
48-
PA_7_ALT0 = PA_7 | ALT0,
49-
PA_7_ALT1 = PA_7 | ALT1,
50-
PA_7_ALT2 = PA_7 | ALT2,
51-
PA_8 = 0x08,
52-
PA_9 = 0x09,
53-
PA_9_ALT0 = PA_9 | ALT0,
54-
PA_10 = 0x0A,
55-
PA_10_ALT0 = PA_10 | ALT0,
56-
PA_11 = 0x0B,
57-
PA_12 = 0x0C,
58-
PA_13 = 0x0D,
59-
PA_14 = 0x0E,
60-
PA_14_ALT0 = PA_14 | ALT0,
61-
PA_15 = 0x0F,
62-
PA_15_ALT0 = PA_15 | ALT0,
63-
64-
PB_0 = 0x10,
65-
PB_0_ALT0 = PB_0 | ALT0,
66-
PB_1 = 0x11,
67-
PB_1_ALT0 = PB_1 | ALT0,
68-
PB_1_ALT1 = PB_1 | ALT1,
69-
PB_2 = 0x12,
70-
PB_3 = 0x13,
71-
PB_4 = 0x14,
72-
PB_4_ALT0 = PB_4 | ALT0,
73-
PB_4_ALT1 = PB_4 | ALT1,
74-
PB_5 = 0x15,
75-
PB_5_ALT0 = PB_5 | ALT0,
76-
PB_5_ALT1 = PB_5 | ALT1,
77-
PB_6 = 0x16,
78-
PB_6_ALT0 = PB_6 | ALT0,
79-
PB_7 = 0x17,
80-
PB_8 = 0x18,
81-
PB_9 = 0x19,
82-
PB_10 = 0x1A,
83-
PB_11 = 0x1B,
84-
PB_12 = 0x1C,
85-
PB_13 = 0x1D,
86-
PB_13_ALT0 = PB_13 | ALT0,
87-
PB_14 = 0x1E,
88-
PB_14_ALT0 = PB_14 | ALT0,
89-
PB_15 = 0x1F,
90-
PB_15_ALT0 = PB_15 | ALT0,
91-
PB_15_ALT1 = PB_15 | ALT1,
92-
93-
PC_0 = 0x20,
94-
PC_1 = 0x21,
95-
PC_2 = 0x22,
96-
PC_3 = 0x23,
97-
PC_4 = 0x24,
98-
PC_4_ALT0 = PC_4 | ALT0,
99-
PC_5 = 0x25,
100-
PC_5_ALT0 = PC_5 | ALT0,
101-
PC_6 = 0x26,
102-
PC_6_ALT0 = PC_6 | ALT0,
103-
PC_7 = 0x27,
104-
PC_7_ALT0 = PC_7 | ALT0,
105-
PC_8 = 0x28,
106-
PC_8_ALT0 = PC_8 | ALT0,
107-
PC_9 = 0x29,
108-
PC_9_ALT0 = PC_9 | ALT0,
109-
PC_10 = 0x2A,
110-
PC_10_ALT0 = PC_10 | ALT0,
111-
PC_11 = 0x2B,
112-
PC_11_ALT0 = PC_11 | ALT0,
113-
PC_12 = 0x2C,
114-
PC_13 = 0x2D,
115-
PC_14 = 0x2E,
116-
PC_15 = 0x2F,
117-
118-
PD_0 = 0x30,
119-
PD_1 = 0x31,
120-
PD_2 = 0x32,
121-
PD_3 = 0x33,
122-
PD_4 = 0x34,
123-
PD_5 = 0x35,
124-
PD_6 = 0x36,
125-
PD_8 = 0x38,
126-
PD_9 = 0x39,
127-
128-
PF_0 = 0x50,
129-
PF_1 = 0x51,
130-
131-
// ADC internal channels
132-
ADC_TEMP = 0xF0,
133-
ADC_VREF = 0xF1,
134-
ADC_VBAT = 0xF2,
135-
136-
// Arduino connector namings
36+
37+
PA_0 = 0x00,
38+
PA_1 = 0x01,
39+
PA_2 = 0x02,
40+
PA_2_ALT0 = PA_2 | ALT0, // same pin used for alternate HW
41+
PA_3 = 0x03,
42+
PA_3_ALT0 = PA_3 | ALT0, // same pin used for alternate HW
43+
PA_4 = 0x04,
44+
PA_5 = 0x05,
45+
PA_6 = 0x06,
46+
PA_6_ALT0 = PA_6 | ALT0, // same pin used for alternate HW
47+
PA_7 = 0x07,
48+
PA_7_ALT0 = PA_7 | ALT0, // same pin used for alternate HW
49+
PA_7_ALT1 = PA_7 | ALT1, // same pin used for alternate HW
50+
PA_7_ALT2 = PA_7 | ALT2, // same pin used for alternate HW
51+
PA_8 = 0x08,
52+
PA_9 = 0x09,
53+
PA_9_ALT0 = PA_9 | ALT0, // same pin used for alternate HW
54+
PA_10 = 0x0A,
55+
PA_10_ALT0 = PA_10 | ALT0, // same pin used for alternate HW
56+
PA_11 = 0x0B,
57+
PA_12 = 0x0C,
58+
PA_13 = 0x0D,
59+
PA_14 = 0x0E,
60+
PA_15 = 0x0F,
61+
PB_0 = 0x10,
62+
PB_0_ALT0 = PB_0 | ALT0, // same pin used for alternate HW
63+
PB_1 = 0x11,
64+
PB_1_ALT0 = PB_1 | ALT0, // same pin used for alternate HW
65+
PB_1_ALT1 = PB_1 | ALT1, // same pin used for alternate HW
66+
PB_2 = 0x12,
67+
PB_3 = 0x13,
68+
PB_4 = 0x14,
69+
PB_5 = 0x15,
70+
PB_6 = 0x16,
71+
PB_6_ALT0 = PB_6 | ALT0, // same pin used for alternate HW
72+
PB_7 = 0x17,
73+
PB_8 = 0x18,
74+
PB_9 = 0x19,
75+
PC_6 = 0x26,
76+
PC_14 = 0x2E,
77+
PC_15 = 0x2F,
78+
79+
/**** ADC internal channels ****/
80+
81+
ADC_TEMP = 0xF0, // Internal pin virtual value
82+
ADC_VREF = 0xF1, // Internal pin virtual value
83+
ADC_VBAT = 0xF2, // Internal pin virtual value
84+
85+
// Arduino Nano Header pin connection naming
13786
A0 = PA_0,
13887
A1 = PA_1,
13988
A2 = PA_4,
@@ -170,7 +119,8 @@ typedef enum {
170119
#endif
171120

172121
// Generic signals namings
173-
LED1 = PC_6,
122+
LED1 = PC_6, // LD3 [Green]
123+
174124
SERIAL_TX = STDIO_UART_TX,
175125
SERIAL_RX = STDIO_UART_RX,
176126
USBTX = STDIO_UART_TX,

‎targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/system_clock.c

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: BSD-3-Clause
33
******************************************************************************
44
*
5-
* Copyright (c) 2019 STMicroelectronics.
5+
* Copyright (c) 2020 STMicroelectronics.
66
* All rights reserved.
77
*
88
* This software component is licensed by ST under BSD 3-Clause license,
@@ -16,9 +16,7 @@
1616
/**
1717
* This file configures the system clock as follows:
1818
*-----------------------------------------------------------------
19-
* System clock source | 1- USE_PLL_HSE_EXTC (external 8 MHz clock)
20-
* | 2- USE_PLL_HSE_XTAL (external 8 MHz xtal)
21-
* | 3- USE_PLL_HSI (internal 16 MHz)
19+
* System clock source | USE_PLL_HSI (internal 16 MHz)
2220
*-----------------------------------------------------------------
2321
* SYSCLK(MHz) | 64
2422
* AHBCLK (MHz) | 64
@@ -30,12 +28,6 @@
3028
#include "stm32g0xx.h"
3129
#include "mbed_error.h"
3230

33-
/*!< Uncomment the following line if you need to relocate your vector Table in
34-
Internal SRAM. */
35-
/* #define VECT_TAB_SRAM */
36-
#define VECT_TAB_OFFSET 0x00U /*!< Vector Table base offset field.
37-
This value must be a multiple of 0x100. */
38-
3931
#define USE_PLL_HSE_EXTC 0x8 // Use external clock (ST Link MCO)
4032
#define USE_PLL_HSE_XTAL 0x4 // Use external xtal (X3 on board - not provided by default)
4133
#define USE_PLL_HSI 0x2 // Use HSI internal clock
@@ -92,39 +84,7 @@ void SetSysClock(void)
9284
/******************************************************************************/
9385
uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
9486
{
95-
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
96-
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
97-
98-
/** Configure the main internal regulator output voltage
99-
*/
100-
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
101-
/** Initializes the CPU, AHB and APB busses clocks
102-
*/
103-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
104-
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
105-
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
106-
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
107-
RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1;
108-
RCC_OscInitStruct.PLL.PLLN = 16;
109-
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
110-
RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
111-
RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
112-
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
113-
return 0; // FAIL
114-
}
115-
/** Initializes the CPU, AHB and APB busses clocks
116-
*/
117-
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
118-
| RCC_CLOCKTYPE_PCLK1;
119-
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
120-
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
121-
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
122-
123-
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
124-
return 0; // FAIL
125-
}
126-
127-
return 1; // OK
87+
return 0;
12888
}
12989
#endif /* ((CLOCK_SOURCE) & USE_PLL_HSE_XTAL) || ((CLOCK_SOURCE) & USE_PLL_HSE_EXTC) */
13090

0 commit comments

Comments
 (0)