t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Bastian Bloessl
2017-08-09 22:38:55 +01:00
parent fc429e7f17 26a0c2c87e
commit df0d480c59
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/frame_equalizer_impl.cc
+1 -1
View File
@@ -337,7 +337,7 @@ frame_equalizer_impl::parse_signal(uint8_t *decoded_bits) {
return true; return true;
} }
int const int
frame_equalizer_impl::interleaver_pattern[48] = { frame_equalizer_impl::interleaver_pattern[48] = {
0, 3, 6, 9,12,15,18,21, 0, 3, 6, 9,12,15,18,21,
24,27,30,33,36,39,42,45, 24,27,30,33,36,39,42,45,
lib/frame_equalizer_impl.h
+1 -1
View File
@@ -79,7 +79,7 @@ private:
constellation_16qam::sptr d_16qam; constellation_16qam::sptr d_16qam;
constellation_64qam::sptr d_64qam; constellation_64qam::sptr d_64qam;
static int interleaver_pattern[48]; static const int interleaver_pattern[48];
}; };
} // namespace ieee802_11 } // namespace ieee802_11
lib/mapper.cc
+5 -4
View File
@@ -33,6 +33,7 @@ mapper_impl(Encoding e, bool debug) :
d_symbols_offset(0), d_symbols_offset(0),
d_symbols(NULL), d_symbols(NULL),
d_debug(debug), d_debug(debug),
d_scrambler(1),
d_ofdm(e) { d_ofdm(e) {
message_port_register_in(pmt::mp("in")); message_port_register_in(pmt::mp("in"));
@@ -98,10 +99,9 @@ int general_work(int noutput, gr_vector_int& ninput_items,
generate_bits(psdu, data_bits, frame); generate_bits(psdu, data_bits, frame);
// scrambling // scrambling
static uint8_t scrambler = 1; scramble(data_bits, scrambled_data, frame, d_scrambler++);
scramble(data_bits, scrambled_data, frame, scrambler++); if(d_scrambler > 127) {
if(scrambler > 127) { d_scrambler = 1;
scrambler = 1;
} }
// reset tail bits // reset tail bits
@@ -172,6 +172,7 @@ void set_encoding(Encoding encoding) {
} }
private: private:
uint8_t d_scrambler;
bool d_debug; bool d_debug;
char* d_symbols; char* d_symbols;
int d_symbols_offset; int d_symbols_offset;
lib/sync_long.cc
+1
View File
@@ -104,6 +104,7 @@ int general_work (int noutput, gr_vector_int& ninput_items,
if(d_offset == SYNC_LENGTH) { if(d_offset == SYNC_LENGTH) {
search_frame_start(); search_frame_start();
mylog(boost::format("LONG: frame start at %1%") % d_frame_start);
d_offset = 0; d_offset = 0;
d_count = 0; d_count = 0;
d_state = COPY; d_state = COPY;
lib/sync_short.cc
+4 -4
View File
@@ -73,7 +73,7 @@ int general_work (int noutput_items, gr_vector_int& ninput_items,
d_copied = 0; d_copied = 0;
d_freq_offset = arg(in_abs[i]) / 16; d_freq_offset = arg(in_abs[i]) / 16;
d_plateau = 0; d_plateau = 0;
insert_tag(nitems_written(0), d_freq_offset); insert_tag(nitems_written(0), d_freq_offset, nitems_read(0) + i);
dout << "SHORT Frame!" << std::endl; dout << "SHORT Frame!" << std::endl;
break; break;
} }
@@ -99,7 +99,7 @@ int general_work (int noutput_items, gr_vector_int& ninput_items,
d_copied = 0; d_copied = 0;
d_plateau = 0; d_plateau = 0;
d_freq_offset = arg(in_abs[o]) / 16; d_freq_offset = arg(in_abs[o]) / 16;
insert_tag(nitems_written(0) + o, d_freq_offset); insert_tag(nitems_written(0) + o, d_freq_offset, nitems_read(0) + o);
dout << "SHORT Frame!" << std::endl; dout << "SHORT Frame!" << std::endl;
break; break;
} }
@@ -128,8 +128,8 @@ int general_work (int noutput_items, gr_vector_int& ninput_items,
return 0; return 0;
} }
void insert_tag(uint64_t item, double freq_offset) { void insert_tag(uint64_t item, double freq_offset, uint64_t input_item) {
mylog(boost::format("frame start at %1%") % item); mylog(boost::format("frame start at in: %2% out: %1%") % item % input_item);
const pmt::pmt_t key = pmt::string_to_symbol("wifi_start"); const pmt::pmt_t key = pmt::string_to_symbol("wifi_start");
const pmt::pmt_t value = pmt::from_double(freq_offset); const pmt::pmt_t value = pmt::from_double(freq_offset);