From 55c26cb52436d5c82f1602114bb38057832ef25b Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 09 二月 2022 21:30:38 +0800 Subject: [PATCH] V2.46 增加标签坐标下发,串口测试不丢包,待网线测试,波特率115200 --- 源码/核心板/MDK-ARM/Project.uvprojx | 74 ++++++++++++++++++++++++++++++------ 1 files changed, 61 insertions(+), 13 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 19b8feb..dc54e29 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,19 +10,20 @@ <TargetName>STM32</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> - <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed> + <pCCUsed>5060750::V5.06 update 6 (build 750)::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> @@ -32,7 +33,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> @@ -51,7 +52,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> @@ -111,11 +112,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> @@ -183,6 +184,7 @@ <hadXRAM>0</hadXRAM> <uocXRam>0</uocXRam> <RvdsVP>0</RvdsVP> + <RvdsMve>0</RvdsMve> <hadIRAM2>0</hadIRAM2> <hadIROM2>0</hadIROM2> <StupSel>8</StupSel> @@ -272,7 +274,7 @@ </OCR_RVCT3> <OCR_RVCT4> <Type>1</Type> - <StartAddress>0x8000000</StartAddress> + <StartAddress>0x8005000</StartAddress> <Size>0x10000</Size> </OCR_RVCT4> <OCR_RVCT5> @@ -323,9 +325,10 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <uC99>1</uC99> + <uGnu>0</uGnu> <useXO>0</useXO> - <v6Lang>3</v6Lang> - <v6LangP>3</v6LangP> + <v6Lang>0</v6Lang> + <v6LangP>0</v6LangP> <vShortEn>1</vShortEn> <vShortWch>1</vShortWch> <v6Lto>0</v6Lto> @@ -383,6 +386,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> @@ -449,6 +467,21 @@ <FileType>1</FileType> <FilePath>..\Src\ExternalDevices\beep.c</FilePath> </File> + <File> + <FileName>dps310.c</FileName> + <FileType>1</FileType> + <FilePath>..\Src\ExternalDevices\dps310.c</FilePath> + </File> + <File> + <FileName>dps368_test.c</FileName> + <FileType>1</FileType> + <FilePath>..\Src\ExternalDevices\dps368_test.c</FilePath> + </File> + <File> + <FileName>lis3dh_driver.c</FileName> + <FileType>1</FileType> + <FilePath>..\Src\ExternalDevices\lis3dh_driver.c</FilePath> + </File> </Files> </Group> <Group> @@ -469,6 +502,21 @@ <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> <Group> -- Gitblit v1.9.3