csrichter
/
gr-multirds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

performance improvements

dev
Clemens Richter 9 years ago
parent
8c993a5c50
commit
5d0ba663d0
3 changed files with 36 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      lib/rds_decoder_redsea_impl.cc
  2. 2
      python/tmc_classes.py
  3. 6
      python/tmc_parser.py

60
lib/rds_decoder_redsea_impl.cc
Unescape View File

@ -293,33 +293,36 @@ int rds_decoder_redsea_impl::work (int noutput_items,
checkword=reg & 0x3ff;//checkword part of received block (lower 10 bits) checkword=reg & 0x3ff;//checkword part of received block (lower 10 bits)
/* manage special case of C or C' offset word */ /* manage special case of C or C' offset word */
if (block_number==2) { if (block_number==2) {
if (variant==0){//A if (variant == 2 ) dout << "error: 3rd block received before 2nd"<<std::endl;
offset_char = 'C'; else{
block_received_crc=checkword^offset_word[2]; if (variant==0){//A
} offset_char = 'C';
else{//B block_received_crc=checkword^offset_word[2];
offset_char = 'c'; }
block_received_crc=checkword^offset_word[4]; else{//B
//dout<<"B"<<std::endl; offset_char = 'c';
} block_received_crc=checkword^offset_word[4];
if (block_received_crc==block_calculated_crc) { //dout<<"B"<<std::endl;
good_block=true; }
}else{ if (block_received_crc==block_calculated_crc) {
//try correcting:
uint32_t corrected_block= correctBurstErrors(reg,offset_char);
if(corrected_block != reg){
good_block=true; good_block=true;
block_was_corrected=true; }else{
group_corrected_blocks_counter++; //try correcting:
//wrong_blocks_counter++; uint32_t corrected_block= correctBurstErrors(reg,offset_char);
dataword=(corrected_block>>10) & 0xffff; if(corrected_block != reg){
checkword=corrected_block & 0x3ff; good_block=true;
block_was_corrected=true;
group_corrected_blocks_counter++;
//dout << "corrected error"<<std::endl; //wrong_blocks_counter++;
}else { dataword=(corrected_block>>10) & 0xffff;
wrong_blocks_counter++; checkword=corrected_block & 0x3ff;
good_block=false;
//dout << "corrected error"<<std::endl;
}else {
wrong_blocks_counter++;
good_block=false;
}
} }
} }
@ -327,8 +330,6 @@ int rds_decoder_redsea_impl::work (int noutput_items,
else { else {
block_received_crc=checkword^offset_word[block_number]; block_received_crc=checkword^offset_word[block_number];
if (block_received_crc==block_calculated_crc) {//valid block if (block_received_crc==block_calculated_crc) {//valid block
if (block_number==0)
last_pi=dataword;
good_block=true; good_block=true;
offset_char=expected_offset_char[block_number]; //expected_offset_char[]={'A','B','?','D'}; offset_char=expected_offset_char[block_number]; //expected_offset_char[]={'A','B','?','D'};
/*if (block_number==0) offset_char = 'A'; /*if (block_number==0) offset_char = 'A';
@ -380,10 +381,12 @@ int rds_decoder_redsea_impl::work (int noutput_items,
} }
/* done checking CRC */ /* done checking CRC */
if (block_number==0 && good_block) { if (block_number==0 && good_block) {
last_pi=dataword;
group_assembly_started=true; group_assembly_started=true;
//group_corrected_blocks_counter=block_was_corrected; //group_corrected_blocks_counter=block_was_corrected;
group_corrected_blocks_counter=0; group_corrected_blocks_counter=0;
group_good_blocks_counter=1; group_good_blocks_counter=1;
variant=2;
} }
if (block_number==1 && good_block) {//2nd block - > read group type variant if (block_number==1 && good_block) {//2nd block - > read group type variant
variant=(dataword>>11)& 0x1; variant=(dataword>>11)& 0x1;
@ -406,6 +409,7 @@ int rds_decoder_redsea_impl::work (int noutput_items,
group_good_blocks_counter++; group_good_blocks_counter++;
} }
if (group_good_blocks_counter==5) decode_group(group); if (group_good_blocks_counter==5) decode_group(group);
//if (group_good_blocks_counter==5 and group_corrected_blocks_counter>0) decode_group(group);//test corrected blocks
} }
block_bit_counter=0; block_bit_counter=0;
block_number=(block_number+1) % 4; block_number=(block_number+1) % 4;

2
python/tmc_classes.py
Unescape View File

@ -428,7 +428,7 @@ class tmc_location:
print("lcn is segment %i"%lcn) print("lcn is segment %i"%lcn)
elif self.lcl_obj.roads.has_key(lcn) and self.tableobj.debug: elif self.lcl_obj.roads.has_key(lcn) and self.tableobj.debug:
print("lcn is road %i"%lcn) print("lcn is road %i"%lcn)
else: elif self.tableobj.debug:
print("lcn not found %i"%lcn) print("lcn not found %i"%lcn)
elif self.tableobj.log or self.tableobj.debug: elif self.tableobj.log or self.tableobj.debug:

6
python/tmc_parser.py
Unescape View File

@ -100,7 +100,7 @@ class tmc_parser(gr.sync_block):
print("closing tmc display") print("closing tmc display")
def save_data(self): def save_data(self):
print_dbg('saving data..', end="") print_dbg('saving data..', end="")
self.dataLock.acquire(1) #self.dataLock.acquire(1) #disabled 2017-06-06 for performance
if self.writeDB: if self.writeDB:
self.dbLock.acquire(1) self.dbLock.acquire(1)
self.db.commit() self.db.commit()
@ -108,7 +108,7 @@ class tmc_parser(gr.sync_block):
f=open(self.workdir+'google_maps_markers.js', 'w') f=open(self.workdir+'google_maps_markers.js', 'w')
markerstring=self.tmc_messages.getMarkerString() markerstring=self.tmc_messages.getMarkerString()
self.dataLock.release(1) #self.dataLock.release(1)
markerstring+='\n console.log("loaded "+markers.length+" markers")' markerstring+='\n console.log("loaded "+markers.length+" markers")'
markerstring+='\n document.getElementById("errorid").innerHTML = "loaded "+markers.length+" markers";' markerstring+='\n document.getElementById("errorid").innerHTML = "loaded "+markers.length+" markers";'
f.write(markerstring) f.write(markerstring)
@ -287,7 +287,7 @@ class tmc_parser(gr.sync_block):
pass pass
return return_string return return_string
def print_dbg(message,end="\n"): def print_dbg(message,end="\n"):
dbg=True dbg=False
if dbg: if dbg:
print(message,end=end) print(message,end=end)
class tmc_parser_Widget(QtGui.QWidget): class tmc_parser_Widget(QtGui.QWidget):

Write Preview
Loading…
Cancel
Save