From b590ee2479e6127be091d9ec0e20bd918aee674f Mon Sep 17 00:00:00 2001
From: csrichter <csrichter@hotmail.de>
Date: Mon, 10 Apr 2017 20:42:08 +0200
Subject: [PATCH] removed debug in rds decoder, added exception handling in CT
 (group 4A) decoding

---
 lib/rds_decoder_redsea_impl.cc | 14 +++++++++-----
 python/rds_parser_table_qt.py  | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/lib/rds_decoder_redsea_impl.cc b/lib/rds_decoder_redsea_impl.cc
index 69bd2fc..d98ce27 100644
--- a/lib/rds_decoder_redsea_impl.cc
+++ b/lib/rds_decoder_redsea_impl.cc
@@ -57,15 +57,15 @@ namespace gr {
 	
 	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.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;
+        dout<< "i am new"<< std::endl;
         //dout<<  kErrorLookup.at({704, 'A'})<< std::endl;
 }
 
@@ -256,7 +256,7 @@ int rds_decoder_redsea_impl::work (int noutput_items,
                                                           dataword=(corrected_block>>10) & 0xffff;
                                                           checkword=corrected_block & 0x3ff;
                                                           offset_char = 'C';
-                                                          lout << "corrected error"<<std::endl;
+                                                          //dout << "corrected error"<<std::endl;
                                                         }
                                                         else{
                                                           block_received_crc=checkword^offset_word[4];
@@ -284,7 +284,11 @@ int rds_decoder_redsea_impl::work (int noutput_items,
                                                         good_block=true;
                                                         dataword=(corrected_block>>10) & 0xffff;
                                                         checkword=corrected_block & 0x3ff;
-                                                        lout << "corrected error"<<std::endl;
+							//dout << "corrected error"<<std::endl;
+							//dout << "old: rx:"<<block_received_crc<<"\tcalc:"<<block_calculated_crc<<std::endl;
+							//block_received_crc=checkword^offset_word[block_number];
+							//block_calculated_crc=calc_syndrome(dataword,16);
+							//dout << "new: rx:"<<block_received_crc<<"\tcalc:"<<block_calculated_crc<<std::endl;
                                                         offset_char=expected_offset_char[block_number];
                                                   }
                                                   else{
diff --git a/python/rds_parser_table_qt.py b/python/rds_parser_table_qt.py
index b8cc537..abf49e2 100644
--- a/python/rds_parser_table_qt.py
+++ b/python/rds_parser_table_qt.py
@@ -639,20 +639,20 @@ class rds_parser_table_qt(gr.sync_block):#START
                     #local_time_offset=0.5*((array[7])&0x1F)
                     if(offsetdir==1):
                         local_time_offset*=-1
-
-                    date=datetime(1858,11,17)+timedelta(days=int(datecode))#convert from MJD (modified julian date)
-
-                    timestring="%02i:%02i (%+.1fh)" % (hours,minutes,local_time_offset)
-                    datestring=date.strftime("%d.%m.%Y")
-                    ctcol=self.colorder.index('time')
-                    self.signals.DataUpdateEvent.emit({'col':ctcol,'row':port,'PI':PI,'string':timestring,'tooltip':datestring})
-                    t=(str(datetime.now()),PI,self.RDS_data[PI]["PSN"],"CT",datestring+" "+timestring+"; datecode(MJD):"+str(datecode))
-                    self.RDS_data[PI]["time"]["timestring"]=timestring
-                    self.RDS_data[PI]["time"]["datestring"]=datestring
                     try:
+                        date=datetime(1858,11,17)+timedelta(days=int(datecode))#convert from MJD (modified julian date)
+        
+                        timestring="%02i:%02i (%+.1fh)" % (hours,minutes,local_time_offset)
+                        datestring=date.strftime("%d.%m.%Y")
+                        ctcol=self.colorder.index('time')
+                        self.signals.DataUpdateEvent.emit({'col':ctcol,'row':port,'PI':PI,'string':timestring,'tooltip':datestring})
+                        t=(str(datetime.now()),PI,self.RDS_data[PI]["PSN"],"CT",datestring+" "+timestring+"; datecode(MJD):"+str(datecode))
+                        self.RDS_data[PI]["time"]["timestring"]=timestring
+                        self.RDS_data[PI]["time"]["datestring"]=datestring
                         self.RDS_data[PI]["time"]["datetime"]=datetime(date.year,date.month,date.day,hours,minutes)+timedelta(hours=local_time_offset)
-                    except ValueError:
-                        print("ERROR: could not interpret time or date:"+datestring+" "+timestring)
+                    except ValueError as e:
+                        print("ERROR: could not interpret time or date:")
+                        print(e)
                     if self.writeDB:
                         db.execute("INSERT INTO data (time,PI,PSN,dataType,data) VALUES (?,?,?,?,?)",t)
             elif (groupType == "6A"):#IH inhouse data -> save for analysis