枚举失败

This commit is contained in:
2025-09-21 19:13:30 +08:00
parent 5e47755b58
commit 7c6cf37073
5 changed files with 70 additions and 14 deletions

View File

@@ -28,7 +28,16 @@
"Project/Src/MyWinApp", "Project/Src/MyWinApp",
"Project/Src/rt-thread", "Project/Src/rt-thread",
"Project/Src/rt-thread/include", "Project/Src/rt-thread/include",
"Project/Src/zlib" "Project/Src/zlib",
"Project/Src/NES",
"Project/Src/TinyUSB/examples/device/cdc_dual_ports/src",
"Project/Src/TinyUSB/src/class/cdc",
"Project/Src/TinyUSB/src/common",
"Project/Src/TinyUSB/src/device",
"Project/Src/TinyUSB/src/portable/synopsys/dwc2",
"Project/Src/TinyUSB/src",
"Project/Src/TinyUSB/src/osal",
"Project/Src/TinyUSB/hw"
], ],
"defines": [ "defines": [
"USE_STDPERIPH_DRIVER", "USE_STDPERIPH_DRIVER",
@@ -36,7 +45,10 @@
"ARM_MATH_CM4", "ARM_MATH_CM4",
"__FPU_PRESENT=1", "__FPU_PRESENT=1",
"__packed=__attribute__((__packed__))", "__packed=__attribute__((__packed__))",
"__weak=__attribute__((weak))" "__weak=__attribute__((weak))",
"__RTTHREAD__",
"SOC_SERIES_STM32F4",
"PKG_TINYUSB_DEVICE_ENABLE"
], ],
"windowsSdkVersion": "10.0.22621.0", "windowsSdkVersion": "10.0.22621.0",
"compilerPath": "D:/Program Files/arm-gnu-toolchain/bin/arm-none-eabi-gcc", "compilerPath": "D:/Program Files/arm-gnu-toolchain/bin/arm-none-eabi-gcc",

View File

@@ -6,12 +6,14 @@
* @description * @description
* *
* <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>STM32<33><32><EFBFBD>е<EFBFBD><D0B5><EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϷ<D0B6><CFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>STM32<33><32><EFBFBD>е<EFBFBD><D0B5><EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϷ<D0B6><CFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* *
*************************************************************************** ***************************************************************************
***/ ***/
#include "stm32f4xx_it.h" #include "stm32f4xx_it.h"
#include "sdio_sd.h" #include "sdio_sd.h"
#include "stdbool.h"
#include "tusb.h"
/** @addtogroup Template_Project /** @addtogroup Template_Project
* @{ * @{
@@ -162,7 +164,7 @@ void SD_SDIO_DMA_IRQHANDLER(void)
#if 1 #if 1
#ifdef USE_USB_OTG_HS #ifdef USE_USB_OTG_HS
void OTG_HS_IRQHandler(void) void OTG_HS_IRQHandler(void)
{ {
extern void USBD_OTG_ISR_USER (void); extern void USBD_OTG_ISR_USER (void);
@@ -170,13 +172,13 @@ void OTG_HS_IRQHandler(void)
} }
#endif #endif
#ifdef USE_USB_OTG_FS #ifdef USE_USB_OTG_FS
void OTG_FS_IRQHandler(void) void OTG_FS_IRQHandler(void)
{ {
USBD_OTG_ISR_Handler (&USB_OTG_dev); USBD_OTG_ISR_Handler (&USB_OTG_dev);
} }
#endif #endif
#ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED #ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED
void OTG_HS_EP1_IN_IRQHandler(void) void OTG_HS_EP1_IN_IRQHandler(void)
{ {
@@ -192,6 +194,18 @@ void OTG_HS_EP1_OUT_IRQHandler(void)
} }
#endif #endif
#if PKG_TINYUSB_DEVICE_ENABLE
void OTG_FS_IRQHandler(void) {
tusb_int_handler(0, true);
}
void OTG_HS_IRQHandler(void) {
tusb_int_handler(1, true);
}
#endif
#else #else
@@ -199,7 +213,7 @@ void OTG_HS_EP1_OUT_IRQHandler(void)
extern USB_OTG_CORE_HANDLE USB_OTG_dev; extern USB_OTG_CORE_HANDLE USB_OTG_dev;
extern uint32_t USBD_OTG_ISR_Handler (USB_OTG_CORE_HANDLE *pdev); extern uint32_t USBD_OTG_ISR_Handler (USB_OTG_CORE_HANDLE *pdev);
#ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED #ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED
extern uint32_t USBD_OTG_EP1IN_ISR_Handler (USB_OTG_CORE_HANDLE *pdev); extern uint32_t USBD_OTG_EP1IN_ISR_Handler (USB_OTG_CORE_HANDLE *pdev);
extern uint32_t USBD_OTG_EP1OUT_ISR_Handler (USB_OTG_CORE_HANDLE *pdev); extern uint32_t USBD_OTG_EP1OUT_ISR_Handler (USB_OTG_CORE_HANDLE *pdev);
#endif #endif
@@ -207,7 +221,7 @@ extern uint32_t USBD_OTG_EP1OUT_ISR_Handler (USB_OTG_CORE_HANDLE *pdev);
#ifdef USE_USB_OTG_HS #ifdef USE_USB_OTG_HS
void OTG_HS_IRQHandler(void) void OTG_HS_IRQHandler(void)
#else #else
void OTG_FS_IRQHandler(void) void OTG_FS_IRQHandler(void)
@@ -216,7 +230,7 @@ void OTG_FS_IRQHandler(void)
USBD_OTG_ISR_Handler (&USB_OTG_dev); USBD_OTG_ISR_Handler (&USB_OTG_dev);
} }
#ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED #ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED
/** /**
* @brief This function handles EP1_IN Handler. * @brief This function handles EP1_IN Handler.
* @param None * @param None
@@ -246,7 +260,7 @@ void OTG_HS_EP1_OUT_IRQHandler(void)
/** /**
* @} * @}
*/ */
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

