Skip to content

Commit 2840735

Browse files
committed
Cleanup
1 parent 9be2ab6 commit 2840735

File tree

6 files changed

+3
-16
lines changed

6 files changed

+3
-16
lines changed

ports/stm/boards/thunderpack/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
USB_VID = 0x239A
22
USB_PID = 0x806A
3-
USB_PRODUCT = "Thunderpack powered by ST"
3+
USB_PRODUCT = "Thunderpack STM32F411"
44
USB_MANUFACTURER = "Jeremy Gillick"
55
USB_DEVICES = "CDC,MSC"
66

ports/stm/common-hal/busio/UART.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,9 @@ STATIC void uart_clock_enable(uint16_t mask) {
443443
#endif
444444
#ifdef USART3
445445
if (mask & (1 << 2)) {
446-
#ifndef STM32F412Cx
447446
__HAL_RCC_USART3_FORCE_RESET();
448447
__HAL_RCC_USART3_RELEASE_RESET();
449448
__HAL_RCC_USART3_CLK_ENABLE();
450-
#endif
451449
}
452450
#endif
453451
#ifdef UART4
@@ -518,11 +516,9 @@ STATIC void uart_clock_disable(uint16_t mask) {
518516
#endif
519517
#ifdef USART3
520518
if (mask & (1 << 2)) {
521-
#ifndef STM32F412Cx
522519
__HAL_RCC_USART3_FORCE_RESET();
523520
__HAL_RCC_USART3_RELEASE_RESET();
524521
__HAL_RCC_USART3_CLK_DISABLE();
525-
#endif
526522
}
527523
#endif
528524
#ifdef UART4

ports/stm/peripherals/stm32f4/periph.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@ typedef struct {
154154
#include "stm32f411xe/periph.h"
155155
#endif
156156

157-
#ifdef BOARD_THUNDERPACK_STM32F412
158-
#define HAS_DAC 0
159-
#define HAS_TRNG 1
160-
#define HAS_BASIC_TIM 1
161-
#include "stm32f412cx_thunderpack/periph.h"
162-
#endif
163-
164157
#ifdef STM32F412Zx
165158
#define HAS_DAC 0
166159
#define HAS_TRNG 1

ports/stm/peripherals/stm32f4/pins.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ extern const mp_obj_type_t mcu_pin_type;
8383
#ifdef STM32F411xE
8484
#include "stm32f411xe/pins.h"
8585
#endif
86-
#ifdef BOARD_THUNDERPACK_STM32F412
87-
#include "stm32f412cx_thunderpack/pins.h"
88-
#endif
8986
#ifdef STM32F412Zx
9087
#include "stm32f412zx/pins.h"
9188
#endif

ports/stm/peripherals/stm32f4/stm32f412zx/gpio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,4 @@ void stm32f4_peripherals_status_led(uint8_t led, uint8_t state) {
239239
default: break;
240240
}
241241
}
242+

ports/stm/supervisor/internal_flash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
4343
#endif
4444

45-
#if (defined(STM32F412Zx) || defined(STM32F412Cx))
45+
#ifdef STM32F412Zx
4646
#define STM32_FLASH_SIZE 0x100000 //1MB
4747
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
4848
#endif

0 commit comments

Comments
 (0)