Merge pull request #257 from rerdavies/dev

v1.3.69 dev merge.
rerdavies · Nov 23, 2024 · 138e8d7 · 138e8d7
2 parents 52dbad5 + 2ba440c
commit 138e8d7
Show file tree

Hide file tree

Showing 72 changed files with 1,669 additions and 982 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -7,6 +7,7 @@
                 "${workspaceFolder}",
                 "${workspaceFolder}/src",
                 "/usr/include/lilv-0",
+                "/usr/include/x86_64-linux-gnu",
                 "/usr/lib",
                 "~/src/vst3sdk"
             ],
@@ -16,6 +17,24 @@
             "intelliSenseMode": "linux-gcc-arm64",
             "compileCommands": "${workspaceFolder}/build/compile_commands.json",
             "configurationProvider": "ms-vscode.cmake-tools"
+        },
+        {
+            "name": "Linux x86_64",
+            "includePath": [
+                "${default}",
+                "${workspaceFolder}",
+                "${workspaceFolder}/src",
+                "/usr/include/x86_64-linux-gnu",
+                "/usr/include/lilv-0",
+                "/usr/lib"
+            ],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c17",
+            "cppStandard": "c++20",
+            "intelliSenseMode": "linux-gcc-x64",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json",
+            "configurationProvider": "ms-vscode.cmake-tools",
+            "mergeConfigurations": true
         }
     ],
     "version": 4

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -137,7 +137,8 @@
                 //"[json_variants]"  // subtest of your choice, or none to run all of the tests.
                 //"[inverting_mutex_test]"
                 // "[utf8_to_utf32]"
-                "[pipedal_alsa_test]"
+                //"[pipedal_alsa_test]"
+                "[wifi_channels_test]"
             ],
 
             "stopAtEntry": false,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.3.67
+    VERSION 1.3.69
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
 
 EXECUTE_PROCESS( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE )
 
-set (DISPLAY_VERSION "PiPedal v1.3.67-Experimetnal")
+set (DISPLAY_VERSION "PiPedal v1.3.69-Release")
 set (PACKAGE_ARCHITECTURE ${DEBIAN_ARCHITECTURE})
 set (CMAKE_INSTALL_PREFIX "/usr/")
 
@@ -104,7 +104,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IoT guitar effect pedal for Raspberry Pi"
 set(CPACK_DEBIAN_PACKAGE_SECTION sound)
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "lv2-dev, authbind, gpg" )
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "lv2-dev, authbind, curl, gpg" )
 set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})

diff --git a/PiPedalCommon/src/CMakeLists.txt b/PiPedalCommon/src/CMakeLists.txt
@@ -27,12 +27,12 @@ endif()
 # endif()
 
 # nlgenl-3 library.
-execute_process(COMMAND ls /usr/include/libnl3/netlink/netlink.h RESULT_VARIABLE LNL3_MISSING OUTPUT_QUIET ERROR_QUIET)
-if(LNL3_MISSING)
-    message(ERROR " Need to: sudo apt install libnl-3-dev libnl-genl-3-dev ")
-endif()
-set(LIBNL3_INCLUDE_DIRS /usr/include/libnl3)
-set(LIBNL3_LIBRARIES nl-3 nl-genl-3)
+# execute_process(COMMAND ls /usr/include/libnl3/netlink/netlink.h RESULT_VARIABLE LNL3_MISSING OUTPUT_QUIET ERROR_QUIET)
+# if(LNL3_MISSING)
+#     message(ERROR " Need to: sudo apt install libnl-3-dev libnl-genl-3-dev ")
+# endif()
+# set(LIBNL3_INCLUDE_DIRS /usr/include/libnl3)
+# set(LIBNL3_LIBRARIES nl-3 nl-genl-3)