M17_Project
/
gr-m17
mirror of https://github.com/M17-Project/gr-m17.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update to match new lib structure

main
Jean-Michel Friedt 2024-01-27 08:16:28 +01:00
parent 4ab235f908
commit 0158cab22e
4 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/CMakeLists.txt
View File

@ -14,19 +14,19 @@ include(GrPlatform) #define LIB_SUFFIX
list(APPEND m17_sources
m17_coder_impl.cc
m17_decoder_impl.cc
../M17_Implementations/SP5WWP/lib/lib.c
../M17_Implementations/SP5WWP/lib/decode/symbols.c
../M17_Implementations/SP5WWP/lib/decode/viterbi.c
../M17_Implementations/SP5WWP/lib/encode/symbols.c
../M17_Implementations/SP5WWP/lib/encode/convol.c
../M17_Implementations/SP5WWP/lib/math/golay.c
../M17_Implementations/SP5WWP/lib/math/math.c
../M17_Implementations/SP5WWP/lib/math/rrc.c
../M17_Implementations/SP5WWP/lib/payload/call.c
../M17_Implementations/SP5WWP/lib/payload/crc.c
../M17_Implementations/SP5WWP/lib/phy/interleave.c
../M17_Implementations/SP5WWP/lib/phy/randomize.c
../M17_Implementations/SP5WWP/lib/phy/sync.c
../M17_Implementations/libm17/m17.c
../M17_Implementations/libm17/decode/symbols.c
../M17_Implementations/libm17/decode/viterbi.c
../M17_Implementations/libm17/encode/symbols.c
../M17_Implementations/libm17/encode/convol.c
../M17_Implementations/libm17/math/golay.c
../M17_Implementations/libm17/math/math.c
../M17_Implementations/libm17/math/rrc.c
../M17_Implementations/libm17/payload/call.c
../M17_Implementations/libm17/payload/crc.c
../M17_Implementations/libm17/phy/interleave.c
../M17_Implementations/libm17/phy/randomize.c
../M17_Implementations/libm17/phy/sync.c
)
set(m17_sources "${m17_sources}" PARENT_SCOPE)
@ -39,7 +39,7 @@ add_library(gnuradio-m17 SHARED ${m17_sources})
target_link_libraries(gnuradio-m17 gnuradio::gnuradio-runtime)
target_include_directories(gnuradio-m17
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../M17_Implementations/SP5WWP/lib>
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../M17_Implementations/libm17/>
PUBLIC $<INSTALL_INTERFACE:include>
)
set_target_properties(gnuradio-m17 PROPERTIES DEFINE_SYMBOL "gnuradio_m17_EXPORTS")

11
lib/m17_coder_impl.cc
View File

@ -30,16 +30,7 @@
#include <stdint.h>
#include <unistd.h>
#include "../M17_Implementations/SP5WWP/lib/lib.h"
#include "../M17_Implementations/SP5WWP/lib/math/golay.h"
#include "../M17_Implementations/SP5WWP/lib/payload/crc.h"
#include "../M17_Implementations/SP5WWP/lib/encode/symbols.h"
#include "../M17_Implementations/SP5WWP/lib/phy/sync.h"
#include "../M17_Implementations/SP5WWP/lib/encode/convol.h"
#include "../M17_Implementations/SP5WWP/lib/payload/call.h"
#include "../M17_Implementations/SP5WWP/lib/payload/lsf.h"
#include "../M17_Implementations/SP5WWP/lib/phy/interleave.h"
#include "../M17_Implementations/SP5WWP/lib/phy/randomize.h"
#include "m17.h"
namespace gr {
namespace m17 {

14
lib/m17_decoder_impl.cc
View File

@ -31,19 +31,7 @@
#include <stdint.h>
#include <string.h>
#include "../M17_Implementations/SP5WWP/lib/lib.h"
#include "../M17_Implementations/SP5WWP/lib/math/golay.h"
#include "../M17_Implementations/SP5WWP/lib/payload/crc.h"
#include "../M17_Implementations/SP5WWP/lib/payload/call.h"
#include "../M17_Implementations/SP5WWP/lib/phy/sync.h"
#include "../M17_Implementations/SP5WWP/lib/decode/viterbi.h"
#include "../M17_Implementations/SP5WWP/lib/payload/lsf.h"
#include "../M17_Implementations/SP5WWP/lib/phy/interleave.h"
#include "../M17_Implementations/SP5WWP/lib/phy/randomize.h"
#include "../M17_Implementations/SP5WWP/lib/decode/symbols.h"
#include "../M17_Implementations/SP5WWP/lib/encode/symbols.h"
#include "../M17_Implementations/SP5WWP/lib/encode/convol.h"
#include "../M17_Implementations/SP5WWP/lib/math/math.h"
#include "m17.h"
#define DECODE_CALLSIGNS
//#define SHOW_VITERBI_ERRS

7
lib/m17_decoder_impl.h
View File

@ -9,12 +9,7 @@
#define INCLUDED_M17_M17_DECODER_IMPL_H
#include <gnuradio/m17/m17_decoder.h>
#include "../M17_Implementations/SP5WWP/lib/lib.h"
//#include "../M17_Implementations/SP5WWP/inc/m17.h"
//#include "../M17_Implementations/SP5WWP/m17-decoder/golay.h"
//#include "../M17_Implementations/SP5WWP/m17-decoder/viterbi.h"
//#include "../M17_Implementations/SP5WWP/m17-decoder/crc.h"
#include "m17.h"
namespace gr {
namespace m17 {