Merge branch 'main' into After-Launch-Code2

Signed-off-by: varun unnithan <[email protected]>
Terrapin-Rocket-Team · Jun 27, 2024 · db681ca · db681ca
2 parents 0cc5cf7 + 18cb1c2
commit db681ca
Show file tree

Hide file tree

Showing 81 changed files with 329,269 additions and 259 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,4 +49,6 @@ Spaceport/*/PCBs/**/_autosave*
 **/fp-info-cache
 **/~*.kicad*
 Side_Projects/**/*-backups
-Side_projects/**/_autosave*
+Side_projects/**/_autosave*
+Side_Projects/Live Video/mux/3-stream/output/mux.txt
+Side_Projects/Live Video/mux/3-stream/output/mux.bin
diff --git a/Side_Projects/Live Video/CAD/step_files/LVPD-board_Payload.step b/Side_Projects/Live Video/CAD/step_files/LVPD-board_Payload.step
diff --git a/Side_Projects/Live Video/CAD/step_files/LVPD-board_v2.step b/Side_Projects/Live Video/CAD/step_files/LVPD-board_v2.step
diff --git a/Side_Projects/Live Video/PCBs/LVPD-board_Payload/LVPD-board_Payload.kicad_pcb b/Side_Projects/Live Video/PCBs/LVPD-board_Payload/LVPD-board_Payload.kicad_pcb