new USB pullup

This commit is contained in:
Edward Emelianov 2024-08-15 09:27:03 +03:00
parent 0cb9b5f3c8
commit eaf137b5b6
6 changed files with 14 additions and 8 deletions

View File

@ -114,7 +114,7 @@ TRUE_INLINE void gpio_setup(){
GPIOA->OSPEEDR = OSPEED_MED(5) | OSPEED_MED(6) | OSPEED_MED(7) | OSPEED_HI(11) | OSPEED_HI(12) GPIOA->OSPEEDR = OSPEED_MED(5) | OSPEED_MED(6) | OSPEED_MED(7) | OSPEED_HI(11) | OSPEED_HI(12)
| OSPEED_HI(13) | OSPEED_HI(15); | OSPEED_HI(13) | OSPEED_HI(15);
GPIOA->OTYPER = 0; GPIOA->OTYPER = 0;
GPIOA->PUPDR = PUPD_PU(8) | PUPD_PU(9) | PUPD_PU(10); GPIOA->PUPDR = PUPD_PU(9) | PUPD_PU(10);
GPIOB->ODR = 0; GPIOB->ODR = 0;
GPIOB->AFR[0] = AFRf(2, 0) | AFRf(7, 3) | AFRf(10, 5); GPIOB->AFR[0] = AFRf(2, 0) | AFRf(7, 3) | AFRf(10, 5);
@ -125,7 +125,7 @@ TRUE_INLINE void gpio_setup(){
GPIOB->OSPEEDR = OSPEED_HI(0) | OSPEED_HI(5) | OSPEED_HI(8) | OSPEED_MED(13) | OSPEED_MED(14) | OSPEED_MED(15); GPIOB->OSPEEDR = OSPEED_HI(0) | OSPEED_HI(5) | OSPEED_HI(8) | OSPEED_MED(13) | OSPEED_MED(14) | OSPEED_MED(15);
// USART2_Tx (PB3) and USART3_Tx (PB10) are pullup opendrain // USART2_Tx (PB3) and USART3_Tx (PB10) are pullup opendrain
GPIOB->OTYPER = OTYPER_OD(3) | OTYPER_OD(10); GPIOB->OTYPER = OTYPER_OD(3) | OTYPER_OD(10);
GPIOB->PUPDR = PUPD_PU(3) | PUPD_PU(7) | PUPD_PU(9) | PUPD_PU(7) | PUPD_PU(11); GPIOB->PUPDR = PUPD_PU(3) | PUPD_PU(7) | PUPD_PU(9) | PUPD_PU(10) | PUPD_PU(11);
GPIOC->ODR = 0; GPIOC->ODR = 0;
GPIOC->AFR[0] = AFRf(7, 4) | AFRf(7, 5) | AFRf(4, 6); GPIOC->AFR[0] = AFRf(7, 4) | AFRf(7, 5) | AFRf(4, 6);

View File

@ -34,10 +34,12 @@
// USB pullup: PA8 // USB pullup: PA8
#define USBPU_port GPIOA #define USBPU_port GPIOA
#define USBPU_pin (1<<8) #define USBPU_pin (1<<8)
//#define USBPU_ON() pin_clear(USBPU_port, USBPU_pin) // Pullup by P-channel MOSFET
//#define USBPU_OFF() pin_set(USBPU_port, USBPU_pin) #define USBPU_ON() pin_clear(USBPU_port, USBPU_pin)
#define USBPU_ON() pin_set(USBPU_port, USBPU_pin) #define USBPU_OFF() pin_set(USBPU_port, USBPU_pin)
#define USBPU_OFF() pin_clear(USBPU_port, USBPU_pin) // direct pullup connected to pin
//#define USBPU_ON() pin_set(USBPU_port, USBPU_pin)
//#define USBPU_OFF() pin_clear(USBPU_port, USBPU_pin)
// temporary LED: PD9 // temporary LED: PD9
#define LED_blink() pin_toggle(GPIOD, 1<<9) #define LED_blink() pin_toggle(GPIOD, 1<<9)

View File

@ -1,2 +1,2 @@
#define BUILD_NUMBER "104" #define BUILD_NUMBER "107"
#define BUILD_DATE "2023-03-02" #define BUILD_DATE "2024-08-15"

View File

@ -5,5 +5,7 @@ MEMORY
ccmram (rwx) : ORIGIN = 0x10000000, LENGTH = 8K ccmram (rwx) : ORIGIN = 0x10000000, LENGTH = 8K
} }
PROVIDE(_BLOCKSIZE = 2048);
/* Include the common ld script. */ /* Include the common ld script. */
INCLUDE stm32f3.ld INCLUDE stm32f3.ld

View File

@ -5,5 +5,7 @@ MEMORY
ccmram (rwx) : ORIGIN = 0x10000000, LENGTH = 16K ccmram (rwx) : ORIGIN = 0x10000000, LENGTH = 16K
} }
PROVIDE(_BLOCKSIZE = 2048);
/* Include the common ld script. */ /* Include the common ld script. */
INCLUDE stm32f3.ld INCLUDE stm32f3.ld