✨ feat(main): 新增usb连接状态检测与自动文件系统管理功能
- 新增usb连接状态检测函数,根据usb连接状态自动切换数据采集模式 - 新增文件系统动态挂载/卸载功能,usb连接时卸载文件系统,断开时重新挂载 - 修改系统启动逻辑,根据初始usb连接状态决定是否开始数据采集 - 新增usb模式系统状态,完善系统状态机 🐛 fix(sdio): 修复sdio配置问题并启用中断 - 修改sdio时钟分频为2,优化sd nand通信时序 - 启用sdio数据线内部上拉电阻,提高信号稳定性 - 提高sdio dma传输优先级至最高,确保数据传输实时性 - 启用sdio全局中断并设置优先级为9 🔧 chore(config): 优化系统配置参数 - 修改系统滴答定时器中断优先级为0(最高优先级) - 增加堆栈大小至0x1000,增加堆大小至0x800 - 修改usb msc媒体数据包大小至32768,提高usb传输效率 - 修改fatfs配置,设置最大最小扇区大小为512字节 ♻️ refactor(usb): 重构usb存储接口实现 - 修改usb存储初始化逻辑,避免重复初始化sd卡 - 优化usb存储容量报告机制,强制报告512字节扇区 - 增加sd nand读写超时等待机制,确保数据传输完成 - 修改usb中断优先级为11,避免与sdio中断冲突 📝 docs(headers): 更新头文件声明 - 在stm32f4xx_it.h中添加sdio中断处理函数声明 - 在system_monitor.h中添加usb模式系统状态定义 - 更新data_storage.h中的数据存储路径配置
This commit is contained in:
@@ -183,16 +183,21 @@ int8_t STORAGE_Init_FS(uint8_t lun)
|
||||
{
|
||||
/* USER CODE BEGIN 2 */
|
||||
UNUSED(lun);
|
||||
|
||||
// 1. 检查 SD 句柄状态
|
||||
// 如果之前在 main.c 里已经 HAL_SD_Init 过了,这里只要确认状态即可
|
||||
HAL_SD_StateTypeDef state = HAL_SD_GetState(&hsd);
|
||||
|
||||
// 初始化SD卡
|
||||
if (HAL_SD_Init(&hsd) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
|
||||
// 挂载文件系统
|
||||
if (f_mount(&SDFatFS, SDPath, 1) != FR_OK) {
|
||||
return (USBD_FAIL);
|
||||
if(state == HAL_SD_STATE_RESET)
|
||||
{
|
||||
// 只有在从未初始化的情况下才初始化
|
||||
if (HAL_SD_Init(&hsd) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 绝对不要在这里 f_mount 或 f_mkfs !!!
|
||||
// USB 只是搬运工,文件系统由电脑端管理。
|
||||
|
||||
sd_initialized = 1;
|
||||
return (USBD_OK);
|
||||
@@ -211,20 +216,26 @@ int8_t STORAGE_GetCapacity_FS(uint8_t lun, uint32_t *block_num, uint16_t *block_
|
||||
/* USER CODE BEGIN 3 */
|
||||
UNUSED(lun);
|
||||
|
||||
if (!sd_initialized) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
|
||||
HAL_SD_CardInfoTypeDef cardinfo;
|
||||
if (HAL_SD_GetCardInfo(&hsd, &cardinfo) == HAL_OK) {
|
||||
*block_num = cardinfo.LogBlockNbr;
|
||||
*block_size = cardinfo.LogBlockSize;
|
||||
} else {
|
||||
*block_num = STORAGE_BLK_NBR;
|
||||
*block_size = STORAGE_BLK_SIZ;
|
||||
|
||||
if (HAL_SD_GetCardInfo(&hsd, &cardinfo) == HAL_OK)
|
||||
{
|
||||
// 修正 2: 欺骗电脑,强制报告 512 字节扇区
|
||||
*block_size = 512;
|
||||
|
||||
if (cardinfo.LogBlockSize == 512) {
|
||||
*block_num = cardinfo.LogBlockNbr - 1;
|
||||
}
|
||||
else {
|
||||
// 如果 SD NAND 是 2048/4096 字节页,需要转换块数量
|
||||
// 例如:实际 4096,那 USB 看到的块数就是 实际块数 * 8
|
||||
uint32_t ratio = cardinfo.LogBlockSize / 512;
|
||||
*block_num = (cardinfo.LogBlockNbr * ratio) - 1;
|
||||
}
|
||||
return (USBD_OK);
|
||||
}
|
||||
|
||||
return (USBD_OK);
|
||||
return (USBD_FAIL);
|
||||
/* USER CODE END 3 */
|
||||
}
|
||||
|
||||
@@ -238,16 +249,14 @@ int8_t STORAGE_IsReady_FS(uint8_t lun)
|
||||
/* USER CODE BEGIN 4 */
|
||||
UNUSED(lun);
|
||||
|
||||
if (!sd_initialized) {
|
||||
return (USBD_FAIL);
|
||||
// 简单检查硬件状态
|
||||
if (hsd.State == HAL_SD_STATE_RESET) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
|
||||
HAL_SD_CardStateTypeDef state = HAL_SD_GetCardState(&hsd);
|
||||
if (state == HAL_SD_CARD_TRANSFER) {
|
||||
return (USBD_OK);
|
||||
}
|
||||
|
||||
return (USBD_FAIL);
|
||||
// 对于 SD NAND,即使内部 BUSY,为了不让 USB 掉线,通常也返回 OK
|
||||
// 实际的等待放到 Read/Write 函数里去做
|
||||
return (USBD_OK);
|
||||
/* USER CODE END 4 */
|
||||
}
|
||||
|
||||
@@ -278,12 +287,18 @@ int8_t STORAGE_Read_FS(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t bl
|
||||
/* USER CODE BEGIN 6 */
|
||||
UNUSED(lun);
|
||||
|
||||
if (!sd_initialized || buf == NULL) {
|
||||
// 使用较长的超时时间 (SD NAND 读写较慢)
|
||||
uint32_t timeout = 2000;
|
||||
|
||||
if (HAL_SD_ReadBlocks(&hsd, buf, blk_addr, blk_len, timeout) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
|
||||
if (HAL_SD_ReadBlocks(&hsd, buf, blk_addr, blk_len, HAL_MAX_DELAY) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
// 等待传输完成 (重要: 确保 DMA/中断搬运完毕)
|
||||
uint32_t tickstart = HAL_GetTick();
|
||||
while(HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
|
||||
{
|
||||
if((HAL_GetTick() - tickstart) > timeout) return USBD_FAIL;
|
||||
}
|
||||
|
||||
return (USBD_OK);
|
||||
@@ -303,12 +318,19 @@ int8_t STORAGE_Write_FS(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t b
|
||||
/* USER CODE BEGIN 7 */
|
||||
UNUSED(lun);
|
||||
|
||||
if (!sd_initialized || buf == NULL) {
|
||||
// 修正 3: 增加超时时间,并等待 Busy 结束
|
||||
uint32_t timeout = 5000; // 给 5秒,SD NAND 写入由于要擦除/编程,很慢
|
||||
|
||||
if (HAL_SD_WriteBlocks(&hsd, buf, blk_addr, blk_len, timeout) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
}
|
||||
|
||||
if (HAL_SD_WriteBlocks(&hsd, buf, blk_addr, blk_len, HAL_MAX_DELAY) != HAL_OK) {
|
||||
return (USBD_FAIL);
|
||||
// 【最关键的一步】等待 SD NAND 内部编程结束
|
||||
// 如果没有这一步,文件就会丢失!
|
||||
uint32_t tickstart = HAL_GetTick();
|
||||
while(HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
|
||||
{
|
||||
if((HAL_GetTick() - tickstart) > timeout) return USBD_FAIL;
|
||||
}
|
||||
|
||||
return (USBD_OK);
|
||||
|
||||
@@ -91,7 +91,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle)
|
||||
__HAL_RCC_USB_OTG_FS_CLK_ENABLE();
|
||||
|
||||
/* Peripheral interrupt init */
|
||||
HAL_NVIC_SetPriority(OTG_FS_IRQn, 0, 0);
|
||||
HAL_NVIC_SetPriority(OTG_FS_IRQn, 11, 0);
|
||||
HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
|
||||
/* USER CODE BEGIN USB_OTG_FS_MspInit 1 */
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
/*---------- -----------*/
|
||||
#define USBD_SELF_POWERED 1U
|
||||
/*---------- -----------*/
|
||||
#define MSC_MEDIA_PACKET 8192U
|
||||
#define MSC_MEDIA_PACKET 32768U
|
||||
|
||||
/****************************************/
|
||||
/* #define for FS and HS identification */
|
||||
|
||||
Reference in New Issue
Block a user