From a22d9c106276bb1819e583012d7ea41b6529b318 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Wed, 16 May 2018 08:14:05 +0800 Subject: [PATCH] add new LED key systick sample code --- src/bare_test/2.Key/stm32v5_key.uvopt | 242 +++++++++++++++++++++--------------------------- 1 files changed, 106 insertions(+), 136 deletions(-) diff --git a/src/bare_test/stm32_systick/stm32_systick.uvopt b/src/bare_test/2.Key/stm32v5_key.uvopt similarity index 80% copy from src/bare_test/stm32_systick/stm32_systick.uvopt copy to src/bare_test/2.Key/stm32v5_key.uvopt index 9528b52..bf91f64 100644 --- a/src/bare_test/stm32_systick/stm32_systick.uvopt +++ b/src/bare_test/2.Key/stm32v5_key.uvopt @@ -21,7 +21,7 @@ </DaveTm> <Target> - <TargetName>stm32_systick</TargetName> + <TargetName>stm32v5_key</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> @@ -43,7 +43,7 @@ <PageWidth>79</PageWidth> <PageLength>66</PageLength> <TabStop>8</TabStop> - <ListingPath>.\output\</ListingPath> + <ListingPath>.\</ListingPath> </OPTLEX> <ListingPage> <CreateCListing>1</CreateCListing> @@ -128,8 +128,13 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>SigUV3Arm</Key> + <Name></Name> + </SetRegEntry> + <SetRegEntry> + <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20080643 -O14 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000</Name> + <Name>-U1350709590 -O14 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(3BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06414041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -171,7 +176,7 @@ <Group> <GroupName>cmsis</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <File> @@ -194,35 +199,35 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>4</ColumnNumber> - <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>173</TopLine> - <CurrentLine>174</CurrentLine> - <bDave2>0</bDave2> - <PathWithFileName>.\cmsis\system_stm32f10x.c</PathWithFileName> - <FilenameWithoutPath>system_stm32f10x.c</FilenameWithoutPath> - </File> - </Group> - - <Group> - <GroupName>fwlib</GroupName> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <File> - <GroupNumber>2</GroupNumber> - <FileNumber>3</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\misc.c</PathWithFileName> - <FilenameWithoutPath>misc.c</FilenameWithoutPath> + <PathWithFileName>.\cmsis\system_stm32f10x.c</PathWithFileName> + <FilenameWithoutPath>system_stm32f10x.c</FilenameWithoutPath> </File> + <File> + <GroupNumber>1</GroupNumber> + <FileNumber>3</FileNumber> + <FileType>2</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>24</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>1</TopLine> + <CurrentLine>2</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>.\cmsis\startup_stm32f10x_hd.s</PathWithFileName> + <FilenameWithoutPath>startup_stm32f10x_hd.s</FilenameWithoutPath> + </File> + </Group> + + <Group> + <GroupName>stdlib</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> <File> <GroupNumber>2</GroupNumber> <FileNumber>4</FileNumber> @@ -234,8 +239,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_adc.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_adc.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\misc.c</PathWithFileName> + <FilenameWithoutPath>misc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -248,8 +253,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_bkp.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_bkp.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_adc.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_adc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -262,8 +267,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_can.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_can.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_bkp.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_bkp.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -276,8 +281,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_cec.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_cec.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_can.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_can.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -290,8 +295,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_crc.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_crc.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_cec.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_cec.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -304,8 +309,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_dac.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_dac.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_crc.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_crc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -318,8 +323,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_dbgmcu.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_dbgmcu.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_dac.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_dac.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -332,8 +337,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_dma.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_dma.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_dbgmcu.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_dbgmcu.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -346,8 +351,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_exti.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_exti.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_dma.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_dma.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -360,8 +365,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_flash.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_flash.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_exti.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_exti.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -374,8 +379,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_fsmc.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_fsmc.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_flash.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_flash.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -388,8 +393,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_gpio.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_gpio.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_fsmc.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_fsmc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -397,13 +402,13 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>34</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>271</TopLine> + <CurrentLine>295</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_i2c.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_i2c.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_gpio.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_gpio.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -416,8 +421,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_iwdg.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_iwdg.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_i2c.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_i2c.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -430,8 +435,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_pwr.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_pwr.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_iwdg.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_iwdg.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -444,8 +449,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_rcc.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_rcc.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_pwr.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_pwr.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -458,8 +463,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_rtc.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_rtc.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_rcc.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_rcc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -472,8 +477,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_sdio.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_sdio.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_rtc.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_rtc.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -486,8 +491,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_spi.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_spi.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_sdio.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_sdio.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -500,8 +505,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_tim.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_tim.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_spi.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_spi.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -514,8 +519,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_usart.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_usart.c</FilenameWithoutPath> + <PathWithFileName>.\stdlib\src\stm32f10x_tim.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_tim.c</FilenameWithoutPath> </File> <File> <GroupNumber>2</GroupNumber> @@ -528,43 +533,43 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\fwlib\src\stm32f10x_wwdg.c</PathWithFileName> + <PathWithFileName>.\stdlib\src\stm32f10x_usart.c</PathWithFileName> + <FilenameWithoutPath>stm32f10x_usart.c</FilenameWithoutPath> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>26</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>0</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>.\stdlib\src\stm32f10x_wwdg.c</PathWithFileName> <FilenameWithoutPath>stm32f10x_wwdg.c</FilenameWithoutPath> </File> </Group> <Group> - <GroupName>board</GroupName> - <tvExp>0</tvExp> + <GroupName>user</GroupName> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <File> <GroupNumber>3</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>47</ColumnNumber> - <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>7</TopLine> - <CurrentLine>8</CurrentLine> - <bDave2>0</bDave2> - <PathWithFileName>.\board\stm32v5_uart.c</PathWithFileName> - <FilenameWithoutPath>stm32v5_uart.c</FilenameWithoutPath> - </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>27</FileNumber> - <FileType>2</FileType> - <tvExp>0</tvExp> - <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>21</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>1</TopLine> - <CurrentLine>1</CurrentLine> + <CurrentLine>28</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\board\startup_stm32f10x_hd.s</PathWithFileName> - <FilenameWithoutPath>startup_stm32f10x_hd.s</FilenameWithoutPath> + <PathWithFileName>.\user\main.c</PathWithFileName> + <FilenameWithoutPath>main.c</FilenameWithoutPath> </File> <File> <GroupNumber>3</GroupNumber> @@ -574,10 +579,10 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>2</TopLine> + <CurrentLine>22</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\board\stm32v5_led.c</PathWithFileName> + <PathWithFileName>.\user\stm32v5_led.c</PathWithFileName> <FilenameWithoutPath>stm32v5_led.c</FilenameWithoutPath> </File> <File> @@ -586,48 +591,13 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>23</ColumnNumber> + <ColumnNumber>1</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>136</TopLine> - <CurrentLine>137</CurrentLine> - <bDave2>0</bDave2> - <PathWithFileName>.\board\stm32f10x_it.c</PathWithFileName> - <FilenameWithoutPath>stm32f10x_it.c</FilenameWithoutPath> - </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>30</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> - <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>31</TopLine> + <TopLine>1</TopLine> <CurrentLine>33</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>.\board\stm32v5_systick.c</PathWithFileName> - <FilenameWithoutPath>stm32v5_systick.c</FilenameWithoutPath> - </File> - </Group> - - <Group> - <GroupName>main</GroupName> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <File> - <GroupNumber>4</GroupNumber> - <FileNumber>31</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <Focus>0</Focus> - <ColumnNumber>2</ColumnNumber> - <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>41</TopLine> - <CurrentLine>52</CurrentLine> - <bDave2>0</bDave2> - <PathWithFileName>.\main\main.c</PathWithFileName> - <FilenameWithoutPath>main.c</FilenameWithoutPath> + <PathWithFileName>.\user\stm32v5_key.c</PathWithFileName> + <FilenameWithoutPath>stm32v5_key.c</FilenameWithoutPath> </File> </Group> -- Gitblit v1.9.1