sc
/
828F
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

逻辑修改

master
sc 2 months ago
parent
c0f455e413
commit
577092a4f9
10 changed files with 22 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .config
  2. 2
      applications/DATA_uart.c
  3. 4
      applications/data/Variable.c
  4. 2
      applications/sql/DB_SQLite.h
  5. 4
      cubemx/Src/stm32h7xx_hal_msp.c
  6. 19
      cubemx/cubemx.ioc
  7. 4
      drivers/include/drv_sdio.h
  8. BIN
      packages/packages.dbsqlite
  9. 2
      rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c
  10. 4
      rtconfig.h

2
.config
View File

@ -149,7 +149,7 @@ CONFIG_RT_DFS_ELM_LFN_UNICODE_2=y
CONFIG_RT_DFS_ELM_LFN_UNICODE=2 CONFIG_RT_DFS_ELM_LFN_UNICODE=2
CONFIG_RT_DFS_ELM_MAX_LFN=255 CONFIG_RT_DFS_ELM_MAX_LFN=255
CONFIG_RT_DFS_ELM_DRIVES=2 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_USE_ERASE=y
CONFIG_RT_DFS_ELM_REENTRANT=y CONFIG_RT_DFS_ELM_REENTRANT=y
CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000

2
applications/DATA_uart.c
View File

@ -76,7 +76,7 @@ void uart_thread_entry(void *parameter)
// 等待处理完成 // 等待处理完成
if (rt_sem_take(req->sem, rt_tick_from_millisecond(100)) >= RT_EOK) 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);
} }
} }
// 清理 // 清理

4
applications/data/Variable.c
View File

@ -7,8 +7,8 @@
char *DATA_dat; char *DATA_dat;
char DATA_machins[3]; char DATA_machins[3];
char DATA_api[5]; char DATA_api[5];
char *machine_name = "Q109"; char *machine_name = "828";
char machine_ID[3] = "23"; char machine_ID[3] = "1";
// 状态标志 // 状态标志
char MACHINE_ERR = 0; char MACHINE_ERR = 0;

2
applications/sql/DB_SQLite.h
View File

