diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6386396..5e1f2f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,12 @@ updates: directory: "/" # Location of .gitmodules file schedule: interval: "weekly" + ignore: + - dependency-name: "pybind11" + groups: + actions: + patterns: + - "RF24*" - package-ecosystem: "github-actions" # Workflow files stored in the # default location of `.github/workflows` diff --git a/README.rst b/README.rst index 08c63c7..9833290 100644 --- a/README.rst +++ b/README.rst @@ -41,7 +41,7 @@ diagrams). The following table shows the default pins used in all the SCK, "GPIO11 (SCK)" MOSI, "GPIO10 (MOSI)" MISO, "GPIO9 (MISO)" - IRQ, GPIO12 + IRQ, GPIO24 The IRQ pin is not typically connected, and it is only used in the interrupt_configure example. @@ -196,7 +196,7 @@ then it is necessary to use an environment variable containing additional argume .. code-block:: bash - export CMAKE_ARGS="-DMESH_DEBUG=ON -DSERIAL_DEBUG=ON" + export CMAKE_ARGS="-DRF24MESH_DEBUG=ON -DRF24NETWORK_DEBUG=ON" Then just build and install the package from source as usual. diff --git a/RF24Mesh b/RF24Mesh index 7c30deb..8f030b4 160000 --- a/RF24Mesh +++ b/RF24Mesh @@ -1 +1 @@ -Subproject commit 7c30debee4b91d63c27847213eaf10d413a10212 +Subproject commit 8f030b4e57248a9636d87135db02989823193ee5 diff --git a/cmake/using_flags.cmake b/cmake/using_flags.cmake index 0aaa7a5..3d31207 100644 --- a/cmake/using_flags.cmake +++ b/cmake/using_flags.cmake @@ -33,8 +33,8 @@ option(DISABLE_DYNAMIC_PAYLOADS "force usage of static payload size for RF24Netw # ## RF24Mesh specific options option(MESH_NOMASTER "exclude compiling code that is strictly for master nodes for RF24Mesh lib" OFF) -option(MESH_DEBUG "enable/disable debugging output for RF24Mesh lib" OFF) -option(MESH_DEBUG_MINIMAL "enable/disable minimal debugging output for RF24Mesh lib" OFF) +option(RF24MESH_DEBUG "enable/disable debugging output for RF24Mesh lib" OFF) +option(RF24MESH_DEBUG_MINIMAL "enable/disable minimal debugging output for RF24Mesh lib" OFF) # ### options with default values: @@ -120,14 +120,14 @@ function(apply_flags target) target_compile_definitions(${target} PUBLIC MESH_NOMASTER) endif() - if(MESH_DEBUG) - message(STATUS "MESH_DEBUG asserted for ${target}") - target_compile_definitions(${target} PUBLIC MESH_DEBUG) + if(RF24MESH_DEBUG) + message(STATUS "RF24MESH_DEBUG asserted for ${target}") + target_compile_definitions(${target} PUBLIC RF24MESH_DEBUG) endif() - if(MESH_DEBUG_MINIMAL) - message(STATUS "MESH_DEBUG_MINIMAL asserted for ${target}") - target_compile_definitions(${target} PUBLIC MESH_DEBUG_MINIMAL) + if(RF24MESH_DEBUG_MINIMAL) + message(STATUS "RF24MESH_DEBUG_MINIMAL asserted for ${target}") + target_compile_definitions(${target} PUBLIC RF24MESH_DEBUG_MINIMAL) endif() # for the following, we let the default be configured in source code