swapped in op25

robotastic · robotastic · commit db068538cc45 · 2013-10-28T21:29:41.000-04:00
diff --git a/logging_receiver_dsd.cc b/logging_receiver_dsd.cc
@@ -56,24 +56,26 @@ log_dsd::log_dsd(float f, float c, long t, int n)
 	
 
 
-
-    
+	
+    	lpf_taps =  gr_firdes::low_pass(1, samp_rate, xlate_bandwidth/2, 6000);
 	prefilter = gr_make_freq_xlating_fir_filter_ccf(decim, 
-						       gr_firdes::low_pass(1, samp_rate, xlate_bandwidth/2, 6000),
+						      lpf_taps,
 						       offset, 
 						       samp_rate);
 	unsigned int d = GCD(channel_rate, pre_channel_rate);
     	channel_rate = floor(channel_rate  / d);
     	pre_channel_rate = floor(pre_channel_rate / d);
+	resampler_taps = design_filter(channel_rate, pre_channel_rate);
 
-	downsample_sig = gr_make_rational_resampler_base_ccf(channel_rate, pre_channel_rate, design_filter(channel_rate, pre_channel_rate)); 
+	downsample_sig = gr_make_rational_resampler_base_ccf(channel_rate, pre_channel_rate, resampler_taps); 
 
 	demod = gr_make_quadrature_demod_cf(1.6);
 
