wrh/chrg
1
0
Fork 0
forked from chrg/chrg
Code Pull Requests Activity

fix mdk prj

Browse Source
This commit is contained in:
wmano
2025-08-21 22:38:05 +08:00
parent f50be83bae
commit 0bd2a89669
4 changed files with 167 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/chrg/.config
+2 -21
View File
@@ -324,27 +324,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
# #
# Network # Network
# #
CONFIG_RT_USING_SAL=y # CONFIG_RT_USING_SAL is not set
CONFIG_SAL_INTERNET_CHECK=y # CONFIG_RT_USING_NETDEV is not set
#
# Docking with protocol stacks
#
# CONFIG_SAL_USING_LWIP is not set
# CONFIG_SAL_USING_AT is not set
# CONFIG_SAL_USING_TLS is not set
# end of Docking with protocol stacks
CONFIG_SAL_SOCKETS_NUM=16
CONFIG_RT_USING_NETDEV=y
CONFIG_NETDEV_USING_IFCONFIG=y
CONFIG_NETDEV_USING_PING=y
CONFIG_NETDEV_USING_NETSTAT=y
CONFIG_NETDEV_USING_AUTO_DEFAULT=y
# CONFIG_NETDEV_USING_LINK_STATUS_CALLBACK is not set
# CONFIG_NETDEV_USING_IPV6 is not set
CONFIG_NETDEV_IPV4=1
CONFIG_NETDEV_IPV6=0
# CONFIG_RT_USING_LWIP is not set # CONFIG_RT_USING_LWIP is not set
# CONFIG_RT_USING_AT is not set # CONFIG_RT_USING_AT is not set
# end of Network # end of Network
apps/chrg/project.uvprojx
+161 -187
View File
@@ -10,7 +10,6 @@
<TargetName>rt-thread</TargetName> <TargetName>rt-thread</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6> <uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
@@ -337,9 +336,9 @@
<v6Rtti>0</v6Rtti> <v6Rtti>0</v6Rtti>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>USE_HAL_DRIVER, STM32F405xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS, RT_USING_LIBC, RT_USING_ARMLIBC,USER_VECT_TAB_ADDRESS=0x08010000</Define> <Define>__RTTHREAD__, RT_USING_ARMLIBC, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, STM32F405xx, __STDC_LIMIT_MACROS, USER_VECT_TAB_ADDRESS=0x08010000</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\..\rt-thread\components\drivers\include;..\..\lib\cmsis-core\Include;board;..\..\rt-thread\components\finsh;..\..\rt-thread\components\net\netdev\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers;..\..\rt-thread\components\drivers\phy;..\..\rt-thread\libcpu\arm\common;..\..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;..\..\rt-thread\include;applications;..\..\rt-thread\components\libc\posix\io\poll;..\..\rt-thread\components\net\sal\include\socket\sys_socket;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\posix\ipc;..\..\lib\stm32f4\STM32F4_CMSIS\Include;..\..\lib\stm32f4\STM32F4_HAL\Inc\Legacy;..\..\lib\freemodbus\modbus\ascii;..\..\lib\freemodbus\modbus\rtu;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\compilers\common\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\..\rt-thread\components\drivers\smp_call;..\..\lib\freemodbus\port;..\..\lib\freemodbus\modbus\tcp;..\..\rt-thread\components\drivers\include;.;..\..\rt-thread\components\libc\posix\io\epoll;..\..\rt-thread\components\libc\posix\io\eventfd;..\..\rt-thread\components\net\sal\include;..\..\rt-thread\components\net\sal\include\socket;..\..\lib\freemodbus\modbus\include;..\..\rt-thread\libcpu\arm\cortex-m4;..\..\lib\stm32f4\STM32F4_HAL\Inc;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\compilers\common\extension;board\CubeMX_Config\Inc</IncludePath> <IncludePath>..\..\lib\freemodbus\port;..\..\rt-thread\components\libc\compilers\common\extension;board\CubeMX_Config\Inc;..\..\rt-thread\components\libc\posix\io\poll;..\..\rt-thread\libcpu\arm\cortex-m4;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers\config;..\..\rt-thread\components\libc\posix\io\epoll;..\..\lib\stm32f4\STM32F4_HAL\Inc\Legacy;..\..\lib\freemodbus\modbus\tcp;..\..\rt-thread\libcpu\arm\common;..\..\lib\stm32f4\STM32F4_CMSIS\Include;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\phy;..\..\rt-thread\include;..\..\lib\stm32f4\STM32F4_HAL\Inc;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers\drivers;..\..\rt-thread\components\finsh;..\..\lib\freemodbus\modbus\include;applications;board;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\compilers\common\include;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\drivers\smp_call;..\..\rt-thread\components\drivers\include;..\..\rt-thread\components\libc\posix\ipc;..\..\lib\freemodbus\modbus\rtu;..\..\rt-thread\components\libc\compilers\common\extension\fcntl\octal;..\..\lib\cmsis-core\Include;..\..\rt-thread\components\libc\posix\io\eventfd;..\..\rt-thread\components\drivers\include;..\..\rt-thread\bsp\stm32\libraries\HAL_Drivers;..\..\lib\freemodbus\modbus\ascii;.</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>
@@ -493,7 +492,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -549,7 +548,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -605,7 +604,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -661,7 +660,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -717,7 +716,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -773,7 +772,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -829,7 +828,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -885,7 +884,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -941,7 +940,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -997,7 +996,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1053,7 +1052,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1109,7 +1108,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_IPC_SOURCE__</Define> <Define>__RT_IPC_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1156,9 +1155,9 @@
<FilePath>..\..\rt-thread\components\finsh\shell.c</FilePath> <FilePath>..\..\rt-thread\components\finsh\shell.c</FilePath>
</File> </File>
<File> <File>
<FileName>msh.c</FileName> <FileName>msh_parse.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\rt-thread\components\finsh\msh.c</FilePath> <FilePath>..\..\rt-thread\components\finsh\msh_parse.c</FilePath>
</File> </File>
<File> <File>
<FileName>cmd.c</FileName> <FileName>cmd.c</FileName>
@@ -1166,9 +1165,9 @@
<FilePath>..\..\rt-thread\components\finsh\cmd.c</FilePath> <FilePath>..\..\rt-thread\components\finsh\cmd.c</FilePath>
</File> </File>
<File> <File>
<FileName>msh_parse.c</FileName> <FileName>msh.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\rt-thread\components\finsh\msh_parse.c</FilePath> <FilePath>..\..\rt-thread\components\finsh\msh.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
@@ -1176,14 +1175,24 @@
<GroupName>FreeModbus</GroupName> <GroupName>FreeModbus</GroupName>
<Files> <Files>
<File> <File>
<FileName>mbfuncholding.c</FileName> <FileName>user_mb_app.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncholding.c</FilePath> <FilePath>..\..\lib\freemodbus\port\user_mb_app.c</FilePath>
</File> </File>
<File> <File>
<FileName>mb_m.c</FileName> <FileName>mbfunccoils_m.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\mb_m.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\functions\mbfunccoils_m.c</FilePath>
</File>
<File>
<FileName>mbrtu_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\rtu\mbrtu_m.c</FilePath>
</File>
<File>
<FileName>mbfuncholding_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncholding_m.c</FilePath>
</File> </File>
<File> <File>
<FileName>sample_mb_master.c</FileName> <FileName>sample_mb_master.c</FileName>
@@ -1191,39 +1200,9 @@
<FilePath>..\..\lib\freemodbus\samples\sample_mb_master.c</FilePath> <FilePath>..\..\lib\freemodbus\samples\sample_mb_master.c</FilePath>
</File> </File>
<File> <File>
<FileName>user_mb_app_m.c</FileName> <FileName>portserial.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\user_mb_app_m.c</FilePath> <FilePath>..\..\lib\freemodbus\port\portserial.c</FilePath>
</File>
<File>
<FileName>mbrtu.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\rtu\mbrtu.c</FilePath>
</File>
<File>
<FileName>mbfuncinput_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncinput_m.c</FilePath>
</File>
<File>
<FileName>mbfunccoils.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfunccoils.c</FilePath>
</File>
<File>
<FileName>mbutils.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbutils.c</FilePath>
</File>
<File>
<FileName>mbcrc.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\rtu\mbcrc.c</FilePath>
</File>
<File>
<FileName>mbrtu_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\rtu\mbrtu_m.c</FilePath>
</File> </File>
<File> <File>
<FileName>sample_mb_slave.c</FileName> <FileName>sample_mb_slave.c</FileName>
@@ -1240,80 +1219,100 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\portserial_m.c</FilePath> <FilePath>..\..\lib\freemodbus\port\portserial_m.c</FilePath>
</File> </File>
<File>
<FileName>mb_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\mb_m.c</FilePath>
</File>
<File>
<FileName>portevent.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\portevent.c</FilePath>
</File>
<File>
<FileName>mbrtu.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\rtu\mbrtu.c</FilePath>
</File>
<File>
<FileName>mbfunccoils.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfunccoils.c</FilePath>
</File>
<File> <File>
<FileName>porttimer.c</FileName> <FileName>porttimer.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\porttimer.c</FilePath> <FilePath>..\..\lib\freemodbus\port\porttimer.c</FilePath>
</File> </File>
<File>
<FileName>portserial.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\portserial.c</FilePath>
</File>
<File> <File>
<FileName>mb.c</FileName> <FileName>mb.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\mb.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\mb.c</FilePath>
</File> </File>
<File> <File>
<FileName>porttimer_m.c</FileName> <FileName>port.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\porttimer_m.c</FilePath> <FilePath>..\..\lib\freemodbus\port\port.c</FilePath>
</File>
<File>
<FileName>mbfuncinput.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncinput.c</FilePath>
</File>
<File>
<FileName>mbfuncholding_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncholding_m.c</FilePath>
</File> </File>
<File> <File>
<FileName>mbfuncother.c</FileName> <FileName>mbfuncother.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncother.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncother.c</FilePath>
</File> </File>
<File>
<FileName>port.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\port.c</FilePath>
</File>
<File>
<FileName>mbfuncdisc_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdisc_m.c</FilePath>
</File>
<File>
<FileName>user_mb_app.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\user_mb_app.c</FilePath>
</File>
<File> <File>
<FileName>mbfuncdiag.c</FileName> <FileName>mbfuncdiag.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdiag.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdiag.c</FilePath>
</File> </File>
<File>
<FileName>mbfuncinput_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncinput_m.c</FilePath>
</File>
<File>
<FileName>user_mb_app_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\user_mb_app_m.c</FilePath>
</File>
<File>
<FileName>mbfuncinput.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncinput.c</FilePath>
</File>
<File> <File>
<FileName>portevent_m.c</FileName> <FileName>portevent_m.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\portevent_m.c</FilePath> <FilePath>..\..\lib\freemodbus\port\portevent_m.c</FilePath>
</File> </File>
<File>
<FileName>porttimer_m.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\porttimer_m.c</FilePath>
</File>
<File>
<FileName>mbutils.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbutils.c</FilePath>
</File>
<File>
<FileName>mbfuncholding.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncholding.c</FilePath>
</File>
<File> <File>
<FileName>mbfuncdisc.c</FileName> <FileName>mbfuncdisc.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdisc.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdisc.c</FilePath>
</File> </File>
<File> <File>
<FileName>mbfunccoils_m.c</FileName> <FileName>mbcrc.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\modbus\functions\mbfunccoils_m.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\rtu\mbcrc.c</FilePath>
</File> </File>
<File> <File>
<FileName>portevent.c</FileName> <FileName>mbfuncdisc_m.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\freemodbus\port\portevent.c</FilePath> <FilePath>..\..\lib\freemodbus\modbus\functions\mbfuncdisc_m.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
@@ -1370,7 +1369,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1426,7 +1425,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1482,7 +1481,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1538,7 +1537,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1594,7 +1593,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1650,7 +1649,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1706,7 +1705,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1762,7 +1761,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1818,7 +1817,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1874,7 +1873,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1930,7 +1929,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -1986,7 +1985,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -2042,7 +2041,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -2098,7 +2097,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -2154,7 +2153,7 @@
<MiscControls> </MiscControls> <MiscControls> </MiscControls>
<Define>__RT_KERNEL_SOURCE__</Define> <Define>__RT_KERNEL_SOURCE__</Define>
<Undefine> </Undefine> <Undefine> </Undefine>
<IncludePath></IncludePath> <IncludePath> </IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
</FileArmAds> </FileArmAds>
@@ -2165,20 +2164,15 @@
<Group> <Group>
<GroupName>klibc</GroupName> <GroupName>klibc</GroupName>
<Files> <Files>
<File>
<FileName>rt_vsscanf.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\src\klibc\rt_vsscanf.c</FilePath>
</File>
<File> <File>
<FileName>kstdio.c</FileName> <FileName>kstdio.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\rt-thread\src\klibc\kstdio.c</FilePath> <FilePath>..\..\rt-thread\src\klibc\kstdio.c</FilePath>
</File> </File>
<File> <File>
<FileName>kstring.c</FileName> <FileName>rt_vsscanf.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\rt-thread\src\klibc\kstring.c</FilePath> <FilePath>..\..\rt-thread\src\klibc\rt_vsscanf.c</FilePath>
</File> </File>
<File> <File>
<FileName>rt_vsnprintf_tiny.c</FileName> <FileName>rt_vsnprintf_tiny.c</FileName>
@@ -2190,6 +2184,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\rt-thread\src\klibc\kerrno.c</FilePath> <FilePath>..\..\rt-thread\src\klibc\kerrno.c</FilePath>
</File> </File>
<File>
<FileName>kstring.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\src\klibc\kstring.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@@ -2222,89 +2221,84 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>SAL</GroupName>
<Files>
<File>
<FileName>netdev.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\components\net\netdev\src\netdev.c</FilePath>
</File>
<File>
<FileName>netdev_ipaddr.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\components\net\netdev\src\netdev_ipaddr.c</FilePath>
</File>
<File>
<FileName>net_netdb.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\components\net\sal\socket\net_netdb.c</FilePath>
</File>
<File>
<FileName>sal_socket.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\rt-thread\components\net\sal\src\sal_socket.c</FilePath>
</File>
</Files>
</Group>
<Group> <Group>
<GroupName>STM32F4-CMSIS</GroupName> <GroupName>STM32F4-CMSIS</GroupName>
<Files> <Files>
<File>
<FileName>system_stm32f4xx.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\system_stm32f4xx.c</FilePath>
</File>
<File> <File>
<FileName>startup_stm32f405xx.s</FileName> <FileName>startup_stm32f405xx.s</FileName>
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\arm\startup_stm32f405xx.s</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\arm\startup_stm32f405xx.s</FilePath>
</File> </File>
<File>
<FileName>system_stm32f4xx.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_CMSIS\Source\Templates\system_stm32f4xx.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
<GroupName>STM32F4-HAL</GroupName> <GroupName>STM32F4-HAL</GroupName>
<Files> <Files>
<File>
<FileName>stm32f4xx_hal_pwr.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr.c</FilePath>
</File>
<File> <File>
<FileName>stm32f4xx_hal_crc.c</FileName> <FileName>stm32f4xx_hal_crc.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_crc.c</FilePath>
</File> </File>
<File>
<FileName>stm32f4xx_hal_rcc_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_dma_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma_ex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_cryp_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp_ex.c</FilePath>
</File>
<File> <File>
<FileName>stm32f4xx_hal_dma.c</FileName> <FileName>stm32f4xx_hal_dma.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma.c</FilePath>
</File> </File>
<File> <File>
<FileName>stm32f4xx_hal_rng.c</FileName> <FileName>stm32f4xx_hal_pwr_ex.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_pwr.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_uart.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_cortex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_cryp_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cryp_ex.c</FilePath>
</File> </File>
<File> <File>
<FileName>stm32f4xx_hal_gpio.c</FileName> <FileName>stm32f4xx_hal_gpio.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_gpio.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_gpio.c</FilePath>
</File> </File>
<File>
<FileName>stm32f4xx_hal.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_dma_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_dma_ex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_rcc_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc_ex.c</FilePath>
</File>
<File> <File>
<FileName>stm32f4xx_hal_cryp.c</FileName> <FileName>stm32f4xx_hal_cryp.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
@@ -2315,35 +2309,15 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cec.c</FilePath>
</File> </File>
<File>
<FileName>stm32f4xx_hal_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_usart.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_pwr_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_pwr_ex.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal.c</FilePath>
</File>
<File> <File>
<FileName>stm32f4xx_hal_rcc.c</FileName> <FileName>stm32f4xx_hal_rcc.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rcc.c</FilePath>
</File> </File>
<File> <File>
<FileName>stm32f4xx_hal_uart.c</FileName> <FileName>stm32f4xx_hal_rng.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_uart.c</FilePath> <FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_rng.c</FilePath>
</File>
<File>
<FileName>stm32f4xx_hal_cortex.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\lib\stm32f4\STM32F4_HAL\Src\stm32f4xx_hal_cortex.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
apps/chrg/rtconfig.h
-14
View File
@@ -179,20 +179,6 @@
/* Network */ /* Network */
#define RT_USING_SAL
#define SAL_INTERNET_CHECK
/* Docking with protocol stacks */
/* end of Docking with protocol stacks */
#define SAL_SOCKETS_NUM 16
#define RT_USING_NETDEV
#define NETDEV_USING_IFCONFIG
#define NETDEV_USING_PING
#define NETDEV_USING_NETSTAT
#define NETDEV_USING_AUTO_DEFAULT
#define NETDEV_IPV4 1
#define NETDEV_IPV6 0
/* end of Network */ /* end of Network */
/* Memory protection */ /* Memory protection */
apps/chrg/template.uvprojx
+4 -4
View File
@@ -274,8 +274,8 @@
</OCR_RVCT3> </OCR_RVCT3>
<OCR_RVCT4> <OCR_RVCT4>
<Type>1</Type> <Type>1</Type>
<StartAddress>0x8000000</StartAddress> <StartAddress>0x8010000</StartAddress>
<Size>0x100000</Size> <Size>0x40000</Size>
</OCR_RVCT4> </OCR_RVCT4>
<OCR_RVCT5> <OCR_RVCT5>
<Type>1</Type> <Type>1</Type>
@@ -336,7 +336,7 @@
<v6Rtti>0</v6Rtti> <v6Rtti>0</v6Rtti>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>STM32F405xx, USE_HAL_DRIVER</Define> <Define>STM32F405xx, USE_HAL_DRIVER, USER_VECT_TAB_ADDRESS=0x08010000</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;packages\led;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include</IncludePath> <IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;packages\led;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include</IncludePath>
</VariousControls> </VariousControls>
@@ -360,7 +360,7 @@
</VariousControls> </VariousControls>
</Aads> </Aads>
<LDads> <LDads>
<umfTarg>0</umfTarg> <umfTarg>1</umfTarg>
<Ropi>0</Ropi> <Ropi>0</Ropi>
<Rwpi>0</Rwpi> <Rwpi>0</Rwpi>
<noStLib>0</noStLib> <noStLib>0</noStLib>