summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <ikj1234i@yahoo.com>2017-03-10 10:44:17 -0500
committerMax <ikj1234i@yahoo.com>2017-03-10 10:44:17 -0500
commit356ce4b7ac6a7e00cc46585ac532dedbcbf39695 (patch)
tree073526004196d30fe3fc4a26f437284fc0b7f494
parenta964f6ac52afc1cde546167f77550021027dcf14 (diff)
dstar cleanup
-rw-r--r--op25/gr-op25_repeater/include/op25_repeater/dstar_tx_sb.h2
-rw-r--r--op25/gr-op25_repeater/lib/dstar_tx_sb_impl.cc8
-rw-r--r--op25/gr-op25_repeater/lib/dstar_tx_sb_impl.h2
3 files changed, 7 insertions, 5 deletions
diff --git a/op25/gr-op25_repeater/include/op25_repeater/dstar_tx_sb.h b/op25/gr-op25_repeater/include/op25_repeater/dstar_tx_sb.h
index 2a1bf83..55ce91d 100644
--- a/op25/gr-op25_repeater/include/op25_repeater/dstar_tx_sb.h
+++ b/op25/gr-op25_repeater/include/op25_repeater/dstar_tx_sb.h
@@ -47,7 +47,7 @@ namespace gr {
* class. op25_repeater::dstar_tx_sb::make is the public interface for
* creating new instances.
*/
- static sptr make(int versbose_flag, const char * conf_file, bool fullrate_mode);
+ static sptr make(int versbose_flag, const char * conf_file);
};
} // namespace op25_repeater
diff --git a/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.cc b/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.cc
index 7c58dd2..6f37220 100644
--- a/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.cc
+++ b/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.cc
@@ -59,10 +59,10 @@ namespace gr {
namespace op25_repeater {
dstar_tx_sb::sptr
- dstar_tx_sb::make(int verbose_flag, const char * config_file, bool fullrate_mode)
+ dstar_tx_sb::make(int verbose_flag, const char * config_file)
{
return gnuradio::get_initial_sptr
- (new dstar_tx_sb_impl(verbose_flag, config_file, fullrate_mode));
+ (new dstar_tx_sb_impl(verbose_flag, config_file));
}
//////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ static const int MAX_OUT = 1;
/*
* The private constructor
*/
- dstar_tx_sb_impl::dstar_tx_sb_impl(int verbose_flag, const char * config_file, bool fullrate_mode)
+ dstar_tx_sb_impl::dstar_tx_sb_impl(int verbose_flag, const char * config_file)
: gr::block("dstar_tx_sb",
gr::io_signature::make (MIN_IN, MAX_IN, sizeof(short)),
gr::io_signature::make (MIN_OUT, MAX_OUT, sizeof(char))),
@@ -102,6 +102,8 @@ dstar_tx_sb_impl::config()
FILE * fp1 = fopen(d_config_file, "r");
char line[256];
char * cp;
+ // TODO: add code to generate slow speed datastream
+ return;
if (!fp1) {
fprintf(stderr, "dstar_tx_sb_impl:config: failed to open %s\n", d_config_file);
return;
diff --git a/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.h b/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.h
index 8480bd4..1845eda 100644
--- a/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.h
+++ b/op25/gr-op25_repeater/lib/dstar_tx_sb_impl.h
@@ -44,7 +44,7 @@ namespace gr {
void config(void);
public:
- dstar_tx_sb_impl(int verbose_flag, const char * config_file, bool fullrate_mode);
+ dstar_tx_sb_impl(int verbose_flag, const char * config_file);
~dstar_tx_sb_impl();
void forecast (int noutput_items, gr_vector_int &ninput_items_required);