From e8e11e82bd02e63ebc167b69fc3e585a99d78276 Mon Sep 17 00:00:00 2001
From: guanjiao ren <guanjiao.ren@ninebot.com>
Date: 星期五, 18 五月 2018 23:10:57 +0800
Subject: [PATCH] 蜂鸣器、led、spi、systick调试完成
---
源码/核心板/MDK-ARM/Project.uvprojx | 210 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 138 insertions(+), 72 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
index 395a9fa..237059f 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
@@ -10,6 +10,7 @@
<TargetName>STM32100E-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F100ZE</Device>
@@ -551,32 +552,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -586,6 +597,7 @@
<TargetName>STM3210E-EVAL_XL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZG</Device>
@@ -1127,32 +1139,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -1162,6 +1184,7 @@
<TargetName>STM32100B-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F102CB</Device>
@@ -1703,32 +1726,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -1738,6 +1771,7 @@
<TargetName>STM3210C-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F107VC</Device>
@@ -2279,32 +2313,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -2314,6 +2358,7 @@
<TargetName>STM3210E-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZE</Device>
@@ -2855,32 +2900,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -2891,6 +2946,7 @@
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103T8</Device>
@@ -2931,7 +2987,7 @@
<OutputName>UWB_Projects</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
- <CreateHexFile>1</CreateHexFile>
+ <CreateHexFile>0</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\Listings\</ListingPath>
@@ -3015,7 +3071,7 @@
<Capability>1</Capability>
<DriverSelection>4096</DriverSelection>
</Flash1>
- <bUseTDR>0</bUseTDR>
+ <bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3>"" ()</Flash3>
<Flash4></Flash4>
@@ -3204,8 +3260,8 @@
<uSurpInc>0</uSurpInc>
<uC99>1</uC99>
<useXO>0</useXO>
- <v6Lang>1</v6Lang>
- <v6LangP>1</v6LangP>
+ <v6Lang>3</v6Lang>
+ <v6LangP>3</v6LangP>
<vShortEn>1</vShortEn>
<vShortWch>1</vShortWch>
<v6Lto>0</v6Lto>
@@ -3213,9 +3269,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
- <Define>USE_STDPERIPH_DRIVER, STM32F10X_MD</Define>
+ <Define>USE_STDPERIPH_DRIVER,__CC_ARM</Define>
<Undefine></Undefine>
- <IncludePath>..\Src\Libraries\CMSIS\CM3\CoreSupport;..\Src\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x;..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc;..\Src\decadriver;..\Src\platform</IncludePath>
+ <IncludePath>..\Src\Libraries\CMSIS\CM3\CoreSupport;..\Src\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x;..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc;..\Src\decadriver;..\Src\platform;..\Src;..\Src\OnChipDevices;..\Src\ExternalDevices</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -3432,32 +3488,42 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
+ <GroupName>OnChipDevices</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
+ <FileName>Usart.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Usart.c</FilePath>
</File>
<File>
- <FileName>lcd.c</FileName>
+ <FileName>Spi.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Spi.c</FilePath>
</File>
<File>
- <FileName>deca_spi.c</FileName>
+ <FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
+ <FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>ExternalDevices</GroupName>
+ <Files>
+ <File>
+ <FileName>dw_driver.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\dw_driver.c</FilePath>
</File>
<File>
- <FileName>deca_sleep.c</FileName>
+ <FileName>led.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
<File>
- <FileName>deca_mutex.c</FileName>
+ <FileName>beep.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
--
Gitblit v1.9.3