comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-29 23:28:39 -05:00
Code Issues Projects Releases Wiki Activity

UPGRADE_cleanup: removal of ENABLE_LIQUID_EXPERIMENTAL conditionals because the features are now in mainline liquid v1.30

Browse Source
This commit is contained in:
vsonnier 2017-01-13 22:01:06 +01:00
parent 02cf6fbe4b
commit 7ab2b08e7d
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -76,16 +76,6 @@ IF(ENABLE_DIGITAL_LAB)
ADD_DEFINITIONS( ADD_DEFINITIONS(
-DENABLE_DIGITAL_LAB=1 -DENABLE_DIGITAL_LAB=1
) )
IF(MSVC)
SET (ENABLE_LIQUID_EXPERIMENTAL OFF CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)")
ELSE()
SET (ENABLE_LIQUID_EXPERIMENTAL ON CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)")
ENDIF()
IF(ENABLE_LIQUID_EXPERIMENTAL)
ADD_DEFINITIONS(
-DENABLE_LIQUID_EXPERIMENTAL=1
)
ENDIF()
ENDIF() ENDIF()
set(USE_HAMLIB OFF CACHE BOOL "Support hamlib for radio control functions.") set(USE_HAMLIB OFF CACHE BOOL "Support hamlib for radio control functions.")
@ -385,14 +375,9 @@ IF(ENABLE_DIGITAL_LAB)
src/modules/modem/digital/ModemSQAM.cpp src/modules/modem/digital/ModemSQAM.cpp
src/modules/modem/digital/ModemQAM.cpp src/modules/modem/digital/ModemQAM.cpp
src/modules/modem/digital/ModemQPSK.cpp src/modules/modem/digital/ModemQPSK.cpp
)
IF(ENABLE_LIQUID_EXPERIMENTAL)
SET (cubicsdr_sources
${cubicsdr_sources}
src/modules/modem/digital/ModemFSK.cpp src/modules/modem/digital/ModemFSK.cpp
) )
ENDIF() ENDIF()
ENDIF()
SET (cubicsdr_headers SET (cubicsdr_headers
src/CubicSDRDefs.h src/CubicSDRDefs.h
@ -506,14 +491,9 @@ SET (cubicsdr_headers
src/modules/modem/digital/ModemSQAM.h src/modules/modem/digital/ModemSQAM.h
src/modules/modem/digital/ModemQAM.h src/modules/modem/digital/ModemQAM.h
src/modules/modem/digital/ModemQPSK.h src/modules/modem/digital/ModemQPSK.h
)
IF(ENABLE_LIQUID_EXPERIMENTAL)
SET (cubicsdr_sources
${cubicsdr_sources}
src/modules/modem/digital/ModemFSK.h src/modules/modem/digital/ModemFSK.h
) )
ENDIF() ENDIF()
ENDIF()
IF (USE_HAMLIB) IF (USE_HAMLIB)

2
src/CubicSDR.cpp
View File

@ -270,9 +270,7 @@ bool CubicSDR::OnInit() {
Modem::addModemFactory(ModemASK::factory, "ASK", 200000); Modem::addModemFactory(ModemASK::factory, "ASK", 200000);
Modem::addModemFactory(ModemBPSK::factory, "BPSK", 200000); Modem::addModemFactory(ModemBPSK::factory, "BPSK", 200000);
Modem::addModemFactory(ModemDPSK::factory, "DPSK", 200000); Modem::addModemFactory(ModemDPSK::factory, "DPSK", 200000);
#if ENABLE_LIQUID_EXPERIMENTAL
Modem::addModemFactory(ModemFSK::factory, "FSK", 19200); Modem::addModemFactory(ModemFSK::factory, "FSK", 19200);
#endif
Modem::addModemFactory(ModemGMSK::factory, "GMSK", 19200); Modem::addModemFactory(ModemGMSK::factory, "GMSK", 19200);
Modem::addModemFactory(ModemOOK::factory, "OOK", 200000); Modem::addModemFactory(ModemOOK::factory, "OOK", 200000);
Modem::addModemFactory(ModemPSK::factory, "PSK", 200000); Modem::addModemFactory(ModemPSK::factory, "PSK", 200000);

2
src/CubicSDR.h
View File

@ -44,9 +44,7 @@
#include "ModemASK.h" #include "ModemASK.h"
#include "ModemBPSK.h" #include "ModemBPSK.h"
#include "ModemDPSK.h" #include "ModemDPSK.h"
#if ENABLE_LIQUID_EXPERIMENTAL
#include "ModemFSK.h" #include "ModemFSK.h"
#endif
#include "ModemGMSK.h" #include "ModemGMSK.h"
#include "ModemOOK.h" #include "ModemOOK.h"
#include "ModemPSK.h" #include "ModemPSK.h"