diff options
| author | yangjie <[email protected]> | 2020-12-28 15:02:17 +0800 |
|---|---|---|
| committer | yangjie <[email protected]> | 2020-12-28 15:02:17 +0800 |
| commit | dc09f3760fdd2ae2bbabcf79a0dfd7797d580f42 (patch) | |
| tree | 16b5710bb92c006378ec450a5df25f1026fe1ce7 /bsp/stm32/stm32f103-atk-nano | |
| parent | eeaf1fcc50a9a6d25bebcc531db8e03baafaded3 (diff) | |
更新 stm32 工程,nxp 工程
Diffstat (limited to 'bsp/stm32/stm32f103-atk-nano')
| -rw-r--r-- | bsp/stm32/stm32f103-atk-nano/project.ewp | 107 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-atk-nano/project.uvproj | 528 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-atk-nano/project.uvprojx | 188 |
3 files changed, 225 insertions, 598 deletions
diff --git a/bsp/stm32/stm32f103-atk-nano/project.ewp b/bsp/stm32/stm32f103-atk-nano/project.ewp index 39bb6acf30..6b5922c663 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.ewp +++ b/bsp/stm32/stm32f103-atk-nano/project.ewp @@ -216,6 +216,7 @@ <name>CCDefines</name>
<state />
<state>STM32F103xB</state>
+ <state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state>
</option>
<option>
@@ -354,7 +355,6 @@ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
@@ -1248,6 +1248,7 @@ <name>CCDefines</name>
<state />
<state>STM32F103xB</state>
+ <state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state>
</option>
<option>
@@ -1386,7 +1387,6 @@ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
@@ -2065,60 +2065,57 @@ </settings>
</configuration>
<group>
- <name>Kernel</name>
- <file>
- <name>$PROJ_DIR$\..\..\..\src\clock.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\src\components.c</name>
- </file>
+ <name>Applications</name>
<file>
- <name>$PROJ_DIR$\..\..\..\src\cpu.c</name>
+ <name>$PROJ_DIR$\applications\main.c</name>
</file>
+ </group>
+ <group>
+ <name>CPU</name>
<file>
- <name>$PROJ_DIR$\..\..\..\src\device.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
</file>
+ </group>
+ <group>
+ <name>DeviceDrivers</name>
<file>
- <name>$PROJ_DIR$\..\..\..\src\mem.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\misc\pin.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\completion.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\object.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\scheduler.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\pipe.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\signal.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\thread.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\timer.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
</file>
- </group>
- <group>
- <name>Applications</name>
<file>
- <name>$PROJ_DIR$\applications\main.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c</name>
</file>
</group>
<group>
@@ -2143,70 +2140,67 @@ </file>
</group>
<group>
- <name>cpu</name>
+ <name>finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
+ </group>
+ <group>
+ <name>Kernel</name>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\clock.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S</name>
+ <name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file>
- </group>
- <group>
- <name>DeviceDrivers</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\misc\pin.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\device.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\completion.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\pipe.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\mem.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\object.c</name>
</file>
- </group>
- <group>
- <name>finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\scheduler.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\signal.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\thread.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\timer.c</name>
</file>
</group>
<group>
- <name>libc</name>
- </group>
- <group>
- <name>STM32_HAL</name>
+ <name>Libraries</name>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
</file>
@@ -2235,9 +2229,6 @@ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
</file>
<file>
diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvproj b/bsp/stm32/stm32f103-atk-nano/project.uvproj index ed2dc9eed7..70a290814d 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvproj +++ b/bsp/stm32/stm32f103-atk-nano/project.uvproj @@ -357,9 +357,9 @@ <useXO>0</useXO> <VariousControls> <MiscControls /> - <Define>STM32F103xB, USE_HAL_DRIVER</Define> + <Define>STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__</Define> <Undefine /> - <IncludePath>applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\include;..\..\..\libcpu\arm\cortex-m3;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath> + <IncludePath>applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath> </VariousControls> </Cads> <Aads> @@ -392,7 +392,7 @@ <ScatterFile>.\board\linker_scripts\link.sct</ScatterFile> <IncludeLibs /> <IncludeLibsPath /> - <Misc> --keep *.o(.rti_fn.*) --keep *.o(FSymTab)</Misc> + <Misc /> <LinkerInputFile /> <DisabledWarnings /> </LDads> @@ -410,167 +410,28 @@ </Files> </Group> <Group> - <GroupName>Drivers</GroupName> - <Files> - <File> - <FileName>board.c</FileName> - <FileType>1</FileType> - <FilePath>board\board.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_msp.c</FileName> - <FileType>1</FileType> - <FilePath>board\CubeMX_Config\Src\stm32f1xx_hal_msp.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>startup_stm32f103xb.s</FileName> - <FileType>2</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>drv_gpio.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\HAL_Drivers\drv_gpio.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>drv_usart.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\HAL_Drivers\drv_usart.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>drv_common.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\HAL_Drivers\drv_common.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>Kernel</GroupName> - <Files> - <File> - <FileName>clock.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\clock.c</FilePath> - </File> - </Files> + <GroupName>CPU</GroupName> <Files> <File> - <FileName>components.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\components.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>cpu.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\cpu.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>device.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\device.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>idle.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>ipc.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>irq.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>kservice.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\kservice.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>mem.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\mem.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>memheap.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\memheap.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>mempool.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\mempool.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>object.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\object.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>scheduler.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\scheduler.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>signal.c</FileName> + <FileName>backtrace.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\signal.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath> </File> </Files> <Files> <File> - <FileName>thread.c</FileName> + <FileName>div0.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\thread.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> </File> </Files> <Files> <File> - <FileName>timer.c</FileName> + <FileName>showmem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\timer.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> </File> </Files> - </Group> - <Group> - <GroupName>CORTEX-M3</GroupName> <Files> <File> <FileName>cpuport.c</FileName> @@ -585,27 +446,6 @@ <FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath> </File> </Files> - <Files> - <File> - <FileName>backtrace.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>div0.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>showmem.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> - </File> - </Files> </Group> <Group> <GroupName>DeviceDrivers</GroupName> @@ -674,232 +514,231 @@ </Files> </Group> <Group> - <GroupName>finsh</GroupName> + <GroupName>Drivers</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>board.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>board\board.c</FilePath> </File> </Files> <Files> <File> - <FileName>symbol.c</FileName> + <FileName>stm32f1xx_hal_msp.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\symbol.c</FilePath> + <FilePath>board\CubeMX_Config\Src\stm32f1xx_hal_msp.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FileName>startup_stm32f103xb.s</FileName> + <FileType>2</FileType> + <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>drv_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\libraries\HAL_Drivers\drv_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_cmd.c</FileName> + <FileName>drv_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_cmd.c</FilePath> + <FilePath>..\libraries\HAL_Drivers\drv_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_file.c</FileName> + <FileName>drv_common.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_file.c</FilePath> + <FilePath>..\libraries\HAL_Drivers\drv_common.c</FilePath> </File> </Files> </Group> <Group> - <GroupName>STM32_HAL</GroupName> - <Files> - <File> - <FileName>system_stm32f1xx.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> - </File> - </Files> + <GroupName>finsh</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_adc.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_adc_ex.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> + </Group> + <Group> + <GroupName>Kernel</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_gpio_ex.c</FileName> + <FileName>clock.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> + <FilePath>..\..\..\src\clock.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_flash.c</FileName> + <FileName>components.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c</FilePath> + <FilePath>..\..\..\src\components.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_flash_ex.c</FileName> + <FileName>device.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c</FilePath> + <FilePath>..\..\..\src\device.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_dma.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cortex.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_crc.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_i2c.c</FileName> + <FileName>kservice.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c</FilePath> + <FilePath>..\..\..\src\kservice.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_irda.c</FileName> + <FileName>mem.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_irda.c</FilePath> + <FilePath>..\..\..\src\mem.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_iwdg.c</FileName> + <FileName>memheap.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_iwdg.c</FilePath> + <FilePath>..\..\..\src\memheap.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pwr.c</FileName> + <FileName>mempool.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> + <FilePath>..\..\..\src\mempool.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rcc.c</FileName> + <FileName>object.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> + <FilePath>..\..\..\src\object.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rcc_ex.c</FileName> + <FileName>scheduler.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> + <FilePath>..\..\..\src\scheduler.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rtc.c</FileName> + <FileName>signal.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc.c</FilePath> + <FilePath>..\..\..\src\signal.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rtc_ex.c</FileName> + <FileName>thread.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc_ex.c</FilePath> + <FilePath>..\..\..\src\thread.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_smartcard.c</FileName> + <FileName>timer.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_smartcard.c</FilePath> + <FilePath>..\..\..\src\timer.c</FilePath> </File> </Files> + </Group> + <Group> + <GroupName>Libraries</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_spi.c</FileName> + <FileName>system_stm32f1xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_spi_ex.c</FileName> + <FileName>stm32f1xx_hal_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_tim.c</FileName> + <FileName>stm32f1xx_hal_cortex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_tim_ex.c</FileName> + <FileName>stm32f1xx_hal_crc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_uart.c</FileName> + <FileName>stm32f1xx_hal_pwr.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_usart.c</FileName> + <FileName>stm32f1xx_hal_rcc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_wwdg.c</FileName> + <FileName>stm32f1xx_hal_rcc_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_wwdg.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> </File> </Files> <Files> @@ -911,125 +750,6 @@ </Files> <Files> <File> - <FileName>stm32f1xx_ll_adc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_adc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_crc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_crc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_dac.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dac.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_dma.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dma.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_exti.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_exti.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_fsmc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_fsmc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_gpio.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_gpio.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_i2c.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_i2c.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_pwr.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_pwr.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_rcc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rcc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_rtc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rtc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_sdmmc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_sdmmc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_spi.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_spi.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_tim.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_tim.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_usart.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usart.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_usb.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usb.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_ll_utils.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_utils.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>stm32f1xx_hal_cec.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> @@ -1037,100 +757,30 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_can.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_can.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_dac.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dac.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_dac_ex.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dac_ex.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_eth.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_eth.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_hcd.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_hcd.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_i2s.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2s.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_mmc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_mmc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_sd.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sd.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_nand.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_nand.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_pccard.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pccard.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_nor.c</FileName> + <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_nor.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_sram.c</FileName> + <FileName>stm32f1xx_hal_gpio_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pcd.c</FileName> + <FileName>stm32f1xx_hal_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pcd_ex.c</FileName> + <FileName>stm32f1xx_hal_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> </File> </Files> </Group> diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvprojx b/bsp/stm32/stm32f103-atk-nano/project.uvprojx index 69ef3153a5..33fe4fca76 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvprojx +++ b/bsp/stm32/stm32f103-atk-nano/project.uvprojx @@ -332,9 +332,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>STM32F103xB, USE_HAL_DRIVER</Define> + <Define>STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__</Define> <Undefine /> - <IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath> + <IncludePath>applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath> </VariousControls> </Cads> <Aads> @@ -376,127 +376,116 @@ </TargetOption> <Groups> <Group> - <GroupName>Kernel</GroupName> - <Files> - <File> - <FileName>clock.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\clock.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>components.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\components.c</FilePath> - </File> - </Files> + <GroupName>Applications</GroupName> <Files> <File> - <FileName>cpu.c</FileName> + <FileName>main.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\cpu.c</FilePath> + <FilePath>applications\main.c</FilePath> </File> </Files> + </Group> + <Group> + <GroupName>CPU</GroupName> <Files> <File> - <FileName>device.c</FileName> + <FileName>backtrace.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\device.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath> </File> </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>div0.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> </File> </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>showmem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> </File> </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>cpuport.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath> </File> </Files> <Files> <File> - <FileName>kservice.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\src\kservice.c</FilePath> + <FileName>context_rvds.S</FileName> + <FileType>2</FileType> + <FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath> </File> </Files> + </Group> + <Group> + <GroupName>DeviceDrivers</GroupName> <Files> <File> - <FileName>mem.c</FileName> + <FileName>pin.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\mem.c</FilePath> + <FilePath>..\..\..\components\drivers\misc\pin.c</FilePath> </File> </Files> <Files> <File> - <FileName>memheap.c</FileName> + <FileName>serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\memheap.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> </File> </Files> <Files> <File> - <FileName>mempool.c</FileName> + <FileName>completion.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\mempool.c</FilePath> + <FilePath>..\..\..\components\drivers\src\completion.c</FilePath> </File> </Files> <Files> <File> - <FileName>object.c</FileName> + <FileName>dataqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\object.c</FilePath> + <FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath> </File> </Files> <Files> <File> - <FileName>scheduler.c</FileName> + <FileName>pipe.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\scheduler.c</FilePath> + <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath> </File> </Files> <Files> <File> - <FileName>signal.c</FileName> + <FileName>ringblk_buf.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\signal.c</FilePath> + <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath> </File> </Files> <Files> <File> - <FileName>thread.c</FileName> + <FileName>ringbuffer.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\thread.c</FilePath> + <FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath> </File> </Files> <Files> <File> - <FileName>timer.c</FileName> + <FileName>waitqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\timer.c</FilePath> + <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath> </File> </Files> - </Group> - <Group> - <GroupName>Applications</GroupName> <Files> <File> - <FileName>main.c</FileName> + <FileName>workqueue.c</FileName> <FileType>1</FileType> - <FilePath>applications\main.c</FilePath> + <FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath> </File> </Files> </Group> @@ -546,135 +535,139 @@ </Files> </Group> <Group> - <GroupName>cpu</GroupName> + <GroupName>finsh</GroupName> <Files> <File> - <FileName>backtrace.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> <Files> <File> - <FileName>div0.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>showmem.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> + </Group> + <Group> + <GroupName>Kernel</GroupName> <Files> <File> - <FileName>cpuport.c</FileName> + <FileName>clock.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath> + <FilePath>..\..\..\src\clock.c</FilePath> </File> </Files> <Files> <File> - <FileName>context_rvds.S</FileName> - <FileType>2</FileType> - <FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath> + <FileName>components.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\components.c</FilePath> </File> </Files> - </Group> - <Group> - <GroupName>DeviceDrivers</GroupName> <Files> <File> - <FileName>pin.c</FileName> + <FileName>device.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\misc\pin.c</FilePath> + <FilePath>..\..\..\src\device.c</FilePath> </File> </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> </File> </Files> <Files> <File> - <FileName>completion.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\completion.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> </File> </Files> <Files> <File> - <FileName>dataqueue.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> </File> </Files> <Files> <File> - <FileName>pipe.c</FileName> + <FileName>kservice.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath> + <FilePath>..\..\..\src\kservice.c</FilePath> </File> </Files> <Files> <File> - <FileName>ringblk_buf.c</FileName> + <FileName>mem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath> + <FilePath>..\..\..\src\mem.c</FilePath> </File> </Files> <Files> <File> - <FileName>ringbuffer.c</FileName> + <FileName>memheap.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath> + <FilePath>..\..\..\src\memheap.c</FilePath> </File> </Files> <Files> <File> - <FileName>waitqueue.c</FileName> + <FileName>mempool.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath> + <FilePath>..\..\..\src\mempool.c</FilePath> </File> </Files> <Files> <File> - <FileName>workqueue.c</FileName> + <FileName>object.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath> + <FilePath>..\..\..\src\object.c</FilePath> </File> </Files> - </Group> - <Group> - <GroupName>finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>scheduler.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\src\scheduler.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>signal.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\src\signal.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>thread.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\src\thread.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>timer.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\timer.c</FilePath> </File> </Files> </Group> <Group> - <GroupName>STM32_HAL</GroupName> + <GroupName>Libraries</GroupName> <Files> <File> <FileName>system_stm32f1xx.c</FileName> @@ -740,13 +733,6 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_sram.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> |