@ -29,7 +29,7 @@ extern "C" {
#endif #endif
#ifndef DB_MAX_WAITING_MS #ifndef DB_MAX_WAITING_MS
#define DB_MAX_WAITING_MS (5000) /**< 命令最大等待时间（毫秒），默认 5 秒 */ #define DB_MAX_WAITING_MS (500) /**< 命令最大等待时间（毫秒），默认 5 秒 */
#endif #endif
#ifndef DB_QUEUE_SIZE #ifndef DB_QUEUE_SIZE

4
cubemx/Src/stm32h7xx_hal_msp.c
View File

@ -267,10 +267,10 @@ void HAL_SD_MspInit(SD_HandleTypeDef* hsd)
*/ */
PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SDMMC; PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SDMMC;
PeriphClkInitStruct.PLL2.PLL2M = 32; PeriphClkInitStruct.PLL2.PLL2M = 32;
PeriphClkInitStruct.PLL2.PLL2N = 150; PeriphClkInitStruct.PLL2.PLL2N = 200;
PeriphClkInitStruct.PLL2.PLL2P = 2; PeriphClkInitStruct.PLL2.PLL2P = 2;
PeriphClkInitStruct.PLL2.PLL2Q = 2; PeriphClkInitStruct.PLL2.PLL2Q = 2;
PeriphClkInitStruct.PLL2.PLL2R = 2; PeriphClkInitStruct.PLL2.PLL2R = 4;
PeriphClkInitStruct.PLL2.PLL2RGE = RCC_PLL2VCIRANGE_1; PeriphClkInitStruct.PLL2.PLL2RGE = RCC_PLL2VCIRANGE_1;
PeriphClkInitStruct.PLL2.PLL2VCOSEL = RCC_PLL2VCOWIDE; PeriphClkInitStruct.PLL2.PLL2VCOSEL = RCC_PLL2VCOWIDE;
PeriphClkInitStruct.PLL2.PLL2FRACN = 0; PeriphClkInitStruct.PLL2.PLL2FRACN = 0;

19
cubemx/cubemx.ioc
View File

@ -283,8 +283,8 @@ ProjectManager.ToolChainLocation=
ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptAfterPath=
ProjectManager.UAScriptBeforePath= ProjectManager.UAScriptBeforePath=
ProjectManager.UnderRoot=false 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 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=150000000 RCC.ADCFreq_Value=200000000
RCC.AHB12Freq_Value=240000000 RCC.AHB12Freq_Value=240000000
RCC.AHB4Freq_Value=240000000 RCC.AHB4Freq_Value=240000000
RCC.APB1Freq_Value=120000000 RCC.APB1Freq_Value=120000000
@ -305,16 +305,17 @@ RCC.DFSDMACLkFreq_Value=120000000
RCC.DFSDMFreq_Value=120000000 RCC.DFSDMFreq_Value=120000000
RCC.DIVM1=4 RCC.DIVM1=4
RCC.DIVN1=60 RCC.DIVN1=60
RCC.DIVN2=150 RCC.DIVN2=200
RCC.DIVP1Freq_Value=480000000 RCC.DIVP1Freq_Value=480000000
RCC.DIVP2Freq_Value=150000000 RCC.DIVP2Freq_Value=200000000
RCC.DIVP3Freq_Value=129000000 RCC.DIVP3Freq_Value=129000000
RCC.DIVQ1=8 RCC.DIVQ1=8
RCC.DIVQ1Freq_Value=120000000 RCC.DIVQ1Freq_Value=120000000
RCC.DIVQ2Freq_Value=150000000 RCC.DIVQ2Freq_Value=200000000
RCC.DIVQ3Freq_Value=129000000 RCC.DIVQ3Freq_Value=129000000
RCC.DIVR1Freq_Value=480000000 RCC.DIVR1Freq_Value=480000000
RCC.DIVR2Freq_Value=150000000 RCC.DIVR2=4
RCC.DIVR2Freq_Value=100000000
RCC.DIVR3Freq_Value=129000000 RCC.DIVR3Freq_Value=129000000
RCC.FDCANFreq_Value=120000000 RCC.FDCANFreq_Value=120000000
RCC.FMCFreq_Value=240000000 RCC.FMCFreq_Value=240000000
@ -325,7 +326,7 @@ RCC.HPRE=RCC_HCLK_DIV2
RCC.HRTIMFreq_Value=240000000 RCC.HRTIMFreq_Value=240000000
RCC.I2C123Freq_Value=120000000 RCC.I2C123Freq_Value=120000000
RCC.I2C4Freq_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.LPTIM1Freq_Value=120000000
RCC.LPTIM2Freq_Value=120000000 RCC.LPTIM2Freq_Value=120000000
RCC.LPTIM345Freq_Value=120000000 RCC.LPTIM345Freq_Value=120000000
@ -345,7 +346,7 @@ RCC.SAI23Freq_Value=120000000
RCC.SAI4AFreq_Value=120000000 RCC.SAI4AFreq_Value=120000000
RCC.SAI4BFreq_Value=120000000 RCC.SAI4BFreq_Value=120000000
RCC.SDMMC1CLockSelection=RCC_SDMMCCLKSOURCE_PLL2 RCC.SDMMC1CLockSelection=RCC_SDMMCCLKSOURCE_PLL2
RCC.SDMMCFreq_Value=150000000 RCC.SDMMCFreq_Value=100000000
RCC.SPDIFRXFreq_Value=120000000 RCC.SPDIFRXFreq_Value=120000000
RCC.SPI123Freq_Value=120000000 RCC.SPI123Freq_Value=120000000
RCC.SPI45Freq_Value=120000000 RCC.SPI45Freq_Value=120000000
@ -360,7 +361,7 @@ RCC.USART16Freq_Value=120000000
RCC.USART234578Freq_Value=120000000 RCC.USART234578Freq_Value=120000000
RCC.USBFreq_Value=120000000 RCC.USBFreq_Value=120000000
RCC.VCO1OutputFreq_Value=960000000 RCC.VCO1OutputFreq_Value=960000000
RCC.VCO2OutputFreq_Value=300000000 RCC.VCO2OutputFreq_Value=400000000
RCC.VCO3OutputFreq_Value=258000000 RCC.VCO3OutputFreq_Value=258000000
RCC.VCOInput1Freq_Value=16000000 RCC.VCOInput1Freq_Value=16000000
RCC.VCOInput2Freq_Value=2000000 RCC.VCOInput2Freq_Value=2000000

4
drivers/include/drv_sdio.h
View File

@ -32,7 +32,7 @@
#endif #endif
#ifndef SDIO_CLOCK_FREQ #ifndef SDIO_CLOCK_FREQ
#define SDIO_CLOCK_FREQ (150U * 1000 * 1000) #define SDIO_CLOCK_FREQ (200U * 1000 * 1000)
#endif #endif
#ifndef SDIO_BUFF_SIZE #ifndef SDIO_BUFF_SIZE
@ -44,7 +44,7 @@
#endif #endif
#ifndef SDIO_MAX_FREQ #ifndef SDIO_MAX_FREQ
#define SDIO_MAX_FREQ (25 * 1000 * 1000) #define SDIO_MAX_FREQ (50 * 1000 * 1000)
#endif #endif
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))

BIN
packages/packages.dbsqlite
View File

Binary file not shown.

2
rt-thread/components/dfs/dfs_v1/filesystems/tmpfs/dfs_tmpfs.c
View File

@ -494,7 +494,7 @@ int dfs_tmpfs_stat(struct dfs_filesystem *fs,
if (d_file == NULL) if (d_file == NULL)
return -ENOENT; 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 | st->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH |
S_IWUSR | S_IWGRP | S_IWOTH; S_IWUSR | S_IWGRP | S_IWOTH;
if (d_file->type == TMPFS_TYPE_DIR) if (d_file->type == TMPFS_TYPE_DIR)

4
rtconfig.h
View File

@ -73,7 +73,7 @@
#define RT_USING_FINSH #define RT_USING_FINSH
#define FINSH_USING_MSH #define FINSH_USING_MSH
#define FINSH_THREAD_NAME "tshell" #define FINSH_THREAD_NAME "tshell"
#define FINSH_THREAD_PRIORITY 30 #define FINSH_THREAD_PRIORITY 20
#define FINSH_THREAD_STACK_SIZE 4096 #define FINSH_THREAD_STACK_SIZE 4096
#define FINSH_USING_HISTORY #define FINSH_USING_HISTORY
#define FINSH_HISTORY_LINES 5 #define FINSH_HISTORY_LINES 5
@ -105,7 +105,7 @@
#define RT_DFS_ELM_LFN_UNICODE 2 #define RT_DFS_ELM_LFN_UNICODE 2
#define RT_DFS_ELM_MAX_LFN 255 #define RT_DFS_ELM_MAX_LFN 255
#define RT_DFS_ELM_DRIVES 2 #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_USE_ERASE
#define RT_DFS_ELM_REENTRANT #define RT_DFS_ELM_REENTRANT
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 #define RT_DFS_ELM_MUTEX_TIMEOUT 3000

Write Preview
Loading…
Cancel
Save