From f1263c032f133f2a651b9264f6c0c592e9012f45 Mon Sep 17 00:00:00 2001
From: chain40 <chain40@outlook.com>
Date: Sun, 8 Dec 2024 22:37:26 +0800
Subject: [PATCH] feat: GCC 13.3.1 / GDB 15.1

---
 .gitignore                                    |  1 +
 bmd380_bootloader-Debug.vgdbsettings          |  1 +
 ...bootloader-Debug.vgdbsettings.chain40.user | 26 +++++--------------
 bmd380_bootloader.vcxproj                     |  4 +--
 nrf5x.xml                                     |  6 ++---
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index c08f57b..df003a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ Thumbs.db
 /VisualGDB/
 /.visualgdb/
 /.vs/
+*.vgdbsettings.*.user
diff --git a/bmd380_bootloader-Debug.vgdbsettings b/bmd380_bootloader-Debug.vgdbsettings
index 944799b..57714f7 100644
--- a/bmd380_bootloader-Debug.vgdbsettings
+++ b/bmd380_bootloader-Debug.vgdbsettings
@@ -102,6 +102,7 @@
       <MaxBreakpointLimit>0</MaxBreakpointLimit>
       <EnableVerboseMode>true</EnableVerboseMode>
       <EnablePrettyPrinters>false</EnablePrettyPrinters>
+      <EnableAbsolutePathReporting>true</EnableAbsolutePathReporting>
     </AdditionalGDBSettings>
     <DebugMethod>
       <ID>jlink-jtag</ID>
diff --git a/bmd380_bootloader-Debug.vgdbsettings.chain40.user b/bmd380_bootloader-Debug.vgdbsettings.chain40.user
index f32862c..9e918f0 100644
--- a/bmd380_bootloader-Debug.vgdbsettings.chain40.user
+++ b/bmd380_bootloader-Debug.vgdbsettings.chain40.user
@@ -9,27 +9,15 @@
       <Syscalls />
       <CXXCatchpoints />
     </CatchpointConfiguration>
+    <VisualWatchPreferences />
     <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
     <MemoryWindowPreferences />
-    <e />
-    <b>
-      <a>
-        <a>com.sysprogs.AllGlobals</a>
-        <b />
-      </a>
-      <a>
-        <a>com.sysprogs.SpecificVariables</a>
-        <b />
-      </a>
-      <a>
-        <a>com.sysprogs.Custom</a>
-        <b />
-      </a>
-    </b>
-    <c>
-      <b>SpecificVariables</b>
-      <a>false</a>
-    </c>
+    <LiveVariables />
+    <LoadGlobalsWithoutConfirmation>false</LoadGlobalsWithoutConfirmation>
+    <LiveVariablePreferences>
+      <ViewMode>AllGlobals</ViewMode>
+      <FavoritesOnly>false</FavoritesOnly>
+    </LiveVariablePreferences>
     <Suggestions />
     <HardwareRegisters />
   </DebugPreferences>
diff --git a/bmd380_bootloader.vcxproj b/bmd380_bootloader.vcxproj
index 1a38939..a082cd0 100644
--- a/bmd380_bootloader.vcxproj
+++ b/bmd380_bootloader.vcxproj
@@ -32,7 +32,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
-    <ToolchainVersion>12.3.1/13.2/r1</ToolchainVersion>
+    <ToolchainVersion>13.3.1/15.1/r3</ToolchainVersion>
     <GenerateHexFile>true</GenerateHexFile>
     <GenerateBuildScript>true</GenerateBuildScript>
     <MCUPropertyListFile>$(ProjectDir)nrf5x.props</MCUPropertyListFile>
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
-    <ToolchainVersion>12.3.1/13.2/r1</ToolchainVersion>
+    <ToolchainVersion>13.3.1/15.1/r3</ToolchainVersion>
     <GenerateHexFile>true</GenerateHexFile>
     <GenerateBuildScript>true</GenerateBuildScript>
     <MCUPropertyListFile>$(ProjectDir)nrf5x.props</MCUPropertyListFile>
diff --git a/nrf5x.xml b/nrf5x.xml
index 12304b0..4378fd7 100644
--- a/nrf5x.xml
+++ b/nrf5x.xml
@@ -2,9 +2,9 @@
 <EmbeddedProfile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ToolchainID>com.visualgdb.arm-eabi</ToolchainID>
   <ToolchainVersion>
-    <GCC>12.3.1</GCC>
-    <GDB>13.2</GDB>
-    <Revision>1</Revision>
+    <GCC>13.3.1</GCC>
+    <GDB>15.1</GDB>
+    <Revision>3</Revision>
   </ToolchainVersion>
   <BspID>com.sysprogs.arm.nordic.nrf5x</BspID>
   <BspVersion>17.0</BspVersion>