djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
jgillick 2020-03-19 00:01:32 -07:00
parent 9be2ab6008
commit 284073584a
6 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm/boards/thunderpack/mpconfigboard.mk
View File

@ -1,6 +1,6 @@
USB_VID = 0x239A
USB_PID = 0x806A
USB_PRODUCT = "Thunderpack powered by ST"
USB_PRODUCT = "Thunderpack STM32F411"
USB_MANUFACTURER = "Jeremy Gillick"
USB_DEVICES = "CDC,MSC"

4
ports/stm/common-hal/busio/UART.c
View File

@ -443,11 +443,9 @@ STATIC void uart_clock_enable(uint16_t mask) {
#endif
#ifdef USART3
if (mask & (1 << 2)) {
#ifndef STM32F412Cx
__HAL_RCC_USART3_FORCE_RESET();
__HAL_RCC_USART3_RELEASE_RESET();
__HAL_RCC_USART3_CLK_ENABLE();
#endif
}
#endif
#ifdef UART4
@ -518,11 +516,9 @@ STATIC void uart_clock_disable(uint16_t mask) {
#endif
#ifdef USART3
if (mask & (1 << 2)) {
#ifndef STM32F412Cx
__HAL_RCC_USART3_FORCE_RESET();
__HAL_RCC_USART3_RELEASE_RESET();
__HAL_RCC_USART3_CLK_DISABLE();
#endif
}
#endif
#ifdef UART4

7
ports/stm/peripherals/stm32f4/periph.h
View File

@ -154,13 +154,6 @@ typedef struct {
#include "stm32f411xe/periph.h"
#endif
#ifdef BOARD_THUNDERPACK_STM32F412
#define HAS_DAC 0
#define HAS_TRNG 1
#define HAS_BASIC_TIM 1
#include "stm32f412cx_thunderpack/periph.h"
#endif
#ifdef STM32F412Zx
#define HAS_DAC 0
#define HAS_TRNG 1

3
ports/stm/peripherals/stm32f4/pins.h
View File

@ -83,9 +83,6 @@ extern const mp_obj_type_t mcu_pin_type;
#ifdef STM32F411xE
#include "stm32f411xe/pins.h"
#endif
#ifdef BOARD_THUNDERPACK_STM32F412
#include "stm32f412cx_thunderpack/pins.h"
#endif
#ifdef STM32F412Zx
#include "stm32f412zx/pins.h"
#endif

1
ports/stm/peripherals/stm32f4/stm32f412zx/gpio.c
View File

@ -239,3 +239,4 @@ void stm32f4_peripherals_status_led(uint8_t led, uint8_t state) {
default: break;
}
}

2
ports/stm/supervisor/internal_flash.h
View File

@ -42,7 +42,7 @@
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
#endif
#if (defined(STM32F412Zx) || defined(STM32F412Cx))
#ifdef STM32F412Zx
#define STM32_FLASH_SIZE 0x100000 //1MB
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
#endif