Merge branch 'v3-DEV'

icl-rocketry · Oct 23, 2024 · e46274a · e46274a
2 parents ed8a6bf + f1993b1
commit e46274a
Show file tree

Hide file tree

Showing 234 changed files with 397,091 additions and 115,248 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "Firmware/lib/SdFat"]
 	path = Firmware/lib/SdFat
 	url = https://github.com/greiman/SdFat.git
+[submodule "Firmware/lib/arduino-LoRa"]
+	path = Firmware/lib/arduino-LoRa
+	url = [email protected]:icl-rocketry/arduino-LoRa.git
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": true
+}
diff --git a/Firmware/.vscode/settings.json b/Firmware/.vscode/settings.json
@@ -3,10 +3,11 @@
     "files.associations": {
         "*.ipp": "cpp",
         "core": "cpp",
-        "eigen": "cpp"
+        "eigen": "cpp",
+        "esp_vfs_semihost.h": "c"
     },
     "editor.bracketPairColorization.enabled": true,
     "editor.guides.bracketPairs": "active",
     "git.ignoreLimitWarning": true,
-    "idf.port": "/dev/cu.usbmodem101"
+    "idf.port": "/dev/tty.usbmodem2101"
 }