Skip to content

Commit 95411a6

Browse files
hierophecthierophect
committed
Cosmetic fixes
1 parent 7dbf1a8 commit 95411a6

6 files changed

Lines changed: 73 additions & 73 deletions

File tree

‎ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939

4040
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000 - CIRCUITPY_INTERNAL_NVM_SIZE)
4141

42-
#define AUTORESET_DELAY_MS 500
42+
#define AUTORESET_DELAY_MS 500

‎ports/stm32f4/mpconfigport.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ CIRCUITPY_MINIMAL_BUILD = 1
2121
CIRCUITPY_MICROCONTROLLER = 1
2222
CIRCUITPY_BUSIO = 1
2323
CIRCUITPY_TIME = 1
24-
#endif
24+
#endif

‎ports/stm32f4/peripherals/stm32f4/stm32f411xe/clocks.c‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@
2828

2929
void stm32f4_peripherals_clocks_init(void) {
3030
//System clock init
31-
RCC_ClkInitTypeDef RCC_ClkInitStruct;
32-
RCC_OscInitTypeDef RCC_OscInitStruct;
31+
RCC_ClkInitTypeDef RCC_ClkInitStruct;
32+
RCC_OscInitTypeDef RCC_OscInitStruct;
3333

34-
/* Enable Power Control clock */
35-
__HAL_RCC_PWR_CLK_ENABLE();
34+
/* Enable Power Control clock */
35+
__HAL_RCC_PWR_CLK_ENABLE();
3636

37-
/* The voltage scaling allows optimizing the power consumption when the device is
38-
clocked below the maximum system frequency, to update the voltage scaling value
39-
regarding system frequency refer to product datasheet. */
40-
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
37+
/* The voltage scaling allows optimizing the power consumption when the device is
38+
clocked below the maximum system frequency, to update the voltage scaling value
39+
regarding system frequency refer to product datasheet. */
40+
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
4141

42-
/* Enable HSE Oscillator and activate PLL with HSE as source */
43-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
44-
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
45-
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
46-
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
47-
RCC_OscInitStruct.PLL.PLLM = 8;
48-
RCC_OscInitStruct.PLL.PLLN = 336;
49-
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
50-
RCC_OscInitStruct.PLL.PLLQ = 7;
51-
HAL_RCC_OscConfig(&RCC_OscInitStruct);
42+
/* Enable HSE Oscillator and activate PLL with HSE as source */
43+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
44+
RCC_OscInitStruct.HSEState = RCC_HSE_ON;
45+
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
46+
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
47+
RCC_OscInitStruct.PLL.PLLM = 8;
48+
RCC_OscInitStruct.PLL.PLLN = 336;
49+
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
50+
RCC_OscInitStruct.PLL.PLLQ = 7;
51+
HAL_RCC_OscConfig(&RCC_OscInitStruct);
5252

53-
/* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
54-
clocks dividers */
55-
RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
56-
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
57-
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
58-
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
59-
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
60-
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3);
53+
/* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
54+
clocks dividers */
55+
RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
56+
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
57+
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
58+
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
59+
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
60+
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3);
6161
}

‎ports/stm32f4/peripherals/stm32f4/stm32f411xe/gpio.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -108,47 +108,47 @@
108108
#include "stm32f4/gpio.h"
109109

110110
void stm32f4_peripherals_gpio_init(void) {
111-
//Enable all GPIO for now
112-
GPIO_InitTypeDef GPIO_InitStruct = {0};
113-
/* GPIO Ports Clock Enable */
114-
__HAL_RCC_GPIOE_CLK_ENABLE();
115-
__HAL_RCC_GPIOC_CLK_ENABLE();
116-
__HAL_RCC_GPIOH_CLK_ENABLE();
117-
__HAL_RCC_GPIOA_CLK_ENABLE();
118-
__HAL_RCC_GPIOB_CLK_ENABLE();
119-
__HAL_RCC_GPIOD_CLK_ENABLE();
111+
//Enable all GPIO for now
112+
GPIO_InitTypeDef GPIO_InitStruct = {0};
113+
/* GPIO Ports Clock Enable */
114+
__HAL_RCC_GPIOE_CLK_ENABLE();
115+
__HAL_RCC_GPIOC_CLK_ENABLE();
116+
__HAL_RCC_GPIOH_CLK_ENABLE();
117+
__HAL_RCC_GPIOA_CLK_ENABLE();
118+
__HAL_RCC_GPIOB_CLK_ENABLE();
119+
__HAL_RCC_GPIOD_CLK_ENABLE();
120120

121-
/*Configure GPIO pin Output Level */
122-
HAL_GPIO_WritePin(GPIOD, LD4_Pin|LD3_Pin|LD5_Pin|LD6_Pin, GPIO_PIN_RESET);
121+
/*Configure GPIO pin Output Level */
122+
HAL_GPIO_WritePin(GPIOD, LD4_Pin|LD3_Pin|LD5_Pin|LD6_Pin, GPIO_PIN_RESET);
123123

124-
/*Configure GPIO pins : LD4_Pin LD3_Pin LD5_Pin LD6_Pin */
125-
GPIO_InitStruct.Pin = LD4_Pin|LD3_Pin|LD5_Pin|LD6_Pin;
126-
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
127-
GPIO_InitStruct.Pull = GPIO_NOPULL;
128-
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
129-
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
124+
/*Configure GPIO pins : LD4_Pin LD3_Pin LD5_Pin LD6_Pin */
125+
GPIO_InitStruct.Pin = LD4_Pin|LD3_Pin|LD5_Pin|LD6_Pin;
126+
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
127+
GPIO_InitStruct.Pull = GPIO_NOPULL;
128+
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
129+
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
130130

131-
//Status LED chain
132-
stm32f4_peripherals_status_led(0,1);
133-
stm32f4_peripherals_status_led(1,0);
134-
stm32f4_peripherals_status_led(2,0);
135-
stm32f4_peripherals_status_led(3,0);
131+
//Status LED chain
132+
stm32f4_peripherals_status_led(0,1);
133+
stm32f4_peripherals_status_led(1,0);
134+
stm32f4_peripherals_status_led(2,0);
135+
stm32f4_peripherals_status_led(3,0);
136136
}
137137

