summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDawsyn Schraiber <[email protected]>2024-05-09 01:20:17 -0400
committerGitHub <[email protected]>2024-05-09 01:20:17 -0400
commit90c4d94b13472114daab71d3e368660224423c90 (patch)
tree2a56c3780e6ba2f157ce15f2356134cff5035694 /.gitignore
parentd695dce1a7ea28433db8e893025d1ec66fb077b2 (diff)
downloadactive-drag-system-90c4d94b13472114daab71d3e368660224423c90.tar.gz
active-drag-system-90c4d94b13472114daab71d3e368660224423c90.tar.bz2
active-drag-system-90c4d94b13472114daab71d3e368660224423c90.zip
02/24/2024 Test Launch Version (BB Black) (#11)
* Adding a 90% completed, compilable but untested ADS * Made basic changes to actuator & sensor. Also added motor class * Removed unnecessary .cpp files * Updated sensor & actuator classes, finished ads, added variable time step to kalman filter, set up all tests for future assertions * Relocated 'main' to 'active-drag-system.cpp'. Added more info to README * Removed main.cpp * Added more details to README * Changed some function parameters from pass-by-pointer to pass-by-reference. Also removed the std namespace * Started writing the test cases * Updated the .gitignore file * Removed some files that should be gitignored * Up to date with Jazz's pull request * Test Launch Branch Created; PRU Servo Control with Test Program * Added I2C device class and register IDs for MPL [INCOMPLETE SENSOR IMPLEMENTATION] Needs actual data getting function implementation for both sensors and register IDs for BNO, will implement shortly. * Partial implementation of MPL sensor Added startup method, still needs fleshed out data getters and setters and finished I2C implementation. MOST LIKELY WILL HAVE COMPILATION ISSUES. * *Hypothetically* complete MPL implementation NEEDS HARDWARE TESTING * IMU Header and init() method implementation Needs like, all data handling still lol * Hypothetically functional (Definitely won't compile) * We ball? --------- Co-authored-by: Jazz Jackson <[email protected]> Co-authored-by: Cian Capacci <[email protected]>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore37
1 files changed, 22 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 18c75b1..dd2214a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,22 @@
-Testing/*
-.DS_Store
-.vagrant/*
-.idea/
-
-CMakeFiles/
-cmake_install.cmake
-CMakeCache.txt
-Makefile
-
-src/CMakeFiles
-src/cmake_install.cmake
-src/Makefile
-
-build/*
+<<<<<<< HEAD
+Testing/*
+.DS_Store
+.vagrant/*
+.idea/
+./vscode
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+src/CMakeFiles
+src/cmake_install.cmake
+src/Makefile
+build/*
+tests/output.txt
+tests/loggerRun
+test/output.txt
+test/loggerRun
+test/adsTest.cpp
+docs/150_VirginiaTech_TechnicalReport.pdf
+docs/Chen_Presentation_ADS.pdf
+docs/TestLaunch2-Critical.txt