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

text fixes

This commit is contained in:
Hierophect 2019-09-09 11:58:27 -04:00
parent 426ddb356e
commit 129615a724
3 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld
View File

@ -1,5 +1,5 @@
/* /*
GNU linker script for STM32F411 via Micropython GNU linker script for STM32F412
*/ */
/* Specify the memory areas */ /* Specify the memory areas */
@ -51,8 +51,6 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
*(.text*) /* .text* sections (code) */ *(.text*) /* .text* sections (code) */
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */ *(.rodata*) /* .rodata* sections (constants, strings, etc.) */
/* *(.glue_7) */ /* glue arm to thumb code */
/* *(.glue_7t) */ /* glue thumb to arm code */
. = ALIGN(4); . = ALIGN(4);
_etext = .; /* define a global symbol at end of code */ _etext = .; /* define a global symbol at end of code */

2
ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
View File

@ -3,7 +3,7 @@ USB_PID = 0x572B
USB_PRODUCT = "STM32F412ZG Discovery Board - CPy" USB_PRODUCT = "STM32F412ZG Discovery Board - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_CDC_AND_MSC_ONLY = 1 USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE LONGINT_IMPL = NONE

70
ports/stm32f4/supervisor/usb.c
View File

@ -33,42 +33,46 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
void init_usb_hardware(void) { void init_usb_hardware(void) {
GPIO_InitTypeDef GPIO_InitStruct = {0}; //TODO: if future chips overload this with options, move to peripherals management.
/**USB_OTG_FS GPIO Configuration
PA10 ------> USB_OTG_FS_ID
PA11 ------> USB_OTG_FS_DM
PA12 ------> USB_OTG_FS_DP
*/
__HAL_RCC_GPIOA_CLK_ENABLE();
/* Configure DM DP Pins */ GPIO_InitTypeDef GPIO_InitStruct = {0};
GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12; /**USB_OTG_FS GPIO Configuration
GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; PA10 ------> USB_OTG_FS_ID
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; PA11 ------> USB_OTG_FS_DM
GPIO_InitStruct.Pull = GPIO_NOPULL; PA12 ------> USB_OTG_FS_DP
GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS; */
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); __HAL_RCC_GPIOA_CLK_ENABLE();
/* Configure VBUS Pin */ /* Configure DM DP Pins */
GPIO_InitStruct.Pin = GPIO_PIN_9; GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/* This for ID line debug */ /* Configure VBUS Pin */
GPIO_InitStruct.Pin = GPIO_PIN_10; GPIO_InitStruct.Pin = GPIO_PIN_9;
GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/* Configure POWER_SWITCH IO pin (F412 ONLY)*/ /* This for ID line debug */
GPIO_InitStruct.Pin = GPIO_PIN_8; GPIO_InitStruct.Pin = GPIO_PIN_10;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD; GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
GPIO_InitStruct.Alternate = GPIO_AF10_OTG_FS;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/* Peripheral clock enable */ #ifdef STM32F412Zx
__HAL_RCC_USB_OTG_FS_CLK_ENABLE(); /* Configure POWER_SWITCH IO pin (F412 ONLY)*/
GPIO_InitStruct.Pin = GPIO_PIN_8;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
#endif
/* Peripheral clock enable */
__HAL_RCC_USB_OTG_FS_CLK_ENABLE();
} }