138138
//LEDs are inverted on F411 DISCO
139139
void stm32f4_peripherals_status_led(uint8_t led, uint8_t state) {
140-
switch(led)
141-
{
142-
case 0: HAL_GPIO_WritePin(GPIOD, LD4_Pin, (state ^ 1));
143-
break;
144-
case 1: HAL_GPIO_WritePin(GPIOD, LD3_Pin, (state ^ 1));
145-
break;
146-
case 2: HAL_GPIO_WritePin(GPIOD, LD5_Pin, (state ^ 1));
147-
break;
148-
case 3: HAL_GPIO_WritePin(GPIOD, LD6_Pin, (state ^ 1));
149-
break;
150-
default: break;
151-
}
140+
switch(led)
141+
{
142+
case 0: HAL_GPIO_WritePin(GPIOD, LD4_Pin, (state ^ 1));
143+
break;
144+
case 1: HAL_GPIO_WritePin(GPIOD, LD3_Pin, (state ^ 1));
145+
break;
146+
case 2: HAL_GPIO_WritePin(GPIOD, LD5_Pin, (state ^ 1));
147+
break;
148+
case 3: HAL_GPIO_WritePin(GPIOD, LD6_Pin, (state ^ 1));
149+
break;
150+
default: break;
151+
}
152152
}
153153

154154

‎ports/stm32f4/supervisor/internal_flash.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ static int32_t convert_block_to_flash_addr(uint32_t block) {
113113
}
114114

115115
mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
116-
int32_t src = convert_block_to_flash_addr(block);
117-
if (src == -1) {
116+
int32_t src = convert_block_to_flash_addr(block);
117+
if (src == -1) {
118118
// bad block number
119119
return false;
120120
}
@@ -163,14 +163,14 @@ bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) {
163163
return false;
164164
}
165165

166-
__HAL_FLASH_DATA_CACHE_DISABLE();
167-
__HAL_FLASH_INSTRUCTION_CACHE_DISABLE();
166+
__HAL_FLASH_DATA_CACHE_DISABLE();
167+
__HAL_FLASH_INSTRUCTION_CACHE_DISABLE();
168168

169-
__HAL_FLASH_DATA_CACHE_RESET();
170-
__HAL_FLASH_INSTRUCTION_CACHE_RESET();
169+
__HAL_FLASH_DATA_CACHE_RESET();
170+
__HAL_FLASH_INSTRUCTION_CACHE_RESET();
171171

172-
__HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
173-
__HAL_FLASH_DATA_CACHE_ENABLE();
172+
__HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
173+
__HAL_FLASH_DATA_CACHE_ENABLE();
174174

175175
// reprogram the sector
176176
for (uint32_t i = 0; i < sector_size; i++) {
@@ -183,15 +183,15 @@ bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) {
183183
sector_start_addr += 1;
184184
}
185185

186-
// lock the flash
186+
// lock the flash
187187
HAL_FLASH_Lock();
188188

189189
return true;
190190
}
191191

192192
mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
193193

194-
for (size_t i = 0; i < num_blocks; i++) {
194+
for (size_t i = 0; i < num_blocks; i++) {
195195
if (!supervisor_flash_write_block(src + i * FILESYSTEM_BLOCK_SIZE, block_num + i)) {
196196
return 1; // error
197197
}

‎ports/stm32f4/supervisor/port.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ uint32_t port_get_saved_word(void) {
7070
}
7171

7272
void HardFault_Handler(void) {
73-
73+
while(1) {}
7474
}

0 commit comments

Comments
 (0)