fruchti/hpgl_xy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add pin for USB pull-up

Browse source 
This allows forcing re-enumeration, which is necessary for switching to
bootloader mode from the application firmware
This commit is contained in:
fruchti 2023-06-17 16:22:51 +02:00
parent 4095de4e8b
commit c9eb526d46
7 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stm32f103t8u6-bootloader/build_number.txt
View file

@ -1 +1 @@
439 445

8
stm32f103t8u6-bootloader/src/main.c
View file

@ -39,10 +39,10 @@ static inline bool Bootloader_EntryCondition(void)
{ {
// Activate pull-up for test point // Activate pull-up for test point
GPIOA->CRH = (0x44444444 GPIOA->CRH = (0x44444444
& ~(0x0f << (PIN_TEST_POINT * 4 - 32))) & ~(0x0f << (PIN_USB_PULLUP * 4 - 32)))
| (0x08<< (PIN_TEST_POINT * 4 - 32)) | (0x08<< (PIN_USB_PULLUP * 4 - 32))
; ;
GPIOA->BSRR = (1 << PIN_TEST_POINT); GPIOA->BSRR = (1 << PIN_USB_PULLUP);
// The first word in the application frame is the stack end pointer // The first word in the application frame is the stack end pointer
const uint32_t *application_start = (uint32_t*)FLASH_APPLICATION_BASE; const uint32_t *application_start = (uint32_t*)FLASH_APPLICATION_BASE;
@ -61,7 +61,7 @@ static inline bool Bootloader_EntryCondition(void)
} }
// Check if test point is held low externally // Check if test point is held low externally
if(~GPIOA->IDR & (1 << PIN_TEST_POINT)) if(~GPIOA->IDR & (1 << PIN_USB_PULLUP))
{ {
return true; return true;
} }

2
stm32f103t8u6-bootloader/src/pinning.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
// Port A // Port A
#define PIN_TEST_POINT 10 // PA10 #define PIN_USB_PULLUP 10 // PA10
#define PIN_USB_DM 11 // PA11 - USB_DM #define PIN_USB_DM 11 // PA11 - USB_DM
#define PIN_USB_DP 12 // PA12 - USB_DP #define PIN_USB_DP 12 // PA12 - USB_DP

7
stm32f103t8u6-bootloader/src/usb.c
View file

@ -18,11 +18,16 @@ void USB_Init(void)
// Note: This will reset the test point pin to an input without pullup // Note: This will reset the test point pin to an input without pullup
GPIOA->CRH = (0x44444444 GPIOA->CRH = (0x44444444
& ~(0x0f << (PIN_USB_DM * 4 - 32)) & ~(0x0f << (PIN_USB_DM * 4 - 32))
& ~(0x0f << (PIN_USB_DP * 4 - 32))) & ~(0x0f << (PIN_USB_DP * 4 - 32))
& ~(0x0f << (PIN_USB_PULLUP * 4 - 32)))
| (0x0b << (PIN_USB_DM * 4 - 32)) // AF mode, 50 MHz | (0x0b << (PIN_USB_DM * 4 - 32)) // AF mode, 50 MHz
| (0x0b << (PIN_USB_DP * 4 - 32)) // AF mode, 50 MHz | (0x0b << (PIN_USB_DP * 4 - 32)) // AF mode, 50 MHz
| (0x02 << (PIN_USB_PULLUP * 4 - 32)) // PP output, 2 MHz
; ;
// Enable pull-up
GPIOA->BSRR = (1 << PIN_USB_PULLUP);
Util_Delay(100000); Util_Delay(100000);
// Analog power up // Analog power up

2
stm32f103t8u6/build_number.txt
View file

@ -1 +1 @@
337 352

1
stm32f103t8u6/src/pinning.h
View file

@ -6,6 +6,7 @@
#define PIN_LED_ORANGE 7 // PA7 - Status LED 2 #define PIN_LED_ORANGE 7 // PA7 - Status LED 2
#define PIN_OUTPUT_X 8 // PA8 - TIM1_CH1 #define PIN_OUTPUT_X 8 // PA8 - TIM1_CH1
#define PIN_OUTPUT_Y 9 // PA9 - TIM1_CH2 #define PIN_OUTPUT_Y 9 // PA9 - TIM1_CH2
#define PIN_USB_PULLUP 10 // PA10 - 1.5 kΩ to D-
#define PIN_USB_DM 11 // PA11 - USB_DM #define PIN_USB_DM 11 // PA11 - USB_DM
#define PIN_USB_DP 12 // PA12 - USB_DP #define PIN_USB_DP 12 // PA12 - USB_DP

22
stm32f103t8u6/src/usb.c
View file

@ -9,6 +9,7 @@
MODULE_OWNS_PERIPHERAL(USB); MODULE_OWNS_PERIPHERAL(USB);
MODULE_OWNS_PIN(GPIOA, PIN_USB_DM); MODULE_OWNS_PIN(GPIOA, PIN_USB_DM);
MODULE_OWNS_PIN(GPIOA, PIN_USB_DP); MODULE_OWNS_PIN(GPIOA, PIN_USB_DP);
MODULE_OWNS_PIN(GPIOA, PIN_USB_PULLUP);
USB_PacketHandler_t USB_EP0OutPacketHandler; USB_PacketHandler_t USB_EP0OutPacketHandler;
@ -23,10 +24,23 @@ void USB_Init(void)
RCC->APB2ENR |= RCC_APB2ENR_AFIOEN; RCC->APB2ENR |= RCC_APB2ENR_AFIOEN;
RCC->APB1ENR |= RCC_APB1ENR_USBEN; RCC->APB1ENR |= RCC_APB1ENR_USBEN;
GPIOA->CRH &= ~(GPIO_CRH_CNF11 | GPIO_CRH_MODE11 GPIOA->BRR = (1 << PIN_USB_DM) | (1 << PIN_USB_DP) | (1 << PIN_USB_PULLUP);
| GPIO_CRH_CNF12 | GPIO_CRH_MODE12); GPIOA->CRH = (GPIOA->CRH
GPIOA->CRH |= GPIO_CRH_MODE11 | GPIO_CRH_MODE12; & ~(0xf << (4 * PIN_USB_DM - 32))
GPIOA->ODR &= ~(GPIO_CRH_MODE11 | GPIO_CRH_MODE12); & ~(0xf << (4 * PIN_USB_DP - 32))
& ~(0xf << (4 * PIN_USB_PULLUP - 32)))
| (0x3 << (4 * PIN_USB_DM - 32)) // PP output, 50 MHz
| (0x3 << (4 * PIN_USB_DP - 32)) // PP output, 50 MHz
| (0x3 << (4 * PIN_USB_PULLUP - 32)) // PP output, 2 MHz
;
// Enable D- pull-up
GPIOA->BSRR = (1 << PIN_USB_PULLUP);
// GPIOA->CRH &= ~(GPIO_CRH_CNF11 | GPIO_CRH_MODE11
// | GPIO_CRH_CNF12 | GPIO_CRH_MODE12);
// GPIOA->CRH |= GPIO_CRH_MODE11 | GPIO_CRH_MODE12;
// GPIOA->ODR &= ~(GPIO_CRH_MODE11 | GPIO_CRH_MODE12);
USB_Delay(100000); USB_Delay(100000);
// Enable reset and correct transfer interrupts // Enable reset and correct transfer interrupts