Revert "Revert "配对完成，有bug""

zhyinch

2018-10-18 4a99709fbaf35e70ab7102c902e2c4caab74b96c

 源码/核心板/MDK-ARM/Project.uvprojx

@@ -13,16 +13,16 @@
      <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
      <TargetOption>
        <TargetCommonOption>
          <Device>STM32F103T8</Device>
          <Device>STM32F103C8</Device>
          <Vendor>STMicroelectronics</Vendor>
          <PackID>Keil.STM32F1xx_DFP.2.1.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 +32,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>
@@ -111,11 +111,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>
@@ -137,7 +137,7 @@
          </Flash1>
          <bUseTDR>1</bUseTDR>
          <Flash2>BIN\UL2CM3.DLL</Flash2>
          <Flash3>"" ()</Flash3>
          <Flash3></Flash3>
          <Flash4></Flash4>
          <pFcarmOut></pFcarmOut>
          <pFcarmGrp></pFcarmGrp>
@@ -384,6 +384,21 @@
              <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>
        <Group>
@@ -469,6 +484,16 @@
              <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>
          </Files>
        </Group>
        <Group>