Browse Source

M17 code reorganization

chirpmodem-v8.0.0
f4exb 4 years ago
parent
commit
ac2a45ce88
  1. 5
      CMakeLists.txt
  2. 10
      exports/export.h
  3. 56
      modemm17/CMakeLists.txt
  4. 0
      modemm17/CRC16.h
  5. 0
      modemm17/CarrierDetect.h
  6. 0
      modemm17/ClockRecovery.h
  7. 0
      modemm17/Convolution.h
  8. 0
      modemm17/Correlator.cpp
  9. 2
      modemm17/Correlator.h
  10. 0
      modemm17/DataCarrierDetect.h
  11. 0
      modemm17/DeviationError.h
  12. 0
      modemm17/Filter.h
  13. 0
      modemm17/FirFilter.h
  14. 0
      modemm17/FreqDevEstimator.cpp
  15. 2
      modemm17/FreqDevEstimator.h
  16. 0
      modemm17/FrequencyError.h
  17. 0
      modemm17/Fsk4Demod.h
  18. 0
      modemm17/Golay24.cpp
  19. 2
      modemm17/Golay24.h
  20. 0
      modemm17/IirFilter.h
  21. 0
      modemm17/LinkSetupFrame.h
  22. 0
      modemm17/M17Demodulator.cpp
  23. 2
      modemm17/M17Demodulator.h
  24. 0
      modemm17/M17FrameDecoder.h
  25. 0
      modemm17/M17Framer.h
  26. 0
      modemm17/M17Modulator.cpp
  27. 0
      modemm17/M17Modulator.h
  28. 0
      modemm17/M17Randomizer.h
  29. 0
      modemm17/M17Synchronizer.h
  30. 0
      modemm17/PhaseEstimator.h
  31. 0
      modemm17/PolynomialInterleaver.h
  32. 0
      modemm17/SlidingDFT.h
  33. 0
      modemm17/SymbolEvm.h
  34. 4
      modemm17/Trellis.h
  35. 5
      modemm17/Util.h
  36. 0
      modemm17/Viterbi.h
  37. 0
      modemm17/ax25_frame.h
  38. 0
      modemm17/queue.h
  39. 56
      modems/CMakeLists.txt
  40. 2
      plugins/channelrx/CMakeLists.txt
  41. 4
      plugins/channelrx/demodm17/CMakeLists.txt
  42. 2
      plugins/channelrx/demodm17/m17demodprocessor.cpp
  43. 2
      plugins/channelrx/demodm17/m17demodprocessor.h
  44. 2
      plugins/channeltx/CMakeLists.txt
  45. 4
      plugins/channeltx/modm17/CMakeLists.txt
  46. 2
      plugins/channeltx/modm17/m17modprocessor.cpp
  47. 2
      plugins/channeltx/modm17/m17modprocessor.h

5
CMakeLists.txt

@ -549,10 +549,7 @@ add_subdirectory(qrtplib) @@ -549,10 +549,7 @@ add_subdirectory(qrtplib)
add_subdirectory(swagger)
add_subdirectory(devices)
add_subdirectory(sdrbench)
if (LINUX)
add_subdirectory(modems)
endif()
add_subdirectory(modemm17)
if (BUILD_GUI)
add_subdirectory(sdrgui)

10
exports/export.h

@ -139,16 +139,16 @@ @@ -139,16 +139,16 @@
# define SDRBENCH_API
#endif
/* the 'M17_API' controls the import/export of 'm17' symbols
/* the 'MODEMM17_API' controls the import/export of 'modemm17' symbols
*/
#if !defined(sdrangel_STATIC)
# ifdef m17_EXPORTS
# define M17_API __SDR_EXPORT
# ifdef modemm17_EXPORTS
# define MODEMM17_API __SDR_EXPORT
# else
# define M17_API __SDR_IMPORT
# define MODEMM17_API __SDR_IMPORT
# endif
#else
# define M17_API
# define MODEMM17_API
#endif
#endif /* __SDRANGEL_EXPORT_H */

56
modemm17/CMakeLists.txt

@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
project(modemm17)
set(modemm17_SOURCES
Correlator.cpp
FreqDevEstimator.cpp
Golay24.cpp
M17Demodulator.cpp
M17Modulator.cpp
)
set(modemm17_HEADERS
ax25_frame.h
CarrierDetect.h
ClockRecovery.h
Convolution.h
Correlator.h
CRC16.h
DataCarrierDetect.h
DeviationError.h
Filter.h
FirFilter.h
FreqDevEstimator.h
FrequencyError.h
Fsk4Demod.h
Golay24.h
IirFilter.h
LinkSetupFrame.h
M17Demodulator.h
M17FrameDecoder.h
M17Framer.h
M17Modulator.h
M17Randomizer.h
M17Synchronizer.h
PhaseEstimator.h
PolynomialInterleaver.h
queue.h
SlidingDFT.h
SymbolEvm.h
Trellis.h
Util.h
Viterbi.h
)
include_directories(
${CMAKE_SOURCE_DIR}/exports
)
add_library(modemm17 SHARED
${modemm17_SOURCES}
)
target_link_libraries(modemm17
Qt5::Core
)
install(TARGETS modemm17 DESTINATION ${INSTALL_LIB_DIR})

