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 | 224 ++++++++++----------------------------------------------
1 files changed, 40 insertions(+), 184 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 b4aeddd..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,36 +552,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -613,6 +584,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>
@@ -621,6 +597,7 @@
<TargetName>STM3210E-EVAL_XL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZG</Device>
@@ -1162,36 +1139,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -1224,6 +1171,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>
@@ -1232,6 +1184,7 @@
<TargetName>STM32100B-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F102CB</Device>
@@ -1773,36 +1726,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -1835,6 +1758,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>
@@ -1843,6 +1771,7 @@
<TargetName>STM3210C-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F107VC</Device>
@@ -2384,36 +2313,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -2446,6 +2345,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>
@@ -2454,6 +2358,7 @@
<TargetName>STM3210E-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZE</Device>
@@ -2995,36 +2900,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -3057,6 +2932,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>
@@ -3066,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>
@@ -3190,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>
@@ -3379,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>
@@ -3388,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>
@@ -3607,36 +3488,6 @@
</Files>
</Group>
<Group>
- <GroupName>platform</GroupName>
- <Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <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>
@@ -3669,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