.

SKID-CWNU · Mar 25, 2024 · 35a77fb · 35a77fb
1 parent 1673d57
commit 35a77fb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/.vscode/arduino.json b/.vscode/arduino.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-    "sketch": "code\\Testing_Crate\\STIMU\\STIMU.ino",
-=======
     "sketch": "code\\Testing_Crate\\GPS_uBlox\\GPS_uBlox.ino",
->>>>>>> 102f8cc168e95cf198f5062845587503498f1ed3
     "board": "rp2040:rp2040:rpipico",
     "port": "COM6",
     "output": "../build",

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
     "configurations": [
         {
             "name": "Arduino",
-            "compilerPath": "C:\\Users\\wonit\\AppData\\Local\\Arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\bin\\arm-none-eabi-g++",
+            "compilerPath": "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\bin\\arm-none-eabi-g++",
             "compilerArgs": [
                 "-I",
                 "-Werror=return-type",
@@ -13,24 +13,25 @@
                 "-mthumb",
                 "-ffunction-sections",
                 "-fdata-sections",
-                "-fno-exceptions",
+                "-fexceptions",
                 "-fstack-protector"
             ],
             "intelliSenseMode": "gcc-x64",
             "includePath": [
-                "C:\\Users\\wonit\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.6.0\\include",
-                "C:\\Users\\wonit\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.6.0\\cores\\rp2040",
-                "C:\\Users\\wonit\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.6.0\\variants\\rpipico",
-                "C:\\Users\\wonit\\Documents\\Arduino\\libraries\\TinyGPSPlus\\src",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\arm-none-eabi\\include\\c++\\12.3.0",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\arm-none-eabi\\include\\c++\\12.3.0\\arm-none-eabi\\thumb",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\arm-none-eabi\\include\\c++\\12.3.0\\backward",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\lib\\gcc\\arm-none-eabi\\12.3.0\\include",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\lib\\gcc\\arm-none-eabi\\12.3.0\\include-fixed",
-                "c:\\users\\wonit\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.1.0-a-d3d2e6b\\arm-none-eabi\\include"
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\include",
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\cores\\rp2040",
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\variants\\rpipico",
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\libraries\\Wire\\src",
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\libraries\\SPI\\src",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\arm-none-eabi\\include\\c++\\12.3.0",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\arm-none-eabi\\include\\c++\\12.3.0\\arm-none-eabi\\thumb",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\arm-none-eabi\\include\\c++\\12.3.0\\backward",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\lib\\gcc\\arm-none-eabi\\12.3.0\\include",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\lib\\gcc\\arm-none-eabi\\12.3.0\\include-fixed",
+                "c:\\users\\user\\appdata\\local\\arduino15\\packages\\rp2040\\tools\\pqt-gcc\\2.2.0-d04e724\\arm-none-eabi\\include"
             ],
             "forcedInclude": [
-                "C:\\Users\\wonit\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.6.0\\cores\\rp2040\\Arduino.h"
+                "C:\\Users\\user\\AppData\\Local\\Arduino15\\packages\\rp2040\\hardware\\rp2040\\3.7.2\\cores\\rp2040\\Arduino.h"
             ],
             "cStandard": "c11",
             "cppStandard": "c++17",