where am I?

Author: robotastic

logging_receiver_dsd.cc

@@ -48,8 +48,7 @@ log_dsd::log_dsd(float f, float c, long t, int n)
 	float offset = center - (f*1000000);
 
 	int samp_per_sym = 10;
-	double samp_rate = 5000000;
-	int decim = 80;
+	double samp_rate = 5000000;	int decim = 80;
 	float xlate_bandwidth = 14000; //24260.0;
 	float channel_rate = 4800 * samp_per_sym;
 	double pre_channel_rate = double(samp_rate/decim);
@@ -68,7 +67,7 @@ log_dsd::log_dsd(float f, float c, long t, int n)
 	resampler_taps = design_filter(channel_rate, pre_channel_rate);
 
 	downsample_sig = gr_make_rational_resampler_base_ccf(channel_rate, pre_channel_rate, resampler_taps); 
-
+	quiet = gr_make_multiply_const_ff(0.75);
 	demod = gr_make_quadrature_demod_cf(1.6);
 
 
@@ -79,7 +78,7 @@ log_dsd::log_dsd(float f, float c, long t, int n)
 	if (!logging) {
 	iam_logging = true;
 	logging = true;
-	dsd = dsd_make_block_ff(dsd_FRAME_P25_PHASE_1,dsd_MOD_C4FM,3,0,0, false, num);
+	dsd = dsd_make_block_ff(dsd_FRAME_P25_PHASE_1,dsd_MOD_C4FM,3,1,1, false, num);
 	} else {
 	iam_logging = false;
 	dsd = dsd_make_block_ff(dsd_FRAME_P25_PHASE_1,dsd_MOD_C4FM,3,0,0, false, num);
@@ -100,7 +99,9 @@ log_dsd::log_dsd(float f, float c, long t, int n)
 	connect(prefilter, 0, downsample_sig, 0);
 	connect(downsample_sig, 0, demod, 0);
 	connect(demod, 0, sym_filter, 0);
-	connect(sym_filter, 0, dsd, 0);
+	connect(sym_filter,0, quiet,0);
+	connect(quiet,0, dsd,0);
+	//connect(sym_filter, 0, dsd, 0);
 	connect(dsd, 0, wav_sink,0);
 
 	//connect(sym_filter, 0, wav_sink, 0);
@@ -184,7 +185,9 @@ void log_dsd::deactivate() {
 	disconnect(prefilter, 0, downsample_sig, 0);
 	disconnect(downsample_sig, 0, demod, 0);
 	disconnect(demod, 0, sym_filter, 0);
-	disconnect(sym_filter, 0, dsd, 0);
+	disconnect(sym_filter,0, quiet,0);
+	disconnect(quiet,0, dsd,0);
+	//disconnect(sym_filter, 0, dsd, 0);
 	disconnect(dsd, 0, wav_sink,0);
 
 

logging_receiver_dsd.h

@@ -15,6 +15,7 @@
 
 #include <gr_io_signature.h>
 #include <gr_hier_block2.h>
+#include <gr_multiply_const_ff.h>
 #include <gr_firdes.h>
 #include <gr_fir_filter_ccf.h>
 #include <gr_fir_filter_fff.h>
@@ -89,6 +90,7 @@ class log_dsd : public gr_hier_block2
 
 	gr_multiply_cc_sptr mixer;
 	gr_file_sink_sptr fs;
+ gr_multiply_const_ff_sptr quiet;
 
 	gr_rational_resampler_base_ccf_sptr downsample_sig;
 	gr_rational_resampler_base_fff_sptr upsample_audio;

logging_receiver_p25.cc

@@ -90,11 +90,11 @@ std::cout << " Decim: " << channel_decim << " Rate: " << channel_rate << " trans
 
 
 	prefilter = gr_make_freq_xlating_fir_filter_ccf(int(channel_decim),
-		gr_firdes::low_pass(1.0, capture_rate, trans_centre, trans_width),
+		gr_firdes::low_pass(1.0, capture_rate, trans_centre, trans_width, gr_firdes::WIN_HANN),
 		offset, 
 		capture_rate);
-	int squelch_db = 0;
-	//squelch = gr_make_pwr_squelch_cc(squelch_db, 0.001, 0, true);
+	int squelch_db = 40;
+	squelch = gr_make_pwr_squelch_cc(squelch_db, 0.001, 0, true);
 	double fm_demod_gain = floor(channel_rate / (2.0 * pi * symbol_deviation));
 	demod = gr_make_quadrature_demod_cf(fm_demod_gain);
 
@@ -166,7 +166,10 @@ std::cout << " Decim: " << channel_decim << " Rate: " << channel_rate << " trans
 
 	muted  = true;
 
-	connect(prefilter, 0, demod, 0);
+	connect(prefilter, 0, squelch, 0); 
+	connect(squelch, 0, demod, 0);
+//connect(demod, 0, wav_sink,0);
+
 	connect(demod, 0, sym_filter, 0);
 	connect(sym_filter, 0, op25_demod, 0);
 	connect(op25_demod,0, op25_slicer, 0);
@@ -327,12 +330,12 @@ char *log_p25::get_filename() {
 void log_p25::close() {
 	mute();
 	wav_sink->close();	
-	disconnect(prefilter, 0, demod, 0);
+	/*disconnect(prefilter, 0, demod, 0);
 	disconnect(demod, 0, sym_filter, 0);
 	disconnect(sym_filter, 0, op25_demod, 0);
 	disconnect(op25_demod,0, op25_slicer, 0);
 	disconnect(op25_slicer,0, op25_decoder,0);
-	disconnect(op25_decoder, 0, wav_sink,0);
+	disconnect(op25_decoder, 0, wav_sink,0);*/
 }
 
 /*

logging_receiver_p25.h

@@ -32,6 +32,7 @@
 #include <gr_rational_resampler_base_ccf.h>
 #include <gr_rational_resampler_base_fff.h>
 #include <gr_block.h>
+#include <gr_pwr_squelch_cc.h>
 
 #include <op25_decoder_bf.h>
 #include <op25_fsk4_demod_ff.h>
@@ -94,7 +95,7 @@ char filename[160];
 	gr_rational_resampler_base_fff_sptr upsample_audio;
 	//gr::analog::quadrature_demod_cf::sptr demod;
 	gr_quadrature_demod_cf_sptr demod;
-
+	gr_pwr_squelch_cc_sptr squelch;
 	gr_wavfile_sink_sptr wav_sink;
 	//smartnet_wavsink_sptr wav_sink
 	//gr::blocks::wavfile_sink::sptr wav_sink;

smartnet.cc

@@ -43,8 +43,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
-//#include "logging_receiver_dsd.h"
-#include "logging_receiver_p25.h"
+#include "logging_receiver_dsd.h"
+//#include "logging_receiver_p25.h"
 #include "smartnet_crc.h"
 #include "smartnet_deinterleave.h"
 
@@ -103,8 +103,8 @@ osmosdr_source_c_sptr src;
 /* static loggers
 vector<log_dsd_sptr> loggers;*/
 
-//vector<log_dsd_sptr> active_loggers;
-vector<log_p25_sptr> active_loggers;
+vector<log_dsd_sptr> active_loggers;
+//vector<log_p25_sptr> active_loggers;
 
 volatile sig_atomic_t exit_flag = 0;
 void exit_interupt(int sig){ // can be called asynchronously
@@ -177,12 +177,12 @@ float parse_message(string s) {
 	}
 
 	if (retfreq) {
-		/*for(vector<log_dsd_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end(); ++it) {	
-			log_dsd_sptr rx = *it;*/	
-		for(vector<log_p25_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end(); ++it) {		
+		for(vector<log_dsd_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end(); ++it) {	
+			log_dsd_sptr rx = *it;	
+		/*for(vector<log_p25_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end(); ++it) {		
 		
 			log_p25_sptr rx = *it;
-			
+		*/	
 
 			if (rx->get_talkgroup() == address) {		
 				if (rx->get_freq() != retfreq) {
@@ -216,8 +216,8 @@ float parse_message(string s) {
 			//tb->wait();
 
 			// Dynamic Logger			
-			//log_dsd_sptr log = make_log_dsd( retfreq, center_freq, address, thread_num++);			
-			log_p25_sptr log = make_log_p25( retfreq, center_freq, address);			
+			log_dsd_sptr log = make_log_dsd( retfreq, center_freq, address, thread_num++);			
+			//log_p25_sptr log = make_log_p25( retfreq, center_freq, address);			
 
 			active_loggers.push_back(log);
 
@@ -236,13 +236,13 @@ float parse_message(string s) {
 		//cout << "TG: " << address << "\tFreq: " << retfreq << "\tActive Loggers: " << active_loggers.size() << "\tCmd: "<< command << "\t LastCmd: " <<lastcmd   << endl;
 	}
 
-/*
+
 	for(vector<log_dsd_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end();) {
-		log_dsd_sptr rx = *it;*/
-	
+		log_dsd_sptr rx = *it;
+/*	
 	for(vector<log_p25_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end();) {
 		log_p25_sptr rx = *it;
-
+*/
 		if (rx->timeout() > 5.0) {
 			//cout << "smartnet.cc: Deleting Logger - TG: " << rx->get_talkgroup() << "\t Freq: " << rx->get_freq() << endl;
 
@@ -253,8 +253,8 @@ float parse_message(string s) {
 			tb->disconnect(src, 0, rx, 0);
 
 			/* !!!!!!!!!!!!! don't forget to un comment this for log_dsd */
-			//rx->deactivate();
-			rx->close();
+			rx->deactivate();
+			//rx->close();
 
 			tb->unlock();
 
@@ -268,7 +268,7 @@ float parse_message(string s) {
 			//cout << "smartnet.cc: Moved Active Logger, Loggers " << loggers.size() << " Active Loggers " << active_loggers.size() << endl;
 
 			sprintf(shell_command,"./encode-upload.sh %s &", rx->get_filename());
-			//system(shell_command);
+			system(shell_command);
 
 			/* static loggers
 			loggers.push_back(move(rx));

start_hack_rf_decode_856.sh

@@ -1,7 +1,7 @@
 #valgrind --leak-check=yes ./smartnet --freq 856187500.0 --center 857600000.0  --rate 5000000 --error -5300 --rfgain 14 --ifgain 35 --bbgain 35 > valgrind.txt 2>&1
 
 
-./smartnet --freq 856187500.0 --center 857600000.0  --rate 4000000 --error -5300 --rfgain 14 --ifgain 35 --bbgain 35
+./smartnet --freq 856187500.0 --center 857600000.0  --rate 5000000 --error -5300 --rfgain 14 --ifgain 20 --bbgain 20
 
 
 #./smartnet --freq 856187500.0 --center 858000000.0  --rate 8000000 --error -5500 --rfgain 14 --ifgain 35 --bbgain 35