fix: addressed issues with PR #43

UCSD-E4E · May 29, 2024 · ed4e634 · ed4e634
1 parent a3cf21e
commit ed4e634
Show file tree

Hide file tree

Showing 21 changed files with 211 additions and 3,287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -294,4 +294,5 @@ target/
 nul
 out/docs/application/Service Diagram.png
 out/docs/fw_flow/Firmware Flowchart.png
-tests/outputs/
+tests/outputs/
+build/**
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -1,14 +1,48 @@
 {
-    "configurations": 
-    [
+    "configurations": [
         {
             "name": "Particle",
+            "includePath": [
+                "${workspaceFolder}\\src",
+                "~/.particle/toolchains/deviceOS/5.3.0/user/inc"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "windowsSdkVersion": "10.0.22000.0",
+            "compilerPath": "~\\.particle\\toolchains\\gcc-arm\\10.2.1\\bin\\arm-none-eabi-gcc.exe",
+            "intelliSenseMode": "windows-gcc-arm",
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "configurationProvider": "particle.particle-vscode-core",
+            "mergeConfigurations": true,
+            "browse": {
+                "limitSymbolsToIncludedHeaders": true,
+                "path": [
+                    "${default}",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\user\\inc",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\hal\\inc",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\hal\\shared",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\hal\\src\\gcc",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\hal\\src\\nRF52840\\posix",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\services\\inc",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\system",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\wiring",
+                    "~\\.particle\\toolchains\\deviceOS\\5.3.0\\third_party\\nrf5_sdk\\nrf5_sdk\\modules\\nrfx\\mdk",
+                    "${workspaceFolder}\\src"
+                ]
+            }
+        },
+        {
+            "name": "Particle_nix",
             "includePath": 
             [
                 "${workspaceFolder}/src",
                 "~/.particle/toolchains/deviceOS/5.3.0/user/inc",
                 "/usr/include/"
-                
+
             ],
             "defines": 
             [

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,55 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "(gdb) Launch Scheduler Test",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/tests/test.o",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                },
-                {
-                    "description": "Set Disassembly Flavor to Intel",
-                    "text": "-gdb-set disassembly-flavor intel",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-        {
-            "name": "(gdb) Launch Scheduler Google Test",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/gtests/test_scheduler",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                },
-                {
-                    "description": "Set Disassembly Flavor to Intel",
-                    "text": "-gdb-set disassembly-flavor intel",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-
         {
             "name": "Semantic Release",
             "type": "debugpy",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -78,8 +78,5 @@
     "C_Cpp.vcFormat.newLine.beforeOpenBrace.block": "newLine",
     "C_Cpp.vcFormat.indent.preserveWithinParentheses": true,
     "C_Cpp.vcFormat.indent.preprocessor": "oneLeft",
-    "C_Cpp.errorSquiggles": "enabled",
-    "C_Cpp.vcFormat.wrap.preserveBlocks": "never",
-    "C_Cpp.vcFormat.newLine.beforeOpenBrace.function": "newLine",
 
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/docs/RideTask.puml b/docs/RideTask.puml
diff --git a/docs/scheduler_gantt.py b/docs/scheduler_gantt.py
diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
@@ -4,15 +4,19 @@ project(TestScheduler)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-add_definitions(-DTEST_VERSION=1 -DGTESTING=1)
-include_directories($ENV{HOME}/local/include)
-link_directories($ENV{HOME}/local/lib)
+add_compile_definitions(TEST_VERSION=1 GTESTING=1)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../external/googletest ${CMAKE_CURRENT_BINARY_DIR}/googletest)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../external/googletest/include)
 
 set(SOURCE_FILES
-    ../tests/scheduler_test_system.cpp
-    ../src/scheduler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/../tests/scheduler_test_system.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/scheduler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_functions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gtest.cpp)
 
-add_executable(test_scheduler.o ${SOURCE_FILES})
-target_link_libraries(test_scheduler.o gtest gtest_main pthread)
+
+add_executable(test_scheduler ${SOURCE_FILES})
+
+
+target_link_libraries(test_scheduler gtest gtest_main pthread)
diff --git a/gtests/gtest.cpp b/gtests/gtest.cpp
@@ -1,5 +1,4 @@
 #include <gtest/gtest.h>
-#include <gmock/gmock.h>
 #include "../tests/scheduler_test_system.hpp"
 #include "scheduler_functions.hpp"
 class SchedulerTest : public ::testing::Test

diff --git a/latex/delayed.png b/latex/delayed.png
diff --git a/latex/intended.png b/latex/intended.png
diff --git a/latex/main.tex b/latex/main.tex
diff --git a/latex/sf.pdf b/latex/sf.pdf
diff --git a/package-lock.json b/package-lock.json