From f8df9c28241c51977f6965750f669f93ef6deb94 Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Fri, 19 Jan 2018 22:10:23 +0200 Subject: [PATCH] Fix SWIG issue with the debug blocks --- swig/satnogs_debug_swig.i | 3 +++ swig/satnogs_swig.i | 20 +++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/swig/satnogs_debug_swig.i b/swig/satnogs_debug_swig.i index d68a11c..32d71a3 100644 --- a/swig/satnogs_debug_swig.i +++ b/swig/satnogs_debug_swig.i @@ -11,6 +11,7 @@ #include "satnogs/debug_msg_source.h" #include "satnogs/debug_msg_source_raw.h" #include "satnogs/leo_channel.h" +#include "satnogs/cw_encoder.h" %} %include "satnogs/morse_debug_source.h" @@ -25,3 +26,5 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source_raw); %include "satnogs/leo_channel.h" GR_SWIG_BLOCK_MAGIC2(satnogs, leo_channel); +%include "satnogs/cw_encoder.h" +GR_SWIG_BLOCK_MAGIC2(satnogs, cw_encoder); diff --git a/swig/satnogs_swig.i b/swig/satnogs_swig.i index 3f55333..0ff9594 100644 --- a/swig/satnogs_swig.i +++ b/swig/satnogs_swig.i @@ -11,12 +11,10 @@ %{ #include "satnogs/morse_tree.h" #include "satnogs/morse_decoder.h" -#include "satnogs/morse_debug_source.h" #include "satnogs/multi_format_msg_sink.h" #include "satnogs/cw_to_symbol.h" #include "satnogs/sine_matched_filter_ff.h" #include "satnogs/udp_msg_source.h" -#include "satnogs/debug_msg_source.h" #include "satnogs/tcp_rigctl_msg_source.h" #include "satnogs/doppler_correction_cc.h" #include "satnogs/frame_encoder.h" @@ -25,7 +23,6 @@ #include "satnogs/whitening.h" #include "satnogs/udp_msg_sink.h" #include "satnogs/coarse_doppler_correction_cc.h" -#include "satnogs/debug_msg_source_raw.h" #include "satnogs/ax25_encoder_mb.h" #include "satnogs/ax25_decoder_bm.h" #include "satnogs/qb50_deframer.h" @@ -35,7 +32,6 @@ #include "satnogs/noaa_apt_sink.h" #include "satnogs/frame_file_sink.h" #include "satnogs/iq_sink.h" -#include "satnogs/cw_encoder.h" %} @@ -44,9 +40,6 @@ %include "satnogs/morse_decoder.h" GR_SWIG_BLOCK_MAGIC2(satnogs, morse_decoder); -%include "satnogs/morse_debug_source.h" -GR_SWIG_BLOCK_MAGIC2(satnogs, morse_debug_source); - %include "satnogs/multi_format_msg_sink.h" GR_SWIG_BLOCK_MAGIC2(satnogs, multi_format_msg_sink); @@ -59,9 +52,6 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, sine_matched_filter_ff); %include "satnogs/udp_msg_source.h" GR_SWIG_BLOCK_MAGIC2(satnogs, udp_msg_source); -%include "satnogs/debug_msg_source.h" -GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source); - %include "satnogs/tcp_rigctl_msg_source.h" GR_SWIG_BLOCK_MAGIC2(satnogs, tcp_rigctl_msg_source); @@ -85,9 +75,6 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, udp_msg_sink); %include "satnogs/coarse_doppler_correction_cc.h" GR_SWIG_BLOCK_MAGIC2(satnogs, coarse_doppler_correction_cc); -%include "satnogs/debug_msg_source_raw.h" -GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source_raw); - %include "satnogs/ax25_encoder_mb.h" GR_SWIG_BLOCK_MAGIC2(satnogs, ax25_encoder_mb); @@ -99,15 +86,18 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, qb50_deframer); %include "satnogs/waterfall_sink.h" GR_SWIG_BLOCK_MAGIC2(satnogs, waterfall_sink); + %include "satnogs/ogg_encoder.h" GR_SWIG_BLOCK_MAGIC2(satnogs, ogg_encoder); + %include "satnogs/ogg_source.h" GR_SWIG_BLOCK_MAGIC2(satnogs, ogg_source); + %include "satnogs/noaa_apt_sink.h" GR_SWIG_BLOCK_MAGIC2(satnogs, noaa_apt_sink); + %include "satnogs/frame_file_sink.h" GR_SWIG_BLOCK_MAGIC2(satnogs, frame_file_sink); + %include "satnogs/iq_sink.h" GR_SWIG_BLOCK_MAGIC2(satnogs, iq_sink); -%include "satnogs/cw_encoder.h" -GR_SWIG_BLOCK_MAGIC2(satnogs, cw_encoder);