View File

@@ -99,6 +99,13 @@ void mpu_init(void)
const libc_device_file *g_usart; const libc_device_file *g_usart;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>ӣ<EFBFBD>25m<35><6D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>֤usbΪ48m<38><6D><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ168m
void reconfig_clock(void) {
RCC_PLLConfig(RCC_PLLSource_HSE, 25, 336, 2, 7);
SystemCoreClock = 168000000;
}
/** /**
* This function will initial your board. * This function will initial your board.
*/ */
@@ -106,6 +113,7 @@ void rt_hw_board_init()
{ {
// NVIC_SetVectorTable(NVIC_VectTab_FLASH,(u32)128*1024); // NVIC_SetVectorTable(NVIC_VectTab_FLASH,(u32)128*1024);
NVIC_SetVectorTable(NVIC_VectTab_FLASH,(u32)0); NVIC_SetVectorTable(NVIC_VectTab_FLASH,(u32)0);
reconfig_clock();
_SysTick_Config (SystemCoreClock/1000); _SysTick_Config (SystemCoreClock/1000);
NVIC_SetPriority (SysTick_IRQn, (1<<__NVIC_PRIO_BITS) - 1); NVIC_SetPriority (SysTick_IRQn, (1<<__NVIC_PRIO_BITS) - 1);
LED_Init(); LED_Init();

View File

@@ -254,7 +254,7 @@ static void rt_thread_idle_entry(void *parameter)
#endif #endif
rt_thread_idle_excute(); rt_thread_idle_excute();
__WFI(); // __WFI();
} }
} }

View File

@@ -39,7 +39,10 @@ DEF=[
'-D__FPU_PRESENT=1', '-D__FPU_PRESENT=1',
# '-D__GNUC__', # '-D__GNUC__',
'-D__packed=__attribute__((__packed__))', '-D__packed=__attribute__((__packed__))',
'-D__weak=__attribute__((weak))' '-D__weak=__attribute__((weak))',
'-D__RTTHREAD__',
'-DSOC_SERIES_STM32F4',
'-DPKG_TINYUSB_DEVICE_ENABLE',
] ]
INC=[ INC=[
@@ -71,7 +74,16 @@ INC=[
'-ISrc/rt-thread/include', '-ISrc/rt-thread/include',
# '-ISrc/sqlite3', # '-ISrc/sqlite3',
'-ISrc/zlib', '-ISrc/zlib',
'-ISrc/NES' '-ISrc/NES',
# '-ISrc/TinyUSB/lib/rt-thread',
'-ISrc/TinyUSB/examples/device/cdc_dual_ports/src',
'-ISrc/TinyUSB/src/class/cdc',
'-ISrc/TinyUSB/src/common',
'-ISrc/TinyUSB/src/device',
'-ISrc/TinyUSB/src/portable/synopsys/dwc2',
'-ISrc/TinyUSB/src',
'-ISrc/TinyUSB/src/osal',
'-ISrc/TinyUSB/hw',
] ]
SRC_DIR=[ SRC_DIR=[
@@ -88,6 +100,11 @@ SRC_DIR=[
'Src/MyWinApp', 'Src/MyWinApp',
'Src/rt-thread/src', 'Src/rt-thread/src',
# 'Src/sqlite3', # 'Src/sqlite3',
'Src/TinyUSB/src/class/cdc',
'Src/TinyUSB/src/common',
'Src/TinyUSB/src/device',
'Src/TinyUSB/src/portable/synopsys/dwc2',
# 'Src/TinyUSB/src',
] ]
SRC=[ SRC=[
@@ -136,6 +153,11 @@ SRC=[
'Src/NES/nes_main.c', 'Src/NES/nes_main.c',
'Src/NES/nes_ppu.c', 'Src/NES/nes_ppu.c',
'Src/NES/nes_mapper.c', 'Src/NES/nes_mapper.c',
'Src/TinyUSB/src/tusb.c',
'Src/TinyUSB/lib/rt-thread/tusb_rt_thread_port.c',
'Src/TinyUSB/examples/device/cdc_dual_ports/src/usb_descriptors.c',
'Src/TinyUSB/hw/bsp/board.c'
] ]
LD_FILE="stm32f429ighx_flash.ld" LD_FILE="stm32f429ighx_flash.ld"