FGFS-4.1/gr-air-modes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change reference output so it now outputs SNR, which is much more useful.

Browse Source
This commit is contained in:
Nick Foster 2013-06-10 07:47:42 -04:00
parent c0543923f6
commit fd6ee2ce89
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/air_modes_preamble.cc
View File

@ -210,7 +210,7 @@ int air_modes_preamble::general_work(int noutput_items,
add_item_tag(0, //stream ID add_item_tag(0, //stream ID
nitems_written(0), //sample nitems_written(0), //sample
d_key, //frame_info d_key, //frame_info
pmt::pmt_from_double(tstamp), pmt::pmt_make_tuple(pmt::pmt_from_double(tstamp), pmt::pmt_from_double(inavg[i])),
d_me //block src id d_me //block src id
); );

5
lib/air_modes_slicer.cc
View File

@ -160,7 +160,8 @@ int air_modes_slicer::work(int noutput_items,
} }
} }
rx_packet.timestamp = pmt_to_double(tag_iter->value); rx_packet.timestamp = pmt_to_double(pmt_tuple_ref(tag_iter->value, 0));
double ref = pmt_to_double(pmt_tuple_ref(tag_iter->value, 1));
//traverse the whole packet and if you find all 0's, just toss it. don't know why these packets turn up, but they pass ECC. //traverse the whole packet and if you find all 0's, just toss it. don't know why these packets turn up, but they pass ECC.
bool zeroes = 1; bool zeroes = 1;
@ -186,7 +187,7 @@ int air_modes_slicer::work(int noutput_items,
d_payload << std::hex << std::setw(2) << std::setfill('0') << unsigned(rx_packet.data[m]); d_payload << std::hex << std::setw(2) << std::setfill('0') << unsigned(rx_packet.data[m]);
} }
d_payload << " " << std::setw(6) << rx_packet.crc << " " << std::dec << rx_packet.reference_level d_payload << " " << std::setw(6) << rx_packet.crc << " " << std::dec << rx_packet.reference_level / ref
<< " " << std::setprecision(10) << std::setw(10) << rx_packet.timestamp; << " " << std::setprecision(10) << std::setw(10) << rx_packet.timestamp;
gr_message_sptr msg = gr_make_message_from_string(std::string(d_payload.str())); gr_message_sptr msg = gr_make_message_from_string(std::string(d_payload.str()));
d_queue->handle(msg); d_queue->handle(msg);