fix: 统一R8工程目标并修复MDK编译前置问题

This commit is contained in:
2026-03-30 13:14:37 +08:00
parent 4996b451d9
commit 7ee96bc08d
17 changed files with 555 additions and 26 deletions
+277 -3
View File
@@ -340,7 +340,7 @@
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER,STM32F103xB</Define>
<Undefine></Undefine>
<IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM3</IncludePath>
<IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM3;..\Drivers\CH390;..\Drivers\LwIP\src\include;..\Drivers\LwIP\src\include\lwip;..\Drivers\LwIP\src\include\netif;..\Drivers\LwIP\src\include\arch;..\Drivers\LwIP\port;..\App</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -385,9 +385,9 @@
<GroupName>Application/MDK-ARM</GroupName>
<Files>
<File>
<FileName>startup_stm32f103xe.s</FileName>
<FileName>startup_stm32f103xb.s</FileName>
<FileType>2</FileType>
<FilePath>startup_stm32f103xe.s</FilePath>
<FilePath>startup_stm32f103xb.s</FilePath>
</File>
</Files>
</Group>
@@ -1211,6 +1211,271 @@
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers/CH390</GroupName>
<Files>
<File>
<FileName>CH390.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\CH390\CH390.c</FilePath>
</File>
<File>
<FileName>CH390_Interface.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\CH390\CH390_Interface.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers/LwIP/core</GroupName>
<Files>
<File>
<FileName>altcp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\altcp.c</FilePath>
</File>
<File>
<FileName>altcp_alloc.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\altcp_alloc.c</FilePath>
</File>
<File>
<FileName>altcp_tcp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\altcp_tcp.c</FilePath>
</File>
<File>
<FileName>def.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\def.c</FilePath>
</File>
<File>
<FileName>dns.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\dns.c</FilePath>
</File>
<File>
<FileName>inet_chksum.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\inet_chksum.c</FilePath>
</File>
<File>
<FileName>init.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\init.c</FilePath>
</File>
<File>
<FileName>ip.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ip.c</FilePath>
</File>
<File>
<FileName>mem.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\mem.c</FilePath>
</File>
<File>
<FileName>memp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\memp.c</FilePath>
</File>
<File>
<FileName>netif.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\netif.c</FilePath>
</File>
<File>
<FileName>pbuf.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\pbuf.c</FilePath>
</File>
<File>
<FileName>raw.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\raw.c</FilePath>
</File>
<File>
<FileName>stats.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\stats.c</FilePath>
</File>
<File>
<FileName>sys.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\sys.c</FilePath>
</File>
<File>
<FileName>tcp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\tcp.c</FilePath>
</File>
<File>
<FileName>tcp_in.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\tcp_in.c</FilePath>
</File>
<File>
<FileName>tcp_out.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\tcp_out.c</FilePath>
</File>
<File>
<FileName>timeouts.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\timeouts.c</FilePath>
</File>
<File>
<FileName>udp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\udp.c</FilePath>
</File>
<File>
<FileName>acd.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\acd.c</FilePath>
</File>
<File>
<FileName>autoip.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\autoip.c</FilePath>
</File>
<File>
<FileName>dhcp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\dhcp.c</FilePath>
</File>
<File>
<FileName>etharp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\etharp.c</FilePath>
</File>
<File>
<FileName>icmp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\icmp.c</FilePath>
</File>
<File>
<FileName>igmp.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\igmp.c</FilePath>
</File>
<File>
<FileName>ip4.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\ip4.c</FilePath>
</File>
<File>
<FileName>ip4_addr.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\ip4_addr.c</FilePath>
</File>
<File>
<FileName>ip4_frag.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\core\ipv4\ip4_frag.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers/LwIP/api</GroupName>
<Files>
<File>
<FileName>api_lib.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\api_lib.c</FilePath>
</File>
<File>
<FileName>api_msg.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\api_msg.c</FilePath>
</File>
<File>
<FileName>err.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\err.c</FilePath>
</File>
<File>
<FileName>if_api.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\if_api.c</FilePath>
</File>
<File>
<FileName>netbuf.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\netbuf.c</FilePath>
</File>
<File>
<FileName>netdb.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\netdb.c</FilePath>
</File>
<File>
<FileName>netifapi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\netifapi.c</FilePath>
</File>
<File>
<FileName>sockets.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\sockets.c</FilePath>
</File>
<File>
<FileName>tcpip.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\api\tcpip.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers/LwIP/netif</GroupName>
<Files>
<File>
<FileName>ethernetif.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\src\netif\ethernetif.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers/LwIP/port</GroupName>
<Files>
<File>
<FileName>sys_arch.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\LwIP\port\sys_arch.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>APP</GroupName>
<Files>
<File>
<FileName>config.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\config.c</FilePath>
</File>
<File>
<FileName>flash_param.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\flash_param.c</FilePath>
</File>
<File>
<FileName>tcp_client.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\tcp_client.c</FilePath>
</File>
<File>
<FileName>tcp_server.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\tcp_server.c</FilePath>
</File>
<File>
<FileName>uart_trans.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\uart_trans.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
</Group>
@@ -1231,4 +1496,13 @@
<files/>
</RTE>
<LayerInfo>
<Layers>
<Layer>
<LayName>TCP2UART</LayName>
<LayPrjMark>1</LayPrjMark>
</Layer>
</Layers>
</LayerInfo>
</Project>
+2 -2
View File
@@ -29,7 +29,7 @@
; <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
; </h>
Stack_Size EQU 0x800
Stack_Size EQU 0x400
AREA STACK, NOINIT, READWRITE, ALIGN=3
Stack_Mem SPACE Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
; </h>
Heap_Size EQU 0x1000
Heap_Size EQU 0x0
AREA HEAP, NOINIT, READWRITE, ALIGN=3
__heap_base
+2 -2
View File
@@ -29,7 +29,7 @@
; <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
; </h>
Stack_Size EQU 0x800
Stack_Size EQU 0x400
AREA STACK, NOINIT, READWRITE, ALIGN=3
Stack_Mem SPACE Stack_Size
@@ -39,7 +39,7 @@ __initial_sp
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
; </h>
Heap_Size EQU 0x2800
Heap_Size EQU 0x0
AREA HEAP, NOINIT, READWRITE, ALIGN=3
__heap_base