Skip to content

blackboard dfu stuff #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bm16ton wants to merge 1 commit into
base: blackpillv2/fixups
Choose a base branch
from
Open

blackboard dfu stuff #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/platforms/blackpillv2/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ void platform_init(void)
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOC);
rcc_periph_clock_enable(RCC_GPIOB);

gpio_mode_setup(GPIOA, GPIO_MODE_INPUT,
GPIO_PUPD_PULLUP, GPIO0);
/* Check the USER button*/
if (gpio_get(GPIOA, GPIO0) ||
/*blackpillv2 userkey is active low but wo the pullup acts crazy and seemed..sorta active high*/
if (!gpio_get(GPIOA, GPIO0) ||
((magic[0] == BOOTMAGIC0) && (magic[1] == BOOTMAGIC1)))
{
magic[0] = 0;
Expand All @@ -74,8 +76,9 @@ void platform_init(void)
rcc_periph_clock_enable(RCC_CRC);

/* Set up USB Pins and alternate function*/
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9 | GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO10 | GPIO11 | GPIO12);
/*not using PA9 for vbus on blackpillv2 so leavem alone */
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);

GPIOA_OSPEEDR &= 0x3C00000C;
GPIOA_OSPEEDR |= 0x28000008;
Expand Down Expand Up @@ -105,6 +108,8 @@ void platform_init(void)
GPIO_PUPD_NONE,
PWR_BR_PIN);
#endif
/* for dfu-util to boot directly into the newly flashed app*/
SCB_VTOR = (uint32_t) 0x08000000;

platform_timing_init();
usbuart_init();
Expand All @@ -128,6 +133,8 @@ void platform_request_boot(void)
uint32_t *magic = (uint32_t *)&_ebss;
magic[0] = BOOTMAGIC0;
magic[1] = BOOTMAGIC1;
/* Reset core to enter bootloader */

scb_reset_system();
}

Expand Down
3 changes: 2 additions & 1 deletion src/platforms/common/cdcacm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@ static const char *usb_strings[] = {
serial_no,
"Black Magic GDB Server",
"Black Magic UART Port",
"Black Magic DFU",
/* Required, the line for stm32f1s is "@Internal Flash /0x08000000/8*001Ka,56*001Kg" maybe use an if statement? */
"@Internal Flash /0x08000000/04*016Kg,01*064Kg,03*128Kg",
#if defined(PLATFORM_HAS_TRACESWO)
"Black Magic Trace Capture",
#endif
Expand Down