0
modems/m17/CRC16.h → modemm17/CRC16.h

0
modems/m17/CarrierDetect.h → modemm17/CarrierDetect.h

0
modems/m17/ClockRecovery.h → modemm17/ClockRecovery.h

0
modems/m17/Convolution.h → modemm17/Convolution.h

0
modems/m17/Correlator.cpp → modemm17/Correlator.cpp

2
modems/m17/Correlator.h → modemm17/Correlator.h

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
namespace modemm17 {
struct M17_API Correlator
struct MODEMM17_API Correlator
{
static constexpr size_t SYMBOLS = 8;
static constexpr size_t SAMPLES_PER_SYMBOL = 10;

0
modems/m17/DataCarrierDetect.h → modemm17/DataCarrierDetect.h

0
modems/m17/DeviationError.h → modemm17/DeviationError.h

0
modems/m17/Filter.h → modemm17/Filter.h

0
modems/m17/FirFilter.h → modemm17/FirFilter.h

0
modems/m17/FreqDevEstimator.cpp → modemm17/FreqDevEstimator.cpp

2
modems/m17/FreqDevEstimator.h → modemm17/FreqDevEstimator.h

@ -26,7 +26,7 @@ namespace modemm17 { @@ -26,7 +26,7 @@ namespace modemm17 {
* Estimates are expected to be updated at each sync word. But they can
* be updated more frequently, such as during the preamble.
*/
class M17_API FreqDevEstimator
class MODEMM17_API FreqDevEstimator
{
using sample_filter_t = BaseIirFilter<3>;

0
modems/m17/FrequencyError.h → modemm17/FrequencyError.h

0
modems/m17/Fsk4Demod.h → modemm17/Fsk4Demod.h

0
modems/m17/Golay24.cpp → modemm17/Golay24.cpp

2
modems/m17/Golay24.h → modemm17/Golay24.h

@ -81,7 +81,7 @@ constexpr array<T, N> sort(array<T, N> array) @@ -81,7 +81,7 @@ constexpr array<T, N> sort(array<T, N> array)
} // Golay24_detail
struct M17_API Golay24
struct MODEMM17_API Golay24
{
#pragma pack(push, 1)
struct SyndromeMapEntry

0
modems/m17/IirFilter.h → modemm17/IirFilter.h

0
modems/m17/LinkSetupFrame.h → modemm17/LinkSetupFrame.h

0
modems/m17/M17Demodulator.cpp → modemm17/M17Demodulator.cpp

2
modems/m17/M17Demodulator.h → modemm17/M17Demodulator.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
namespace modemm17 {
struct M17_API M17Demodulator
struct MODEMM17_API M17Demodulator
{
static const uint16_t SAMPLE_RATE = 48000;
static const uint16_t SYMBOL_RATE = 4800;

0
modems/m17/M17FrameDecoder.h → modemm17/M17FrameDecoder.h

0
modems/m17/M17Framer.h → modemm17/M17Framer.h

0
modems/m17/M17Modulator.cpp → modemm17/M17Modulator.cpp

0
modems/m17/M17Modulator.h → modemm17/M17Modulator.h

0
modems/m17/M17Randomizer.h → modemm17/M17Randomizer.h

0
modems/m17/M17Synchronizer.h → modemm17/M17Synchronizer.h

0
modems/m17/PhaseEstimator.h → modemm17/PhaseEstimator.h

0
modems/m17/PolynomialInterleaver.h → modemm17/PolynomialInterleaver.h

0
modems/m17/SlidingDFT.h → modemm17/SlidingDFT.h

0
modems/m17/SymbolEvm.h → modemm17/SymbolEvm.h

4
modems/m17/Trellis.h → modemm17/Trellis.h

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
namespace modemm17
{
inline constexpr std::array<int8_t, 61> make_p1() {
inline std::array<int8_t, 61> make_p1() {
std::array<int8_t, 61> result{};
for (size_t i = 0, j = 2; i != 61; ++i) {
if (i == j) {
@ -107,7 +107,7 @@ struct CostTable @@ -107,7 +107,7 @@ struct CostTable
using cost_table_t = std::array<std::array<uint8_t, InputValues>, K>;
template <typename Trellis_>
static constexpr cost_table_t makeCostTable(const Trellis_& trellis)
static constexpr cost_table_t makeCostTable()
{
cost_table_t result;
for (size_t i = 0; i != K; ++i)

5
modems/m17/Util.h → modemm17/Util.h

@ -146,7 +146,10 @@ auto llr(float sample) @@ -146,7 +146,10 @@ auto llr(float sample)
template <size_t M, typename T, size_t N, typename U, size_t IN>
auto depunctured(std::array<T, N> puncture_matrix, std::array<U, IN> in)
{
static_assert(M % N == 0);
if (M % N != 0) {
return;
}
std::array<U, M> result;
size_t index = 0;
size_t pindex = 0;

0
modems/m17/Viterbi.h → modemm17/Viterbi.h

0
modems/m17/ax25_frame.h → modemm17/ax25_frame.h

0
modems/m17/queue.h → modemm17/queue.h

56
modems/CMakeLists.txt

@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
project(modems)
set(modems_SOURCES
m17/Correlator.cpp
m17/FreqDevEstimator.cpp
m17/Golay24.cpp
m17/M17Demodulator.cpp
m17/M17Modulator.cpp
)
set(modems_HEADERS
m17/ax25_frame.h
m17/CarrierDetect.h
m17/ClockRecovery.h
m17/Convolution.h
m17/Correlator.h
m17/CRC16.h
m17/DataCarrierDetect.h
m17/DeviationError.h
m17/Filter.h
m17/FirFilter.h
m17/FreqDevEstimator.h
m17/FrequencyError.h
m17/Fsk4Demod.h
m17/Golay24.h
m17/IirFilter.h
m17/LinkSetupFrame.h
m17/M17Demodulator.h
m17/M17FrameDecoder.h
m17/M17Framer.h
m17/M17Modulator.h
m17/M17Randomizer.h
m17/M17Synchronizer.h
m17/PhaseEstimator.h
m17/PolynomialInterleaver.h
m17/queue.h
m17/SlidingDFT.h
m17/SymbolEvm.h
m17/Trellis.h
m17/Util.h
m17/Viterbi.h
)
include_directories(
${CMAKE_SOURCE_DIR}/exports
)
add_library(modems SHARED
${modems_SOURCES}
)
target_link_libraries(modems
Qt5::Core
)
install(TARGETS modems DESTINATION ${INSTALL_LIB_DIR})

2
plugins/channelrx/CMakeLists.txt

@ -97,7 +97,7 @@ if (ENABLE_CHANNELRX_DEMODFREEDV AND CODEC2_FOUND) @@ -97,7 +97,7 @@ if (ENABLE_CHANNELRX_DEMODFREEDV AND CODEC2_FOUND)
add_subdirectory(demodfreedv)
endif()
if (LINUX AND ENABLE_CHANNELRX_DEMODM17 AND CODEC2_FOUND)
if (ENABLE_CHANNELRX_DEMODM17 AND CODEC2_FOUND)
add_subdirectory(demodm17)
endif()

4
plugins/channelrx/demodm17/CMakeLists.txt

@ -27,7 +27,7 @@ set(m17_HEADERS @@ -27,7 +27,7 @@ set(m17_HEADERS
include_directories(
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CODEC2_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/modems
${CMAKE_SOURCE_DIR}/modemm17
)
if(NOT SERVER_MODE)
@ -69,7 +69,7 @@ target_link_libraries(${TARGET_NAME} @@ -69,7 +69,7 @@ target_link_libraries(${TARGET_NAME}
${TARGET_LIB_GUI}
swagger
${CODEC2_LIBRARIES}
modems
modemm17
)
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})

2
plugins/channelrx/demodm17/m17demodprocessor.cpp

@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
#include "audio/audiofifo.h"
#include "util/ax25.h"
#include "m17/ax25_frame.h"
#include "ax25_frame.h"
#include "m17demod.h"
#include "m17demodprocessor.h"

2
plugins/channelrx/demodm17/m17demodprocessor.h

@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include <QObject>
#include "audio/audiocompressor.h"
#include "m17/M17Demodulator.h"
#include "M17Demodulator.h"
#include "m17demodfilters.h"
class AudioFifo;

2
plugins/channeltx/CMakeLists.txt

@ -63,6 +63,6 @@ if (ENABLE_CHANNELTX_MODFREEDV AND CODEC2_FOUND) @@ -63,6 +63,6 @@ if (ENABLE_CHANNELTX_MODFREEDV AND CODEC2_FOUND)
add_subdirectory(modfreedv)
endif()
if (LINUX AND ENABLE_CHANNELTX_MODM17 AND CODEC2_FOUND)
if (ENABLE_CHANNELTX_MODM17 AND CODEC2_FOUND)
add_subdirectory(modm17)
endif()

4
plugins/channeltx/modm17/CMakeLists.txt

@ -29,7 +29,7 @@ set(modm17_HEADERS @@ -29,7 +29,7 @@ set(modm17_HEADERS
include_directories(
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CODEC2_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/modems
${CMAKE_SOURCE_DIR}/modemm17
)
if(NOT SERVER_MODE)
@ -69,7 +69,7 @@ target_link_libraries(${TARGET_NAME} @@ -69,7 +69,7 @@ target_link_libraries(${TARGET_NAME}
${TARGET_LIB_GUI}
swagger
${CODEC2_LIBRARIES}
modems
modemm17
)
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})

2
plugins/channeltx/modm17/m17modprocessor.cpp

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
#include <codec2/codec2.h>
#include "m17/M17Modulator.h"
#include "M17Modulator.h"
#include "maincore.h"
#include "m17modax25.h"

2
plugins/channeltx/modm17/m17modprocessor.h

@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include <QObject>
#include <QByteArray>
#include "m17/M17Modulator.h"
#include "M17Modulator.h"
#include "dsp/dsptypes.h"
#include "util/message.h"
#include "util/messagequeue.h"

Loading…
Cancel
Save