Merge branch 'bsp' into develop

This commit is contained in:
chain40
2024-07-31 20:36:36 +08:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -32,13 +32,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<GNUConfigurationType>Debug</GNUConfigurationType>
<ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
<ToolchainVersion>13.3.1/14.2/r1</ToolchainVersion>
<ToolchainVersion>13.3.1/15.1/r2</ToolchainVersion>
<GenerateHexFile>true</GenerateHexFile>
<MCUPropertyListFile>$(ProjectDir)nrf5x.props</MCUPropertyListFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
<ToolchainVersion>13.3.1/14.2/r1</ToolchainVersion>
<ToolchainVersion>13.3.1/15.1/r2</ToolchainVersion>
<GenerateHexFile>true</GenerateHexFile>
<MCUPropertyListFile>$(ProjectDir)nrf5x.props</MCUPropertyListFile>
</PropertyGroup>
+2 -2
View File
@@ -3,8 +3,8 @@
<ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
<ToolchainVersion>
<GCC>13.3.1</GCC>
<GDB>14.2</GDB>
<Revision>1</Revision>
<GDB>15.1</GDB>
<Revision>2</Revision>
</ToolchainVersion>
<BspID>com.sysprogs.arm.nordic.nrf5x</BspID>
<BspVersion>17.0</BspVersion>