Skip to content

Commit

Permalink
Bump RF24Mesh from 7c30deb to 8f030b4 (#67)
Browse files Browse the repository at this point in the history
* Bump RF24Mesh from `7c30deb` to `8f030b4`

Bumps [RF24Mesh](https://github.com/nRF24/RF24Mesh) from `7c30deb` to `8f030b4`.
- [Release notes](https://github.com/nRF24/RF24Mesh/releases)
- [Commits](nRF24/RF24Mesh@7c30deb...8f030b4)

---
updated-dependencies:
- dependency-name: RF24Mesh
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* update RF24Mesh debug toggle options

* update README

* group dependabot updates to RF24 submodules in 1 PR

Explicitly ignore pybind11 updates.
This prevents dependabot from trying to
merge un-released updates from pybind11 repo.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brendan <2bndy5@gmail.com>
  • Loading branch information
dependabot[bot] and 2bndy5 authored Jun 16, 2024
1 parent 4465e0f commit 9041e90
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion RF24Mesh
16 changes: 8 additions & 8 deletions cmake/using_flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9041e90

Please sign in to comment.