Merge pull request #37 from TheSlowGrowth/feat/replace-sprout-and-fix…

…-tests

Replace `sprout` library, fix tests, modernize CI setup

.github/workflows/firmware.yaml

@@ -29,16 +29,16 @@ jobs:
     - name: Setup cmake
       uses: jwlawson/[email protected]
       with:
-        cmake-version: '3.20.x'
+        cmake-version: '3.30.x'
 
     - name: Checkout
       uses: actions/checkout@v2
       with:
         submodules: recursive
 
     - name: Configure
-      run: cmake -S firmware -B firmware/build -G "Unix Makefiles" -D CMAKE_TOOLCHAIN_FILE="$(pwd)/lib/libDaisy/cmake/toolchains/stm32h750xx.cmake" -D TOOLCHAIN_PREFIX=$(which arm-none-eabi-gcc | sed -e "s/bin\/arm-none-eabi-gcc//")
-    
+      run: cmake -S firmware -B firmware/build -G "Unix Makefiles" -D CMAKE_TOOLCHAIN_FILE="$(pwd)/lib/libDaisy/cmake/toolchains/stm32h750xx.cmake" -D CMAKE_BUILD_TYPE=RelWithDebInfo -D TOOLCHAIN_PREFIX=$(which arm-none-eabi-gcc | sed -e "s/bin\/arm-none-eabi-gcc//")
+
     - name: Build
       run: cmake --build firmware/build
 
@@ -53,7 +53,7 @@ jobs:
       with:
         name: TapeLooper.bin
         path: firmware/build/TapeLooper.bin
-  
+
   ###############################################################################
   # builds the automated tests with clang; runs tests and exports results
   firmware-tests:
@@ -69,12 +69,12 @@ jobs:
       run: |
         cd firmware/tests
         make release
-    
+
     - name: Run Tests
       run: |
         cd firmware/tests/build/bin
         ./TapeLooper_gtest --gtest_output=xml:gtestresults.xml
-    
+
     - name: Publish Test Results
       uses: EnricoMi/publish-unit-test-result-action@v1
       if: always()

.github/workflows/formatting.yaml

@@ -24,16 +24,16 @@ jobs:
       fail-fast: false
       matrix:
         path:
-          - 'firmware/src' 
-          - 'firmware/tests' 
+          - 'firmware/src'
+          - 'firmware/tests'
           - 'dsp/src'
           - 'dsp/tests'
           - 'plugin/src'
           - 'plugin/tests'
     steps:
     - uses: actions/checkout@v2
     - name: Run clang-format style check for C/C++ programs.
-      uses: jidicula/clang-format-action@v3.4.0
+      uses: jidicula/clang-format-action@v4.13.0
       with:
-        clang-format-version: '11'
+        clang-format-version: '18'
         check-path: ${{ matrix.path }}

.github/workflows/plugin.yaml

@@ -18,13 +18,13 @@ jobs:
   ###############################################################################
   # builds the plugin on windows
   testBuildWindows:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
     - name: Setup cmake
       uses: jwlawson/[email protected]
       with:
-        cmake-version: '3.19.x'
+        cmake-version: '3.30.x'
 
     - name: Checkout
       uses: actions/checkout@v2
@@ -34,12 +34,15 @@ jobs:
     - name: Configure
       run: |
         cmake.exe -G "Visual Studio 16 2019" -A x64 -B plugin/build -S plugin
+
     - name: Build
       run: |
         cmake --build plugin/build --config Release
+
     - name: Run Tests
       run: |
         plugin/build/Release/TapeLooperPlugin_Gtest.exe --gtest_output=xml:TestResults\gtestResults_windows.xml
+
     - name: Upload Test Results
       uses: actions/upload-artifact@v2
       with:
@@ -64,12 +67,16 @@ jobs:
     - name: Setup cmake
       uses: jwlawson/[email protected]
       with:
-        cmake-version: '3.19.x'
+        cmake-version: '3.30.x'
 
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: latest-stable
 
+    - name: Select Xcode
+      run: |
+        sudo xcode-select --reset
+
     - name: Checkout
       uses: actions/checkout@v2
       with:
@@ -78,12 +85,15 @@ jobs:
     - name: Configure
       run: |
         cmake -G "Xcode" -B plugin/build -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -S plugin
+
     - name: Build
       run: |
         cmake --build plugin/build --config Release
+
     - name: Run Tests
       run: |
         plugin/build/Release/TapeLooperPlugin_Gtest --gtest_output=xml:TestResults/gtestResults_macos.xml
