From a9312568cde771d4b970445e1f66a04fabb64d56 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 14:07:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Radio' into dev1
---
MDK-ARM/F030C8T6_KNet.uvprojx | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/MDK-ARM/F030C8T6_KNet.uvprojx b/MDK-ARM/F030C8T6_KNet.uvprojx
index 5fe14e9..c417a4b 100644
--- a/MDK-ARM/F030C8T6_KNet.uvprojx
+++ b/MDK-ARM/F030C8T6_KNet.uvprojx
@@ -7,7 +7,7 @@
<Targets>
<Target>
- <TargetName>F030C8T6_Test2</TargetName>
+ <TargetName>F030C8T6_Radio_LLCC68</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
@@ -48,7 +48,7 @@
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>F030C8T6_Test2\</OutputDirectory>
- <OutputName>F030C8T6_Test2</OutputName>
+ <OutputName>F030C8T6_Radio_LLCC68</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
@@ -310,7 +310,7 @@
</ArmAdsMisc>
<Cads>
<interw>1</interw>
- <Optim>7</Optim>
+ <Optim>4</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
@@ -324,8 +324,8 @@
<uSurpInc>0</uSurpInc>
<uC99>1</uC99>
<useXO>0</useXO>
- <v6Lang>3</v6Lang>
- <v6LangP>3</v6LangP>
+ <v6Lang>1</v6Lang>
+ <v6LangP>1</v6LangP>
<vShortEn>1</vShortEn>
<vShortWch>1</vShortWch>
<v6Lto>0</v6Lto>
@@ -335,7 +335,7 @@
<MiscControls></MiscControls>
<Define>USE_FULL_LL_DRIVER,USE_HAL_DRIVER</Define>
<Undefine></Undefine>
- <IncludePath>../Inc;../Src; ../Drivers/STM32F0xx_HAL_Driver/Inc; ../Drivers/CMSIS/Device/ST/STM32F0xx/Include; ../Drivers/CMSIS/Include; ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy</IncludePath>
+ <IncludePath>../Inc;../Src;../Drivers/STM32F0xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F0xx/Include;../Drivers/CMSIS/Include;../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy;./Radio/Inc;./;../src/radio/inc</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -455,9 +455,24 @@
<FilePath>..\Src\ModbusRTU.c</FilePath>
</File>
<File>
- <FileName>FP0.c</FileName>
+ <FileName>delay.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Src\FP0.c</FilePath>
+ <FilePath>..\Src\delay.c</FilePath>
+ </File>
+ <File>
+ <FileName>gpio.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\gpio.c</FilePath>
+ </File>
+ <File>
+ <FileName>spi.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\spi.c</FilePath>
+ </File>
+ <File>
+ <FileName>KWireLess.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\KWireLess.c</FilePath>
</File>
<File>
<FileName>debug.c</FileName>
@@ -637,6 +652,31 @@
</Files>
</Group>
<Group>
+ <GroupName>Radio</GroupName>
+ <Files>
+ <File>
+ <FileName>crc.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\Radio\src\crc.c</FilePath>
+ </File>
+ <File>
+ <FileName>radio.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\Radio\src\radio.c</FilePath>
+ </File>
+ <File>
+ <FileName>sx126x.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\Radio\src\sx126x.c</FilePath>
+ </File>
+ <File>
+ <FileName>sx126x-board.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Src\Radio\src\sx126x-board.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
<GroupName>::CMSIS</GroupName>
</Group>
</Groups>
@@ -646,10 +686,10 @@
<RTE>
<apis/>
<components>
- <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
- <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+ <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.1.1" condition="ARMv6_7_8-M Device">
+ <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.3.0"/>
<targetInfos>
- <targetInfo name="F030C8T6_Test2"/>
+ <targetInfo name="F030C8T6_Radio_LLCC68"/>
</targetInfos>
</component>
</components>
--
Gitblit v1.9.1