diff options
| author | kurisaw <[email protected]> | 2025-03-19 10:51:59 +0800 |
|---|---|---|
| committer | Rbb666 <[email protected]> | 2025-03-19 11:43:01 +0800 |
| commit | c5f279c82c44e6058c77563e26ef2e339b715c0b (patch) | |
| tree | 627883cd4c3adb7a5396a4e17880614ffa267c76 /bsp/stm32/stm32f103-onenet-nbiot | |
| parent | 39f5df440e8abd8dacab7b602baa9896ad478953 (diff) | |
log: automatic update and deployment before version releasev5.2.0
Diffstat (limited to 'bsp/stm32/stm32f103-onenet-nbiot')
| -rw-r--r-- | bsp/stm32/stm32f103-onenet-nbiot/project.ewp | 140 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-onenet-nbiot/project.uvproj | 180 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx | 168 |
3 files changed, 337 insertions, 151 deletions
diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.ewp b/bsp/stm32/stm32f103-onenet-nbiot/project.ewp index 66bdd67fb2..f4b79fcbf9 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.ewp +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.ewp @@ -349,28 +349,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
+ <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1394,28 +1396,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
+ <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2150,7 +2154,13 @@ <name>$PROJ_DIR$\..\..\..\components\drivers\core\device.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_comm.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_up.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\condvar.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\dataqueue.c</name>
@@ -2171,10 +2181,10 @@ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\workqueue.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\pin\pin.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\pin\dev_pin.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\serial\dev_serial.c</name>
</file>
</group>
<group>
@@ -2201,16 +2211,16 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2222,19 +2232,19 @@ <name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\cpu_up.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\defunct.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
@@ -2265,6 +2275,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2285,46 +2313,52 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</name>
+ <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_rcc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj b/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj index 90cf0c51cb..953a60dad5 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.uvproj @@ -357,9 +357,9 @@ <useXO>0</useXO> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, STM32F103xE, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, RT_USING_LIBC, __RTTHREAD__, STM32F103xE, __CLK_TCK=RT_TICK_PER_SECOND, USE_HAL_DRIVER</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers\CMSIS\Include;board;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;.;..\..\..\components\drivers\include;board\CubeMX_Config\Inc;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;applications;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers\drivers\config;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\finsh;.;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\include;board;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\CMSIS\Include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\poll;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;applications;..\..\..\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -491,9 +491,47 @@ </Files> <Files> <File> - <FileName>completion.c</FileName> + <FileName>completion_comm.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\ipc\completion.c</FilePath> + <FilePath>..\..\..\components\drivers\ipc\completion_comm.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>completion_up.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\completion_up.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>condvar.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\condvar.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -624,9 +662,9 @@ </Files> <Files> <File> - <FileName>pin.c</FileName> + <FileName>dev_pin.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\pin\pin.c</FilePath> + <FilePath>..\..\..\components\drivers\pin\dev_pin.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -643,9 +681,9 @@ </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>dev_serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\dev_serial.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -710,30 +748,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> </Group> @@ -779,9 +817,9 @@ </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>cpu_up.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\src\cpu_up.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -798,9 +836,9 @@ </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>defunct.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\src\defunct.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -817,9 +855,9 @@ </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -836,9 +874,9 @@ </Files> <Files> <File> - <FileName>kstdio.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -855,9 +893,9 @@ </Files> <Files> <File> - <FileName>kstring.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -1045,6 +1083,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1086,93 +1162,93 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_rcc_ex.c</FileName> + <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cortex.c</FileName> + <FileName>stm32f1xx_hal_crc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio_ex.c</FileName> + <FileName>stm32f1xx_hal.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rcc.c</FileName> + <FileName>stm32f1xx_hal_cec.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pwr.c</FileName> + <FileName>stm32f1xx_hal_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_dma.c</FileName> + <FileName>stm32f1xx_hal_gpio_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_crc.c</FileName> + <FileName>stm32f1xx_hal_pwr.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_stm32f1xx.c</FileName> + <FileName>stm32f1xx_hal_rcc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_uart.c</FileName> + <FileName>stm32f1xx_hal_rcc_ex.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_rcc_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal.c</FileName> + <FileName>stm32f1xx_hal_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cec.c</FileName> + <FileName>stm32f1xx_hal_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_usart.c</FileName> + <FileName>system_stm32f1xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio.c</FileName> + <FileName>stm32f1xx_hal_cortex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> </File> </Files> </Group> diff --git a/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx b/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx index 0f8785717d..1a3b0b27f0 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx +++ b/bsp/stm32/stm32f103-onenet-nbiot/project.uvprojx @@ -360,9 +360,9 @@ <useXO>0</useXO> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, STM32F103xE, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>STM32F103xE, RT_USING_LIBC, __RTTHREAD__, USE_HAL_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers\CMSIS\Include;board;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;.;..\..\..\components\drivers\include;board\CubeMX_Config\Inc;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;applications;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\compilers\common\extension;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;board\CubeMX_Config\Inc;board;.;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\HAL_Drivers;applications;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\CMSIS\Include;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\ipc;..\..\..\include;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\eventfd;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\drivers\phy;..\..\..\components\finsh;..\..\..\components\drivers\include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -494,9 +494,47 @@ </Files> <Files> <File> - <FileName>completion.c</FileName> + <FileName>completion_comm.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\ipc\completion.c</FilePath> + <FilePath>..\..\..\components\drivers\ipc\completion_comm.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>completion_up.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\completion_up.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>condvar.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\condvar.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -627,9 +665,9 @@ </Files> <Files> <File> - <FileName>pin.c</FileName> + <FileName>dev_pin.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\pin\pin.c</FilePath> + <FilePath>..\..\..\components\drivers\pin\dev_pin.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -646,9 +684,9 @@ </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>dev_serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\dev_serial.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -720,23 +758,23 @@ </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> </Group> @@ -782,9 +820,9 @@ </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>cpu_up.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\src\cpu_up.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -801,9 +839,9 @@ </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>defunct.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\src\defunct.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -820,9 +858,9 @@ </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -839,9 +877,9 @@ </Files> <Files> <File> - <FileName>kstdio.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -858,9 +896,9 @@ </Files> <Files> <File> - <FileName>kstring.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -1048,6 +1086,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1089,51 +1165,51 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_rcc_ex.c</FileName> + <FileName>stm32f1xx_hal_rcc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cortex.c</FileName> + <FileName>stm32f1xx_hal_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio_ex.c</FileName> + <FileName>stm32f1xx_hal_rcc_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rcc.c</FileName> + <FileName>stm32f1xx_hal_cortex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pwr.c</FileName> + <FileName>stm32f1xx_hal_crc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_dma.c</FileName> + <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_crc.c</FileName> + <FileName>stm32f1xx_hal_pwr.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> </File> </Files> <Files> @@ -1145,23 +1221,23 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_uart.c</FileName> + <FileName>stm32f1xx_hal.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.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal.c</FileName> + <FileName>stm32f1xx_hal_gpio_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cec.c</FileName> + <FileName>stm32f1xx_hal_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> </File> </Files> <Files> @@ -1173,9 +1249,9 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio.c</FileName> + <FileName>stm32f1xx_hal_cec.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> </File> </Files> </Group> |