+
     - name: Upload Test Results
       uses: actions/upload-artifact@v2
       with:
@@ -108,7 +118,7 @@ jobs:
     - name: Setup cmake
       uses: jwlawson/[email protected]
       with:
-        cmake-version: '3.19.x'
+        cmake-version: '3.30.x'
 
     - name: Setup dependencies
       run: |
@@ -122,12 +132,15 @@ jobs:
     - name: Configure
       run: |
         cmake -G "Unix Makefiles" -B plugin/build -S plugin
+
     - name: Build
       run: |
         cmake --build plugin/build --config Release
+
     - name: Run Tests
       run: |
         plugin/build/TapeLooperPlugin_Gtest --gtest_output=xml:TestResults/gtestResults_ubuntu.xml
+
     - name: Upload Test Results
       uses: actions/upload-artifact@v2
       with:
@@ -154,7 +167,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: TestResults
           path: TestResults

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "plugin/lib/JUCE"]
 	path = plugin/lib/JUCE
 	url = https://github.com/juce-framework/JUCE.git
+[submodule "dsp/lib/gcem"]
+	path = dsp/lib/gcem
+	url = https://github.com/kthohr/gcem

.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v18.1.8
+  hooks:
+  - id: clang-format

.vscode/c_cpp_properties.json

@@ -9,7 +9,7 @@
                 "${workspaceRoot}/lib/googletest/",
                 "${workspaceRoot}/lib/googletest/googletest/include/",
                 "${workspaceRoot}/lib/googletest/googlemock/include/",
-                "${workspaceRoot}/dsp/lib/sprout",
+                "${workspaceRoot}/dsp/lib/gcem/include",
                 "${workspaceRoot}/lib/libDaisy/core",
                 "${workspaceRoot}/lib/libDaisy/src",
                 "${workspaceRoot}/lib/libDaisy/src/sys",
@@ -46,7 +46,7 @@
                 "${workspaceRoot}/lib/googletest/",
                 "${workspaceRoot}/lib/googletest/googletest/include/",
                 "${workspaceRoot}/lib/googletest/googlemock/include/",
-                "${workspaceRoot}/dsp/lib/sprout",
+                "${workspaceRoot}/dsp/lib/gcem/include",
                 "${workspaceRoot}/lib/libDaisy/core",
                 "${workspaceRoot}/lib/libDaisy/src",
                 "${workspaceRoot}/lib/libDaisy/src/sys",

.vscode/launch.json

@@ -111,10 +111,10 @@
             "name": "Plugin Tests",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/plugin/build/Debug/TapeLooperPlugin_Gtest",
+            "program": "${workspaceFolder}/plugin/build/TapeLooperPlugin_Gtest",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/plugin/build/Debug",
+            "cwd": "${workspaceFolder}/plugin/build",
             "environment": [],
             "externalConsole": false,
             "logging": {
@@ -147,11 +147,11 @@
             "osx": {
                 "type": "lldb",
                 "MIMode": "lldb",
-                "program": "${workspaceFolder}/plugin/build/TapeLooperPlugin_artefacts/Debug/Standalone/Tape Looper Plugin.app/Contents/MacOS/Tape Looper Plugin",
+                "program": "${workspaceFolder}/plugin/build/TapeLooperPlugin_artefacts/Standalone/Tape Looper Plugin.app/Contents/MacOS/Tape Looper Plugin",
             },
             "windows": {
                 "MIMode": "gdb",
-                "program": "${workspaceFolder}/plugin/build/TapeLooperPlugin_artefacts/Debug/Standalone/Tape Looper Plugin.exe",
+                "program": "${workspaceFolder}/plugin/build/TapeLooperPlugin_artefacts/Standalone/Tape Looper Plugin.exe",
             }
         }
     ]

dsp/CMakeLists.txt

@@ -14,17 +14,21 @@ set(HEADER_FILES
     src/util/Memory.h
 )
 
-add_subdirectory(lib/sprout)
+add_subdirectory(lib/gcem)
 
 add_library(${TARGET}
     src/dsp/DspHelpers.cpp
 )
 target_include_directories(${TARGET} INTERFACE
     src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/sprout/
-) 
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/gcem/include/
+)
 target_include_directories(${TARGET} PRIVATE
     src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/sprout/
-) 
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/gcem/include
+)
+target_compile_definitions(${TARGET}
+PUBLIC
+    _USE_MATH_DEFINES
+)
 set_property(TARGET tapeLooperDsp PROPERTY CXX_STANDARD 17)