Skip to content

Commit

Permalink
supplement SPIDEV & RPi drivers with copy of linux/gpio.h
Browse files Browse the repository at this point in the history
- updates RF24 submodule to nRF24/RF24@af7fbec
- check in copy of linux/gpio.h (& exclude from clang-format checks)
- adjust root CMakeLists.txt to supplement build with linux/gpio.h (only for SPIDEV & RPi drivers)
  • Loading branch information
2bndy5 committed Mar 23, 2024
1 parent 8a520e7 commit 3731a85
Show file tree
Hide file tree
Showing 4 changed files with 554 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ jobs:
--style=file \
--tidy-checks='-*' \
--lines-changed-only=true \
--ignore='!src|' \
--ignore='src/linux/gpio.h' \
--format-review=true \
--file-annotations=false
--file-annotations=false \
--step-summary=true
- name: C++ Linter checks failed?
if: steps.linter.outputs.checks-failed > 0
Expand Down
20 changes: 19 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,26 @@ if(NOT "${RF24_LINKED_DRIVER}" STREQUAL "")
message(STATUS "Linking to utility driver '${RF24_LINKED_DRIVER}'")
endif()

################################# RF24 #############################
# suplement our copy of linux/gpio.h into SPIDEV & RPi driver sources
set(SUPPLEMEN_LINUX_GPIO_H FALSE)
if("${RF24_DRIVER}" STREQUAL "RPi" OR "${RF24_DRIVER}" STREQUAL "SPIDEV")
set(SUPPLEMEN_LINUX_GPIO_H TRUE)
message(STATUS "Supplementing ${RF24_DRIVER} driver with linux/gpio.h")
# file(COPY src/linux/gpio.h DESTINATION RF24/utility/${RF24_DRIVER}/linux)
list(APPEND RF24_DRIVER_SOURCES src/linux/gpio.h)
endif()

################################# RF24 #############################
set(CMAKE_VERBOSE_MAKEFILE ON)
pybind11_add_module(rf24 src/pyRF24.cpp)
target_include_directories(rf24 PUBLIC
RF24
RF24/utility
RF24/utility/${RF24_DRIVER}
)
if(SUPPLEMEN_LINUX_GPIO_H)
target_include_directories(rf24 PUBLIC src)
endif()
target_sources(rf24 PUBLIC
${CMAKE_CURRENT_LIST_DIR}/RF24/RF24.h
${CMAKE_CURRENT_LIST_DIR}/RF24/RF24.cpp
Expand All @@ -44,6 +56,9 @@ target_include_directories(rf24_network PUBLIC
RF24/utility
RF24/utility/${RF24_DRIVER}
)
if(SUPPLEMEN_LINUX_GPIO_H)
target_include_directories(rf24_network PUBLIC src)
endif()
# don't let source look for an installed RF24 lib
target_compile_definitions(rf24_network PUBLIC USE_RF24_LIB_SRC)
target_sources(rf24_network PUBLIC
Expand All @@ -69,6 +84,9 @@ target_include_directories(rf24_mesh PUBLIC
RF24/utility
RF24/utility/${RF24_DRIVER}
)
if(SUPPLEMEN_LINUX_GPIO_H)
target_include_directories(rf24_mesh PUBLIC src)
endif()
# don't let source look for an installed RF24 lib
target_compile_definitions(rf24_mesh PUBLIC USE_RF24_LIB_SRC)
target_sources(rf24_mesh PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion RF24
Submodule RF24 updated 65 files
+20 −17 .github/workflows/build_linux.yml
+2 −1 .gitignore
+6 −4 CMakeLists.txt
+2 −8 Makefile
+3 −26 configure
+31 −21 examples/InterruptConfigure/InterruptConfigure.ino
+143 −58 examples/scanner/scanner.ino
+323 −0 examples/scannerGraphic/scannerGraphic.ino
+32 −18 examples_linux/CMakeLists.txt
+1 −1 examples_linux/Makefile
+2 −0 examples_linux/Makefile.examples
+2 −0 examples_linux/acknowledgementPayloads.cpp
+2 −0 examples_linux/gettingstarted.cpp
+26 −17 examples_linux/interruptConfigure.cpp
+2 −0 examples_linux/manualAcknowledgements.cpp
+2 −0 examples_linux/multiceiverDemo.cpp
+20 −0 examples_linux/ncurses/CMakeLists.txt
+341 −0 examples_linux/ncurses/scanner_curses.cpp
+1 −1 examples_linux/readme.md
+119 −51 examples_linux/scanner.cpp
+205 −87 examples_linux/scanner.py
+2 −0 examples_linux/streamingData.cpp
+19 −5 examples_pico/interruptConfigure.cpp
+133 −52 examples_pico/scanner.cpp
+1 −10 pyRF24/setup.py
+22 −52 utility/CMakeLists.txt
+3 −10 utility/MRAA/RF24_arch_config.h
+1 −9 utility/MRAA/compatibility.cpp
+0 −3 utility/MRAA/compatibility.h
+1 −3 utility/MRAA/gpio.h
+0 −1 utility/MRAA/spi.h
+11 −7 utility/RPi/RF24_arch_config.h
+9 −1 utility/RPi/compatibility.cpp
+2 −3 utility/RPi/compatibility.h
+2 −3 utility/RPi/includes.h
+193 −11 utility/RPi/interrupt.cpp
+72 −33 utility/RPi/interrupt.h
+4 −8 utility/SPIDEV/RF24_arch_config.h
+11 −7 utility/SPIDEV/compatibility.cpp
+0 −3 utility/SPIDEV/compatibility.h
+147 −59 utility/SPIDEV/gpio.cpp
+41 −8 utility/SPIDEV/gpio.h
+1 −3 utility/SPIDEV/includes.h
+170 −10 utility/SPIDEV/interrupt.cpp
+47 −33 utility/SPIDEV/interrupt.h
+35 −50 utility/SPIDEV/spi.cpp
+4 −2 utility/SPIDEV/spi.h
+2 −4 utility/Template/compatibility.h
+2 −2 utility/Template/includes.h
+4 −19 utility/Template/spi.h
+6 −9 utility/pigpio/RF24_arch_config.h
+3 −7 utility/pigpio/compatibility.cpp
+5 −13 utility/pigpio/compatibility.h
+1 −2 utility/pigpio/gpio.cpp
+5 −25 utility/pigpio/gpio.h
+4 −5 utility/pigpio/includes.h
+13 −6 utility/pigpio/interrupt.cpp
+14 −37 utility/pigpio/interrupt.h
+1 −1 utility/pigpio/spi.cpp
+4 −25 utility/pigpio/spi.h
+3 −6 utility/wiringPi/RF24_arch_config.h
+2 −11 utility/wiringPi/includes.h
+14 −0 utility/wiringPi/interrupt.h
+29 −36 utility/wiringPi/spi.cpp
+18 −6 utility/wiringPi/spi.h
Loading

0 comments on commit 3731a85

Please sign in to comment.