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 | 158 +++++++++++-----------------------------------------
1 files changed, 34 insertions(+), 124 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 3d410e6..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"
@@ -552,26 +552,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -603,6 +583,11 @@
<FileName>led.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -1154,26 +1139,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -1205,6 +1170,11 @@
<FileName>led.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -1756,26 +1726,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -1807,6 +1757,11 @@
<FileName>led.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -2358,26 +2313,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -2409,6 +2344,11 @@
<FileName>led.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -2960,26 +2900,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -3011,6 +2931,11 @@
<FileName>led.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
</File>
</Files>
</Group>
@@ -3146,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>
@@ -3335,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>
@@ -3344,7 +3269,7 @@
<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;..\Src;..\Src\OnChipDevices;..\Src\ExternalDevices</IncludePath>
</VariousControls>
@@ -3563,26 +3488,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>deca_spi.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_spi.c</FilePath>
- </File>
- <File>
- <FileName>deca_sleep.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_sleep.c</FilePath>
- </File>
- <File>
- <FileName>deca_mutex.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\deca_mutex.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
<GroupName>OnChipDevices</GroupName>
<Files>
<File>
@@ -3615,6 +3520,11 @@
<FileType>1</FileType>
<FilePath>..\Src\ExternalDevices\led.c</FilePath>
</File>
+ <File>
+ <FileName>beep.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\ExternalDevices\beep.c</FilePath>
+ </File>
</Files>
</Group>
</Groups>
--
Gitblit v1.9.3