From b0e6260abb7b73fbc178af119c24b0a73ab2ffc5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 09 一月 2020 08:56:02 +0800
Subject: [PATCH] 华星第一版测试完成，修复标签timeout bug
---
源码/核心板/MDK-ARM/Project.uvprojx | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 20 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 c4adbc4..2537e3c 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,12 +10,11 @@
<TargetName>STM32</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
- <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103C8</Device>
<Vendor>STMicroelectronics</Vendor>
- <PackID>Keil.STM32F1xx_DFP.2.1.0</PackID>
+ <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x5000) IROM(0x08000000,0x10000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
@@ -51,7 +50,7 @@
<OutputName>UWB_Projects</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
- <CreateHexFile>0</CreateHexFile>
+ <CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\Listings\</ListingPath>
@@ -125,6 +124,47 @@
<HexOffset>0</HexOffset>
<Oh166RecLen>16</Oh166RecLen>
</OPTHX>
+ <Simulator>
+ <UseSimulator>0</UseSimulator>
+ <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
+ <RunToMain>1</RunToMain>
+ <RestoreBreakpoints>1</RestoreBreakpoints>
+ <RestoreWatchpoints>1</RestoreWatchpoints>
+ <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
+ <RestoreFunctions>1</RestoreFunctions>
+ <RestoreToolbox>1</RestoreToolbox>
+ <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
+ <RestoreSysVw>1</RestoreSysVw>
+ </Simulator>
+ <Target>
+ <UseTarget>1</UseTarget>
+ <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
+ <RunToMain>1</RunToMain>
+ <RestoreBreakpoints>1</RestoreBreakpoints>
+ <RestoreWatchpoints>1</RestoreWatchpoints>
+ <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
+ <RestoreFunctions>0</RestoreFunctions>
+ <RestoreToolbox>1</RestoreToolbox>
+ <RestoreTracepoints>0</RestoreTracepoints>
+ <RestoreSysVw>1</RestoreSysVw>
+ </Target>
+ <RunDebugAfterBuild>0</RunDebugAfterBuild>
+ <TargetSelection>6</TargetSelection>
+ <SimDlls>
+ <CpuDll></CpuDll>
+ <CpuDllArguments></CpuDllArguments>
+ <PeripheralDll></PeripheralDll>
+ <PeripheralDllArguments></PeripheralDllArguments>
+ <InitializationFile></InitializationFile>
+ </SimDlls>
+ <TargetDlls>
+ <CpuDll></CpuDll>
+ <CpuDllArguments></CpuDllArguments>
+ <PeripheralDll></PeripheralDll>
+ <PeripheralDllArguments></PeripheralDllArguments>
+ <InitializationFile></InitializationFile>
+ <Driver>Segger\JL2CM3.dll</Driver>
+ </TargetDlls>
</DebugOption>
<Utilities>
<Flash1>
@@ -189,7 +229,6 @@
<useUlib>1</useUlib>
<EndSel>0</EndSel>
<uLtcg>0</uLtcg>
- <nSecure>0</nSecure>
<RoSelD>3</RoSelD>
<RwSelD>3</RwSelD>
<CodeSel>0</CodeSel>
@@ -272,7 +311,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
- <StartAddress>0x8000000</StartAddress>
+ <StartAddress>0x8005000</StartAddress>
<Size>0x10000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
@@ -310,7 +349,7 @@
</ArmAdsMisc>
<Cads>
<interw>1</interw>
- <Optim>4</Optim>
+ <Optim>1</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
@@ -324,13 +363,8 @@
<uSurpInc>0</uSurpInc>
<uC99>1</uC99>
<useXO>0</useXO>
- <v6Lang>3</v6Lang>
- <v6LangP>3</v6LangP>
- <vShortEn>1</vShortEn>
- <vShortWch>1</vShortWch>
- <v6Lto>0</v6Lto>
- <v6WtE>0</v6WtE>
- <v6Rtti>0</v6Rtti>
+ <v6Lang>0</v6Lang>
+ <v6LangP>0</v6LangP>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_STDPERIPH_DRIVER,__CC_ARM</Define>
@@ -348,7 +382,6 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
- <uClangAs>0</uClangAs>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@@ -383,6 +416,21 @@
<FileName>dw_app.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\application\dw_app.c</FilePath>
+ </File>
+ <File>
+ <FileName>serial_at_cmd_app.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\serial_at_cmd_app.c</FilePath>
+ </File>
+ <File>
+ <FileName>beep_logic_app.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\beep_logic_app.c</FilePath>
+ </File>
+ <File>
+ <FileName>global_param.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\global_param.c</FilePath>
</File>
</Files>
</Group>
@@ -468,6 +516,21 @@
<FileName>Rcc_Nvic_Systick.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</FilePath>
+ </File>
+ <File>
+ <FileName>RTC.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\OnChipDevices\RTC.c</FilePath>
+ </File>
+ <File>
+ <FileName>Flash.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\OnChipDevices\Flash.c</FilePath>
+ </File>
+ <File>
+ <FileName>ADC.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\OnChipDevices\ADC.c</FilePath>
</File>
</Files>
</Group>
@@ -614,11 +677,5 @@
</Groups>
</Target>
</Targets>
-
- <RTE>
- <apis/>
- <components/>
- <files/>
- </RTE>
</Project>
--
Gitblit v1.9.3