Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GNU Octave plug-in upgrade #55

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

GNU Octave plug-in upgrade #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40e48d8
octave: reenable compilation
DominykasPetke Jun 13, 2024
1508e70
octave: slight file cleanup
DominykasPetke Jun 13, 2024
c580724
octave: enable clang-format
DominykasPetke Jun 13, 2024
9401edf
octave: quick clang-tidy on this
DominykasPetke Jun 13, 2024
797f0ba
Add and implement `EnableTxWaveform`
DominykasPetke Jun 13, 2024
ce09a82
Upgrade Octave plug-in to new API
DominykasPetke Jun 14, 2024
5541529
Default no channel entered to 0
DominykasPetke Jun 14, 2024
139e5d1
Clarify a ternary operator
DominykasPetke Jun 14, 2024
a9a89bd
octave: Fix limesuiteng not installed CMakeFile
DominykasPetke Jun 14, 2024
2284cd8
Add Octave dependency to GH Actions run on Linux to build it as well
DominykasPetke Jun 14, 2024
0da4186
Fix clang-format to not format .m files
DominykasPetke Jun 14, 2024
c3c76ee
Use the newer name of the dependency
DominykasPetke Jun 14, 2024
0e642d7
Some minor clang-tidy improvements
DominykasPetke Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
sudo add-apt-repository ppa:gnuradio/gnuradio-releases
sudo apt-get update
sudo apt-get install -qq gnuradio-dev python3-packaging
sudo apt-get install -qq libusb-1.0-0-dev libwxbase3.0-dev libwxgtk3.0-gtk3-dev libsoapysdr-dev
sudo apt-get install -qq libusb-1.0-0-dev libwxbase3.0-dev libwxgtk3.0-gtk3-dev libsoapysdr-dev octave-dev

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp }} -DCMAKE_C_COMPILER=${{ matrix.compiler.c }} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{env.CMAKE_OPTIONS}}
Expand Down
2 changes: 1 addition & 1 deletion plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Octave plugin integration
########################################################################
add_subdirectory(amarisoft-plugin)
# add_subdirectory(octave)
add_subdirectory(octave)

########################################################################
## freedesktop environment integration
Expand Down
10 changes: 5 additions & 5 deletions plugins/octave/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
########################################################################
find_program(OCTAVE_CONFIG_EXECUTABLE NAMES octave-config)
if(NOT OCTAVE_CONFIG_EXECUTABLE)
message(STATUS "octave-config not found (need liboctave-dev), disabling LimeSuiteOctave")
message(STATUS "octave-config not found (need octave-dev), disabling LimeSuiteOctave")
else()
execute_process(
COMMAND ${OCTAVE_CONFIG_EXECUTABLE} -p BINDIR
Expand Down Expand Up @@ -33,9 +33,9 @@ endif()
add_custom_command(
OUTPUT LimeSuiteNG.oct LimeSuiteNG.o ALL
COMMAND
${OCTAVE_MKOCTFILE_EXECUTABLE} ARGS -I${PROJECT_SOURCE_DIR}/include/limesuiteng ${CMAKE_CURRENT_SOURCE_DIR}/LimeSuiteNG.cc
-L$<TARGET_FILE_DIR:LimeSuiteNG> -llimesuiteng
COMMENT "Building LimeSuite Octave plugin"
${OCTAVE_MKOCTFILE_EXECUTABLE} ARGS -std=c++17 -I${PROJECT_SOURCE_DIR}/src/include
${CMAKE_CURRENT_SOURCE_DIR}/LimeSuiteNG.cc -L$<TARGET_FILE_DIR:limesuiteng> -llimesuiteng
COMMENT "Building LimeSuiteNG Octave plugin"
DEPENDS limesuiteng)
add_custom_target(LimeSuiteNGOctave ALL DEPENDS LimeSuiteNG.oct)

Expand All @@ -44,7 +44,7 @@ execute_process(
COMMAND ${OCTAVE_CONFIG_EXECUTABLE} --m-site-dir
OUTPUT_VARIABLE OCTAVE_SCRIPTS_PATHS
OUTPUT_STRIP_TRAILING_WHITESPACE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LoadLimeSuite.m DESTINATION ${OCTAVE_SCRIPTS_PATHS})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/loader/LoadLimeSuiteNG.m DESTINATION ${OCTAVE_SCRIPTS_PATHS})

#install dynamic library
execute_process(
Expand Down
Loading