-	const float a[] = { 0.1, 0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1};
-
-   	std::vector<float> data( a,a + sizeof( a ) / sizeof( a[0] ) );
-	sym_filter = gr_make_fir_filter_fff(1, data); 
+	
+	for (int i=0; i < 10; i++) {
+		sym_taps.push_back(0.1);
+	}
+	sym_filter = gr_make_fir_filter_fff(1, sym_taps); 
 	if (!logging) {
 	iam_logging = true;
 	logging = true;
@@ -148,14 +150,14 @@ void log_dsd::close() {
 
 	std::cout<< "logging_receiver_dsd.cc: close()" <<std::endl;
 	wav_sink->close();
-/*
+
 	disconnect(self(), 0, prefilter, 0);	
 	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(dsd, 0, wav_sink,0);
-*/		
+		
 	//std::cout<< "logging_receiver_dsd.cc: finished close()" <<std::endl;
 }
 
@@ -178,14 +180,14 @@ void log_dsd::deactivate() {
 
 
 
-	/*	disconnect(self(), 0, prefilter, 0);	
+	disconnect(self(), 0, prefilter, 0);	
 	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(dsd, 0, wav_sink,0);
 
-	*/
+	
 
 /*	
 	wav_sink.reset();
diff --git a/logging_receiver_dsd.h b/logging_receiver_dsd.h
@@ -77,6 +77,9 @@ class log_dsd : public gr_hier_block2
 	int num;
     	
 	bool iam_logging;
+	std::vector<float> lpf_taps;
+	std::vector<float> resampler_taps;
+	std::vector<float> sym_taps;
 
     /* GR blocks */
     	gr_fir_filter_ccf_sptr lpf;
diff --git a/logging_receiver_p25.cc b/logging_receiver_p25.cc
@@ -44,11 +44,10 @@ log_p25::log_p25(float f, float c, long t)
 	center = c;
 	talkgroup = t;
 	float offset = center - (f*1000000);
-	char filename[160];
-	//int samp_per_sym = 10;
-	int samp_per_sym = 6;
-	double samp_rate = 4000000;
-	int decim = 80;
+	
+	int samp_per_sym = 10;  //6
+	double samp_rate = 5000000;
+	int decim = 160;  //20
 	float xlate_bandwidth = 14000; //24260.0;
 	float channel_rate = 4800 * samp_per_sym;
 	double pre_channel_rate = double(samp_rate/decim);
@@ -59,7 +58,7 @@ log_p25::log_p25(float f, float c, long t)
 	const double pi = M_PI; //boost::math::constants::pi<double>();
 
 	timestamp = time(NULL);
-
+	starttime = time(NULL);
 
 
 
@@ -114,7 +113,21 @@ null_sink = gr_make_null_sink(sizeof(float));
 	copier = gr_make_kludge_copy(sizeof(gr_complex));
 	head_source = gr_make_head(sizeof(gr_complex),0);
 	sprintf(filename, "%ld-%ld.wav", talkgroup,timestamp);
-	wav_sink = gr_make_wavfile_sink(filename,1,8000,16); 
+
+
+	tm *ltm = localtime(&starttime);
+	
+	std::stringstream path_stream;
+	path_stream << boost::filesystem::current_path().string() <<  "/" << 1900 + ltm->tm_year << "/" << 1 + ltm->tm_mon << "/" << ltm->tm_mday;
+	
+	boost::filesystem::create_directories(path_stream.str());
+	//sprintf(filename, "%s/%ld-%ld.wav", path_stream.str().c_str(),talkgroup,timestamp);
+
+	sprintf(filename, "%ld-%ld.wav",talkgroup,timestamp);
+	
+	wav_sink = gr_make_wavfile_sink(filename,1,8000,16);
+
+	
 	//gr_file_sink_sptr fs = gr_make_file_sink(sizeof(float),"sym_filter.dat");
 
 
@@ -192,6 +205,10 @@ long log_p25::timeout() {
 	return time(NULL) - timestamp;
 }
 
+char *log_p25::get_filename() {
+	return filename;
+}
+
 void log_p25::close() {
 	mute();
 	wav_sink->close();	
diff --git a/logging_receiver_p25.h b/logging_receiver_p25.h
@@ -12,6 +12,9 @@
 
 
 #include <boost/shared_ptr.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+
 #include <gr_io_signature.h>
 #include <gr_hier_block2.h>
 #include <gr_firdes.h>
@@ -66,14 +69,17 @@ class log_p25 : public gr_hier_block2
 	void close();
 	void mute();
 	void unmute();	
+	char *get_filename();
 	//void forecast(int noutput_items, gr_vector_int &ninput_items_required);
 
 private:
 	float center, freq;
 	bool muted;
 	long talkgroup;
 	time_t timestamp;
-    
+    	time_t starttime;
+
+char filename[160];
 
     /* GR blocks */
     	gr_fir_filter_ccf_sptr lpf;
diff --git a/smartnet.cc b/smartnet.cc
@@ -42,8 +42,9 @@
 #include <string> 
 #include <stdio.h>
 #include <stdlib.h>
-
-#include "logging_receiver_dsd.h"
+#include <signal.h>
+//#include "logging_receiver_dsd.h"
+#include "logging_receiver_p25.h"
 #include "smartnet_crc.h"
 #include "smartnet_deinterleave.h"
 
@@ -102,8 +103,13 @@ osmosdr_source_c_sptr src;
 /* static loggers
 vector<log_dsd_sptr> loggers;*/
 
-vector<log_dsd_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
+  exit_flag = 1; // set flag
+}
 
 void init_loggers(int num, float center_freq) {
 
@@ -171,9 +177,11 @@ float parse_message(string s) {
 	}
         
 	if (retfreq) {
-		for(vector<log_dsd_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) {		
+		for(vector<log_p25_sptr>::iterator it = active_loggers.begin(); it != active_loggers.end(); ++it) {		
 		
-			log_dsd_sptr rx = *it;
+			//log_dsd_sptr rx = *it;
+			log_p25_sptr rx = *it;
 			
 						
 			if (rx->get_talkgroup() == address) {		
@@ -208,7 +216,9 @@ float parse_message(string s) {
 			//tb->wait();
 
 			// Dynamic Logger			
-			log_dsd_sptr log = make_log_dsd( retfreq, center_freq, address, thread_num++);			
+			//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);
 
 			tb->connect(src, 0, log, 0);
@@ -223,12 +233,15 @@ float parse_message(string s) {
 			//cout << "smartnet.cc: Activated logger & unlocked" << endl;
 		}
 		
-		//cout << "TG: " << address << "\tFreq: " << retfreq << "\tActive Loggers: " << active_loggers.size() << "\tCmd: "<< command << "\t LastCmd: " <<lastcmd << "\t  Flag: "<< groupflag << "\t Timeout: " << timeout << "\t Elapsed: " << elapsed << endl;
+		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;
-	
+*/	
+	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;
@@ -238,7 +251,10 @@ float parse_message(string s) {
 			//tb->wait();
 
 			tb->disconnect(src, 0, rx, 0);
-rx->deactivate();
+			
+			/* !!!!!!!!!!!!! don't forget to un comment this for log_dsd */
+			//rx->deactivate();
+			rx->close();
 
 			tb->unlock();
 			
@@ -252,7 +268,7 @@ rx->deactivate();
 			//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));
@@ -310,7 +326,7 @@ std::string device_addr;
 
 
 
- 
+ signal(SIGINT, exit_interupt);
  	tb = gr_make_top_block("smartnet");
 
 	
@@ -423,6 +439,11 @@ usleep(1000);
 it = active_loggers.erase(it);
 }*/
 	while (1) {
+		if(exit_flag){ // my action when signal set it 1
+       			printf("\n Signal caught!\n");
+			tb->stop();
+			return 0;
+		} 
 		if (!queue->empty_p())
 		{
 			std::string sentence;
