From d695dce1a7ea28433db8e893025d1ec66fb077b2 Mon Sep 17 00:00:00 2001 From: Dawsyn Schraiber <32221234+dawsynth@users.noreply.github.com> Date: Sun, 12 Nov 2023 01:06:57 -0500 Subject: Header styles and file naming conventions; CMake ARM Linux musl Compiler Co-authored-by: Gregory Wainer --- src/CMakeLists.txt | 15 ++++++++++++++- src/active-drag-system.cpp | 7 ------- src/active_drag_system.cpp | 32 ++++++++++++++++++++++++++++++++ src/pru1/sensors.cpp | 12 ++++++++++++ src/pru2/servos.cpp | 11 +++++++++++ 5 files changed, 69 insertions(+), 8 deletions(-) delete mode 100644 src/active-drag-system.cpp create mode 100644 src/active_drag_system.cpp create mode 100644 src/pru1/sensors.cpp create mode 100644 src/pru2/servos.cpp (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 95d2f15..ea820ce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,14 @@ -add_executable (ads active-drag-system.cpp) +add_executable(ads + active_drag_system.cpp +) + +add_executable(pru1 + pru1/sensors.cpp +) + +add_executable(pru2 + pru2/servos.cpp +) + +target_link_options(pru1 PRIVATE -static) +target_link_options(pru2 PRIVATE -static) diff --git a/src/active-drag-system.cpp b/src/active-drag-system.cpp deleted file mode 100644 index 2b76215..0000000 --- a/src/active-drag-system.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include - -int main() { - std::cout << "ADS Deployed!" << std::endl; - return EXIT_SUCCESS; -} diff --git a/src/active_drag_system.cpp b/src/active_drag_system.cpp new file mode 100644 index 0000000..dce4f86 --- /dev/null +++ b/src/active_drag_system.cpp @@ -0,0 +1,32 @@ +/* + * Author: Dawsyn Schraiber + * Date: 09/02/2023 + * + * MIT License + * + * Copyright (c) 2023 Rocketry at Virginia Tech + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include + +int main(int argc, char *argv[]) { + std::cout << "ADS" << std::endl; +} diff --git a/src/pru1/sensors.cpp b/src/pru1/sensors.cpp new file mode 100644 index 0000000..508387e --- /dev/null +++ b/src/pru1/sensors.cpp @@ -0,0 +1,12 @@ +/* + * Author: Gregory Wainer + * Date: 10/14/2023 + * + */ + +#include +#include + +int main(int argc, char *argv[]) { + std::cout << "PRU1" << std::endl; +} diff --git a/src/pru2/servos.cpp b/src/pru2/servos.cpp new file mode 100644 index 0000000..ba71ce2 --- /dev/null +++ b/src/pru2/servos.cpp @@ -0,0 +1,11 @@ +/* + * Author: Gregory Wainer + * Date: 10/14/2023 + * + */ + +#include + +int main(int argc, char* argv[]) { + std::cout << "PRU2" << std::endl; +} -- cgit v1.2.3