From 5c1b6d8f456bc57e29c5e5a2a95b6b2d0562e985 Mon Sep 17 00:00:00 2001
From: csrichter <csrichter@hotmail.de>
Date: Mon, 10 Apr 2017 20:19:43 +0200
Subject: [PATCH] fixed redsea decoder (added -std=c++11 compiler option,
 removed local declaration of kErrorLookup in constructor)

---
 CMakeLists.txt                 |  4 ++++
 lib/rds_decoder_redsea_impl.cc | 30 +++++++++++++++++++-----------
 python/tmc_parser.py           |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59ca2c..70ae09f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,10 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
+#to use extended initializer lists
+add_definitions(-std=c++11)
+
+
 ########################################################################
 # Project setup
 ########################################################################
diff --git a/lib/rds_decoder_redsea_impl.cc b/lib/rds_decoder_redsea_impl.cc
index ad27433..69bd2fc 100644
--- a/lib/rds_decoder_redsea_impl.cc
+++ b/lib/rds_decoder_redsea_impl.cc
@@ -54,10 +54,19 @@ namespace gr {
         set_output_multiple(104);  // 1 RDS datagroup = 104 bits
         message_port_register_out(pmt::mp("out"));
         enter_no_sync();
-        std::map<std::pair<uint16_t, char>, uint32_t> kErrorLookup = makeErrorLookupTable();
-       
+	
+	dout << "constructing error lookup table"<<std::endl; 
+        kErrorLookup = makeErrorLookupTable();
+	dout<<  kErrorLookup.count({(uint16_t)7, 'A'})<< std::endl;
+	dout<<  kErrorLookup.count({(uint16_t)7, 'B'})<< std::endl;
+	
+	//dout<<  kErrorLookup.count({(uint16_t)7, 'A'})<< std::endl;
+	//dout<<  kErrorLookup.at({704, 'A'})<< std::endl;
+	//~ if (kErrorLookup.count({(uint16_t)14, (char)'A'}) > 0) {
+	//~ dout<<"found sy 14 offset A in table"<<std::endl;
+	//~ }
         std::cout<< "i am new"<< std::endl;
-        std::cout<<  kErrorLookup.at({704, 'A'})<< std::endl;
+        //dout<<  kErrorLookup.at({704, 'A'})<< std::endl;
 }
 
     /*
@@ -121,7 +130,6 @@ std::map<std::pair<uint16_t, char>, uint32_t> rds_decoder_redsea_impl::makeError
 static const unsigned int offset_word[5]={252,408,360,436,848};
 static const unsigned int syndrome[5]={383,14,303,663,748};
 static const char * const offset_name[]={"A","B","C","D","c"};*/
-dout << "constructing error lookup table"<<std::endl; 
   for (uint8_t offset_num=0;offset_num<5;offset_num++) {
     // "...the error-correction system should be enabled, but should be
     // restricted by attempting to correct bursts of errors spanning one or two
@@ -138,20 +146,20 @@ dout << "constructing error lookup table"<<std::endl;
   }
   return result;
 }
-//end redsea stuff
+
 uint32_t rds_decoder_redsea_impl::correctBurstErrors(uint32_t block, char offset) {
   uint16_t syndrome = calc_syndrome(block,26);
   uint32_t corrected_block = block;
-  dout << "trying to correct sy:"<<syndrome<<"\t\toffset:"<<offset<<std::endl;
-  if (kErrorLookup.count({syndrome, offset}) > 0) {
-    uint32_t err = kErrorLookup.at({syndrome, offset});
-    dout << "correcting"<<std::endl;
+  //dout << "trying to correct sy:"<<syndrome<<"\t\toffset:"<<offset;//<<std::endl;
+  //dout << "\tcount:"<<kErrorLookup.count({(uint16_t)syndrome, (char)offset})<<std::endl;
+  if (kErrorLookup.count({(uint16_t)syndrome, (char)offset}) > 0) {
+    uint32_t err = kErrorLookup.at({(uint16_t)syndrome, (char)offset});
+    //dout << "correcting"<<std::endl;
     corrected_block ^= err;
   }
-
   return corrected_block;
 }
-
+//end redsea stuff
 void rds_decoder_redsea_impl::decode_group(uint16_t *group) {
         // raw data bytes, as received from RDS.
         // 8 info bytes, followed by 4 RDS offset chars: ABCD/ABcD/EEEE (in US)
diff --git a/python/tmc_parser.py b/python/tmc_parser.py
index 37c0c44..5ea1bef 100644
--- a/python/tmc_parser.py
+++ b/python/tmc_parser.py
@@ -121,7 +121,7 @@ class tmc_parser(gr.sync_block):
     def initialize_data_for_PI(self,PI):
         self.unfinished_messages[PI]={}
     def handle_msg(self,msg):
-	if time.time()-self.save_data_timer > 10:#every 10 seconds
+	if time.time()-self.save_data_timer > 3:#every 3 seconds
 	    self.save_data_timer=time.time()
 	    self.save_data()
         m=pmt.to_python(msg)