From ae557c6657c578b26ec6280b89bffc66f40b9877 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 08 十一月 2019 10:14:06 +0800
Subject: [PATCH] 游乐园发货
---
源码/核心板/MDK-ARM/Project.uvprojx | 129 ++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 31 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 f4e9835..cd08084 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,20 +10,18 @@
<TargetName>STM32</TargetName>
<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>
+ <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>
<StartupFile></StartupFile>
- <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103T8$Flash\STM32F10x_128.FLM))</FlashDriverDll>
- <DeviceId>4403</DeviceId>
- <RegisterFile>$$Device:STM32F103T8$Device\Include\stm32f10x.h</RegisterFile>
+ <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))</FlashDriverDll>
+ <DeviceId>4235</DeviceId>
+ <RegisterFile>$$Device:STM32F103C8$Device\Include\stm32f10x.h</RegisterFile>
<MemoryEnv></MemoryEnv>
<Cmp></Cmp>
<Asm></Asm>
@@ -33,7 +31,7 @@
<SLE66CMisc></SLE66CMisc>
<SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc></SLE66LinkerMisc>
- <SFDFile>$$Device:STM32F103T8$SVD\STM32F103xx.svd</SFDFile>
+ <SFDFile>$$Device:STM32F103C8$SVD\STM32F103xx.svd</SFDFile>
<bCustSvd>0</bCustSvd>
<UseEnv>0</UseEnv>
<BinPath></BinPath>
@@ -52,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>
@@ -86,8 +84,6 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
- <nStopA1X>0</nStopA1X>
- <nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
@@ -112,11 +108,11 @@
<SimDllName>SARMCM3.DLL</SimDllName>
<SimDllArguments></SimDllArguments>
<SimDlgDll>DARMSTM.DLL</SimDlgDll>
- <SimDlgDllArguments>-pSTM32F103T8</SimDlgDllArguments>
+ <SimDlgDllArguments>-pSTM32F103C8</SimDlgDllArguments>
<TargetDllName>SARMCM3.DLL</TargetDllName>
<TargetDllArguments></TargetDllArguments>
<TargetDlgDll>TARMSTM.DLL</TargetDlgDll>
- <TargetDlgDllArguments>-pSTM32F103T8</TargetDlgDllArguments>
+ <TargetDlgDllArguments>-pSTM32F103C8</TargetDlgDllArguments>
</DllOption>
<DebugOption>
<OPTHX>
@@ -126,6 +122,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>
@@ -138,7 +175,7 @@
</Flash1>
<bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
- <Flash3>"" ()</Flash3>
+ <Flash3></Flash3>
<Flash4></Flash4>
<pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp>
@@ -190,7 +227,6 @@
<useUlib>1</useUlib>
<EndSel>0</EndSel>
<uLtcg>0</uLtcg>
- <nSecure>0</nSecure>
<RoSelD>3</RoSelD>
<RwSelD>3</RwSelD>
<CodeSel>0</CodeSel>
@@ -273,7 +309,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
- <StartAddress>0x8000000</StartAddress>
+ <StartAddress>0x8005000</StartAddress>
<Size>0x10000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
@@ -325,18 +361,11 @@
<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>
<VariousControls>
<MiscControls></MiscControls>
<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;..\Src\application</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;..\Src\application;..\Src\algorithm</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -349,7 +378,6 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
- <uClangAs>0</uClangAs>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@@ -385,6 +413,26 @@
<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>
+ <File>
+ <FileName>modbus.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\application\modbus.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -399,6 +447,16 @@
<FileName>stm32f10x_it.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\stm32f10x_it.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>algorithm</GroupName>
+ <Files>
+ <File>
+ <FileName>filters.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\algorithm\filters.c</FilePath>
</File>
</Files>
</Group>
@@ -459,6 +517,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>
@@ -605,11 +678,5 @@
</Groups>
</Target>
</Targets>
-
- <RTE>
- <apis/>
- <components/>
- <files/>
- </RTE>
</Project>
--
Gitblit v1.9.3