From 577092a4f9a72d3d9ab715173896c5b40745706e Mon Sep 17 00:00:00 2001 From: sc <2401809606@qq.com> Date: Mon, 1 Dec 2025 23:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config | 2 +- applications/DATA_uart.c | 2 +- applications/data/Variable.c | 4 ++-- applications/sql/DB_SQLite.h | 2 +- cubemx/Src/stm32h7xx_hal_msp.c | 4 ++-- cubemx/cubemx.ioc | 19 +++++++++--------- drivers/include/drv_sdio.h | 4 ++-- packages/packages.dbsqlite | Bin 274432 -> 290816 bytes .../dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c | 2 +- rtconfig.h | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.config b/.config index 700a3c1..9e7fa37 100644 --- a/.config +++ b/.config @@ -149,7 +149,7 @@ CONFIG_RT_DFS_ELM_LFN_UNICODE_2=y CONFIG_RT_DFS_ELM_LFN_UNICODE=2 CONFIG_RT_DFS_ELM_MAX_LFN=255 CONFIG_RT_DFS_ELM_DRIVES=2 -CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 +CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=4096 CONFIG_RT_DFS_ELM_USE_ERASE=y CONFIG_RT_DFS_ELM_REENTRANT=y CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 diff --git a/applications/DATA_uart.c b/applications/DATA_uart.c index 3803067..3fb2e0f 100644 --- a/applications/DATA_uart.c +++ b/applications/DATA_uart.c @@ -76,7 +76,7 @@ void uart_thread_entry(void *parameter) // 等待处理完成 if (rt_sem_take(req->sem, rt_tick_from_millisecond(100)) >= RT_EOK) { - rs485_send(hinst, req->output, req->output_len); + if(req->output_len>0) rs485_send(hinst, req->output, req->output_len); } } // 清理 diff --git a/applications/data/Variable.c b/applications/data/Variable.c index aaf4a6c..8ad5e26 100644 --- a/applications/data/Variable.c +++ b/applications/data/Variable.c @@ -7,8 +7,8 @@ char *DATA_dat; char DATA_machins[3]; char DATA_api[5]; -char *machine_name = "Q109"; -char machine_ID[3] = "23"; +char *machine_name = "828"; +char machine_ID[3] = "1"; // 状态标志 char MACHINE_ERR = 0; diff --git a/applications/sql/DB_SQLite.h b/applications/sql/DB_SQLite.h index 028337b..3d8794b 100644 --- a/applications/sql/DB_SQLite.h +++ b/applications/sql/DB_SQLite.h @@ -29,7 +29,7 @@ extern "C" { #endif #ifndef DB_MAX_WAITING_MS -#define DB_MAX_WAITING_MS (5000) /**< 命令最大等待时间(毫秒),默认 5 秒 */ +#define DB_MAX_WAITING_MS (500) /**< 命令最大等待时间(毫秒),默认 5 秒 */ #endif #ifndef DB_QUEUE_SIZE diff --git a/cubemx/Src/stm32h7xx_hal_msp.c b/cubemx/Src/stm32h7xx_hal_msp.c index b3ecfa6..af7c0c5 100644 --- a/cubemx/Src/stm32h7xx_hal_msp.c +++ b/cubemx/Src/stm32h7xx_hal_msp.c @@ -267,10 +267,10 @@ void HAL_SD_MspInit(SD_HandleTypeDef* hsd) */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SDMMC; PeriphClkInitStruct.PLL2.PLL2M = 32; - PeriphClkInitStruct.PLL2.PLL2N = 150; + PeriphClkInitStruct.PLL2.PLL2N = 200; PeriphClkInitStruct.PLL2.PLL2P = 2; PeriphClkInitStruct.PLL2.PLL2Q = 2; - PeriphClkInitStruct.PLL2.PLL2R = 2; + PeriphClkInitStruct.PLL2.PLL2R = 4; PeriphClkInitStruct.PLL2.PLL2RGE = RCC_PLL2VCIRANGE_1; PeriphClkInitStruct.PLL2.PLL2VCOSEL = RCC_PLL2VCOWIDE; PeriphClkInitStruct.PLL2.PLL2FRACN = 0; diff --git a/cubemx/cubemx.ioc b/cubemx/cubemx.ioc index f5e2f0c..1962224 100644 --- a/cubemx/cubemx.ioc +++ b/cubemx/cubemx.ioc @@ -283,8 +283,8 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_FMC_Init-FMC-false-HAL-true,5-MX_SDMMC1_SD_Init-SDMMC1-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_QUADSPI_Init-QUADSPI-false-HAL-true,9-MX_RTC_Init-RTC-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true -RCC.ADCFreq_Value=150000000 +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_FMC_Init-FMC-false-HAL-true,5-MX_SDMMC1_SD_Init-SDMMC1-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_QUADSPI_Init-QUADSPI-false-HAL-true,9-MX_RTC_Init-RTC-false-HAL-true,10-MX_IWDG1_Init-IWDG1-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true +RCC.ADCFreq_Value=200000000 RCC.AHB12Freq_Value=240000000 RCC.AHB4Freq_Value=240000000 RCC.APB1Freq_Value=120000000 @@ -305,16 +305,17 @@ RCC.DFSDMACLkFreq_Value=120000000 RCC.DFSDMFreq_Value=120000000 RCC.DIVM1=4 RCC.DIVN1=60 -RCC.DIVN2=150 +RCC.DIVN2=200 RCC.DIVP1Freq_Value=480000000 -RCC.DIVP2Freq_Value=150000000 +RCC.DIVP2Freq_Value=200000000 RCC.DIVP3Freq_Value=129000000 RCC.DIVQ1=8 RCC.DIVQ1Freq_Value=120000000 -RCC.DIVQ2Freq_Value=150000000 +RCC.DIVQ2Freq_Value=200000000 RCC.DIVQ3Freq_Value=129000000 RCC.DIVR1Freq_Value=480000000 -RCC.DIVR2Freq_Value=150000000 +RCC.DIVR2=4 +RCC.DIVR2Freq_Value=100000000 RCC.DIVR3Freq_Value=129000000 RCC.FDCANFreq_Value=120000000 RCC.FMCFreq_Value=240000000 @@ -325,7 +326,7 @@ RCC.HPRE=RCC_HCLK_DIV2 RCC.HRTIMFreq_Value=240000000 RCC.I2C123Freq_Value=120000000 RCC.I2C4Freq_Value=120000000 -RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,D1PPRE,D2PPRE1,D2PPRE2,D3PPRE,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVN1,DIVN2,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1,DIVQ1Freq_Value,DIVQ2Freq_Value,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HRTIMFreq_Value,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL3FRACN,PLLFRACN,QSPICLockSelection,QSPIFreq_Value,RNGFreq_Value,RTCFreq_Value,SAI1Freq_Value,SAI23Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMC1CLockSelection,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16Freq_Value,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value +RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,D1PPRE,D2PPRE1,D2PPRE2,D3PPRE,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVN1,DIVN2,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1,DIVQ1Freq_Value,DIVQ2Freq_Value,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2,DIVR2Freq_Value,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HRTIMFreq_Value,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLL2FRACN,PLL3FRACN,PLLFRACN,QSPICLockSelection,QSPIFreq_Value,RNGFreq_Value,RTCFreq_Value,SAI1Freq_Value,SAI23Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMC1CLockSelection,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16Freq_Value,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value RCC.LPTIM1Freq_Value=120000000 RCC.LPTIM2Freq_Value=120000000 RCC.LPTIM345Freq_Value=120000000 @@ -345,7 +346,7 @@ RCC.SAI23Freq_Value=120000000 RCC.SAI4AFreq_Value=120000000 RCC.SAI4BFreq_Value=120000000 RCC.SDMMC1CLockSelection=RCC_SDMMCCLKSOURCE_PLL2 -RCC.SDMMCFreq_Value=150000000 +RCC.SDMMCFreq_Value=100000000 RCC.SPDIFRXFreq_Value=120000000 RCC.SPI123Freq_Value=120000000 RCC.SPI45Freq_Value=120000000 @@ -360,7 +361,7 @@ RCC.USART16Freq_Value=120000000 RCC.USART234578Freq_Value=120000000 RCC.USBFreq_Value=120000000 RCC.VCO1OutputFreq_Value=960000000 -RCC.VCO2OutputFreq_Value=300000000 +RCC.VCO2OutputFreq_Value=400000000 RCC.VCO3OutputFreq_Value=258000000 RCC.VCOInput1Freq_Value=16000000 RCC.VCOInput2Freq_Value=2000000 diff --git a/drivers/include/drv_sdio.h b/drivers/include/drv_sdio.h index 35862eb..09d8af5 100644 --- a/drivers/include/drv_sdio.h +++ b/drivers/include/drv_sdio.h @@ -32,7 +32,7 @@ #endif #ifndef SDIO_CLOCK_FREQ -#define SDIO_CLOCK_FREQ (150U * 1000 * 1000) +#define SDIO_CLOCK_FREQ (200U * 1000 * 1000) #endif #ifndef SDIO_BUFF_SIZE @@ -44,7 +44,7 @@ #endif #ifndef SDIO_MAX_FREQ -#define SDIO_MAX_FREQ (25 * 1000 * 1000) +#define SDIO_MAX_FREQ (50 * 1000 * 1000) #endif #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) diff --git a/packages/packages.dbsqlite b/packages/packages.dbsqlite index fc48dd6757b4fc9dc14469a4fe3a7e04ad319d9f..c75069725f6933ab23119d630d609e92ed760363 100644 GIT binary patch delta 18271 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 diff --git a/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c b/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c index c87be82..3d06243 100644 --- a/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c +++ b/rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c @@ -494,7 +494,7 @@ int dfs_tmpfs_stat(struct dfs_filesystem *fs, if (d_file == NULL) return -ENOENT; - st->st_dev = (rt_device_t)dfs_filesystem_lookup(fs->path); + st->st_dev = (uintptr_t)dfs_filesystem_lookup(fs->path); st->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH; if (d_file->type == TMPFS_TYPE_DIR) diff --git a/rtconfig.h b/rtconfig.h index 698c983..1d2ee53 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -73,7 +73,7 @@ #define RT_USING_FINSH #define FINSH_USING_MSH #define FINSH_THREAD_NAME "tshell" -#define FINSH_THREAD_PRIORITY 30 +#define FINSH_THREAD_PRIORITY 20 #define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 @@ -105,7 +105,7 @@ #define RT_DFS_ELM_LFN_UNICODE 2 #define RT_DFS_ELM_MAX_LFN 255 #define RT_DFS_ELM_DRIVES 2 -#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 +#define RT_DFS_ELM_MAX_SECTOR_SIZE 4096 #define RT_DFS_ELM_USE_ERASE #define RT_DFS_ELM_REENTRANT #define RT_DFS_ELM_MUTEX_TIMEOUT 3000