From f2b6a1ba4d11a92e69877c78217d622469660d64 Mon Sep 17 00:00:00 2001
From: piotr <Piotr Krysik pkrysik@elka.pw.edu.pl>
Date: Mon, 4 Aug 2014 11:28:59 +0200
Subject: Added reset to the receiver, computation of power and function for
 setting arfcn of the receiver

---
 lib/receiver/receiver_impl.cc | 20 ++++++++++++++++----
 lib/receiver/receiver_impl.h  |  8 ++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc
index f718f99..500113e 100644
--- a/lib/receiver/receiver_impl.cc
+++ b/lib/receiver/receiver_impl.cc
@@ -92,6 +92,8 @@ receiver_impl::receiver_impl(feval_dd * tuner, int osr, int arfcn)
     configure_receiver();  //configure the receiver - tell it where to find which burst type
 }
 
+
+
 /*
  * Our virtual destructor.
  */
@@ -191,12 +193,12 @@ receiver_impl::work(int noutput_items,
         unsigned char output_binary[BURST_SIZE];
 
         burst_type b_type = d_channel_conf.get_burst_type(d_burst_nr); //get burst type for given burst number
-        double signal_pwr=0;
+        double signal_pwr = 0;
         for(int ii=0;ii<noutput_items;ii++)
         {
             signal_pwr += abs(input[ii])*abs(input[ii]);
         }
-        d_signal_dbm=static_cast<int8_t>(round(20*log10(signal_pwr)));
+        d_signal_dbm=static_cast<int8_t>(round(10*log10(signal_pwr/50/noutput_items)));
         
         switch (b_type)
         {
@@ -248,7 +250,7 @@ receiver_impl::work(int noutput_items,
                     d_freq_offset_vals.clear();
                     d_freq_offset=0;
                     //set_frequency(0);
-                    DCOUT("Re-Synchronization!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+                    COUT("Re-Synchronization!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
                 }
             }
         }
@@ -796,7 +798,7 @@ void receiver_impl::send_burst(burst_counter burst_nr, const unsigned char * bur
     pmt::pmt_t header_blob=pmt::make_blob(tap_header.get(),sizeof(gsmtap_hdr));
     pmt::pmt_t burst_binary_blob=pmt::make_blob(burst_binary,BURST_SIZE);
     pmt::pmt_t msg = pmt::cons(header_blob, burst_binary_blob);
-
+    
     message_port_pub(pmt::mp("bursts"), msg);
 }
 
@@ -840,6 +842,16 @@ void receiver_impl::configure_receiver()
     d_channel_conf.set_burst_types(TIMESLOT7, TEST51, sizeof(TEST51) / sizeof(unsigned), dummy_or_normal);
 }
 
+void receiver_impl::set_arfcn(int arfcn) //!!
+{
+    d_arfcn = arfcn;
+//    std::cout << "set arfcn:"<<arfcn << std::endl;
+}
+
+void receiver_impl::reset()
+{
+    d_state = first_fcch_search;
+}
 
 } /* namespace gsm */
 } /* namespace gr */
diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h
index 200a951..d3083b2 100644
--- a/lib/receiver/receiver_impl.h
+++ b/lib/receiver/receiver_impl.h
@@ -199,14 +199,18 @@ namespace gr {
          *
          */
         void configure_receiver();
-            
+        
+
+        
      public:
-      receiver_impl(feval_dd * tuner, int osr, int arfcn);
+       receiver_impl(feval_dd * tuner, int osr, int arfcn);
       ~receiver_impl();
       
 //      void forecast(int noutput_items, gr_vector_int &ninput_items_required);
 
       int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
+      virtual void set_arfcn(int arfcn);
+      virtual void reset();
     };
   } // namespace gsm
 } // namespace gr
-- 
cgit v1.2.3