mirror
/
gr-lora
kopia lustrzana https://github.com/rpp0/gr-lora
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Removed separate whitening sequences for sf 11 and 12

pull/61/head
Pieter Robyns 2017-08-25 13:22:26 +02:00
rodzic 1bf5399f05
commit 025f49f317
2 zmienionych plików z 2 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
lib/decoder_impl.cc
Wyświetl plik

@ -65,13 +65,7 @@ namespace gr {
}
// Set whitening sequence
if(sf == 11) {
this->d_whitening_sequence = gr::lora::prng_payload_sf11;
} else if(sf == 12) {
this->d_whitening_sequence = gr::lora::prng_payload_sf12;
} else {
this->d_whitening_sequence = gr::lora::prng_payload;
}
this->d_whitening_sequence = gr::lora::prng_payload;
if (sf == 6) {
std::cerr << "[LoRa Decoder] WARNING : Spreading factor wrapped around to 12 due to incompatibility in hardware!" << std::endl;
@ -553,7 +547,7 @@ namespace gr {
uint32_t bin_idx = this->max_frequency_gradient_idx(samples, is_header);
//uint32_t bin_idx = this->get_shift_fft(samples);
fine_sync(samples, bin_idx, 4);
fine_sync(samples, bin_idx, 2);
// DBGR_INTERMEDIATE_TIME_MEASUREMENT();

8
lib/tables.h
Wyświetl plik

@ -39,14 +39,6 @@ namespace gr {
/*0xff, 0xff, 0x2e, 0xff, 0x5c, 0xff, 0xe8, 0xff, 0x00, 0xff, 0xd1, 0x2e, 0x72, 0x5c, 0x65, 0xe8, 0x4b, 0x00, 0x17, 0xd1, 0xff, 0x72, 0x2e, 0x65, 0x5c, 0x4b, 0xe8, 0x17, 0xd1, 0xff, 0xa3, 0x2e, 0xc6, 0x5c, 0x8d, 0xe8, 0x9a, 0xd1, 0xb4, 0xa3, 0xe8, 0xc6, 0x00, 0x8d, 0x00, 0x9a, 0x00, 0xb4, 0x00, 0xe8, 0xd1, 0x00, 0x72, 0x00, 0xb4, 0x00, 0xe8, 0x00, 0xd1, 0xd1, 0xa3, 0x72, 0x17, 0xb4, 0x2e, 0xe8, 0x5c, 0xd1, 0xe8, 0xa3, 0xd1, 0x17, 0x72, 0x2e, 0xb4, 0x5c, 0x39, 0xe8, 0x72, 0xd1, 0x65, 0x72, 0x4b, 0xb4, 0x17, 0x39, 0x2e, 0x72, 0x5c, 0x65, 0xe8, 0x4b, 0x00, 0x17, 0x00, 0x2e, 0x00, 0x5c, 0xd1, 0xe8, 0xa3, 0x00, 0xc6, 0x00, 0x5c, 0x00, 0x39, 0xd1, 0x72, 0xa3, 0xb4, 0xc6, 0x39, 0x5c, 0x72, 0x39, 0xb4, 0x72, 0x39, 0xb4, 0xa3, 0x39, 0xc6, 0x72, 0x8d, 0xb4, 0x4b, 0x39, 0x17, 0xa3, 0x2e, 0xc6, 0x5c, 0x8d, 0x39, 0x4b, 0x72, 0x17, 0xb4, 0x2e, 0xe8, 0x5c, 0x00, 0x39, 0x00, 0x72, 0xd1, 0xb4, 0x72, 0xe8, 0x65, 0x00, 0x9a, 0x00, 0x65, 0xd1, 0x4b, 0x72, 0xc6, 0x65, 0x8d, 0x9a, 0x4b, 0x65, 0xc6, 0x4b, 0x8d, 0xc6, 0x9a, 0x8d, 0x65, 0x4b, 0x4b, 0xc6, 0xc6, 0x8d, 0x5c, 0x9a, 0x39, 0x65, 0x72, 0x4b, 0x65, 0xc6, 0x4b, 0x5c, 0xc6, 0x39, 0x5c, 0x72, 0xe8, 0x65, 0x00, 0x4b, 0xd1, 0xc6, 0xa3, 0x5c, 0x17, 0xe8, 0xff, 0x00, 0xff, 0xd1, 0x2e, 0xa3, 0x8d, 0x17, 0x4b, 0xff, 0xc6, 0xff, 0x8d, 0x2e, 0x4b, 0x8d, 0x17, 0x4b, 0xff, 0xc6, 0x2e, 0x8d, 0x8d, 0x4b, 0x9a, 0x17, 0x65, 0xff, 0x4b, 0x2e, 0x17, 0x8d, 0x2e, 0x9a, 0x8d, 0x65, 0x9a, 0x4b, 0xb4, 0x17, 0xe8, 0x2e, 0xd1, 0x8d, 0x72, 0x9a, 0xb4, 0xb4, 0xe8, 0xe8, 0x00, 0xd1, 0xd1, 0x72, 0xa3, 0xb4*/
};
const uint8_t prng_payload_sf11[] = {
0xff, 0xff, 0x2d, 0xff, 0x78, 0xf9, 0xe5, 0xdf, 0x00, 0xee, 0x80, 0x7f, 0xd2, 0x2d, 0x55, 0x78, 0x4b, 0xe1, 0x42, 0x00, 0x36, 0x80, 0x5e, 0xd2, 0xff, 0x55, 0x2d, 0x49, 0x74, 0x4a, 0xe9, 0x26, 0xa1, 0x1e, 0x52, 0xff, 0x87, 0x2d, 0xca, 0x70, 0x8c, 0xe9, 0xaa, 0xa0, 0x34, 0xd2, 0x99, 0x87, 0xe1, 0xca, 0x00, 0x8c, 0x20, 0xaa, 0x00, 0x34, 0x80, 0x99, 0x00, 0xe1, 0xd2, 0x04, 0x5b, 0x00, 0x94, 0x00, 0x19, 0x00, 0xe1, 0x00, 0xd0, 0xd0, 0x83, 0x53, 0x26, 0x84, 0x1f, 0x59, 0xad, 0xe1, 0x78, 0xd0, 0xe1, 0x83, 0xd0, 0x26, 0x42, 0x1f, 0x55, 0xad, 0x99, 0x78, 0x31, 0xe3, 0x53, 0xd8, 0x65, 0x42, 0x0a, 0x15, 0xe6, 0x99, 0x1e, 0x31, 0x29, 0x53, 0x54, 0x65, 0xe8, 0x0b, 0x61, 0xe6, 0x00, 0x1e, 0x00, 0x29, 0x04, 0x5c, 0xe0, 0xe8, 0x93, 0x21, 0x07, 0x00, 0xcc, 0x00, 0x7a, 0x04, 0x19, 0xc0, 0x72, 0x92, 0x15, 0x07, 0x99, 0xcc, 0x31, 0x78, 0x57, 0x19, 0x85, 0x62, 0x18, 0x55, 0xb3, 0x99, 0x87, 0x31, 0xc8, 0x57, 0x84, 0x85, 0x7a, 0x19, 0x66, 0x33, 0x1e, 0x87, 0x2d, 0xc8, 0x74, 0x84, 0x29, 0x7a, 0x32, 0x26, 0xd5, 0x1e, 0x99, 0x2d, 0xe1, 0x70, 0x08, 0x09, 0x10, 0x33, 0x00, 0xd5, 0xd2, 0x99, 0x55, 0xe1, 0x45, 0x00, 0xaa, 0x10, 0x34, 0x00, 0xcb, 0xd2, 0x66, 0x55, 0xca, 0x41, 0x8c, 0x8a, 0x6a, 0x35, 0x66, 0x4b, 0xcc, 0x66, 0xa8, 0xca, 0xb2, 0x84, 0x65, 0x7a, 0x0b, 0x26, 0x66, 0xcc, 0xcc, 0xa8, 0x7a, 0xb2, 0x19, 0x65, 0x62, 0x0a, 0x15, 0xe6, 0x4b, 0xcc, 0x64, 0x7a, 0xc6, 0x11, 0x6c, 0x62, 0xb8, 0x55, 0x61, 0x4b, 0x00, 0x64, 0xd2, 0xc6, 0x83, 0x4c, 0x06, 0xb9, 0x1e, 0xe1, 0xff, 0x00, 0xfd, 0xd2, 0x27, 0x83, 0xac, 0x06, 0x2a, 0x5e, 0x66, 0xff, 0xcc, 0xfd, 0xaa, 0x27, 0x4a, 0xac, 0x36, 0x2b, 0x5e, 0xe6, 0xff, 0xcc, 0x2d, 0xaa, 0xa0, 0x42, 0xaa, 0x36, 0x35, 0x1e, 0x4b, 0xff, 0x66, 0x2d, 0x1a, 0xa0, 0x07, 0xaa, 0xbc, 0x35, 0x2a, 0x4b, 0xb4, 0x66, 0x99, 0x1a, 0xe1, 0x0f, 0xc0, 0xac, 0x13, 0x6a, 0x55, 0xb4, 0x99, 0x99, 0xe3, 0xe1, 0x00, 0xc0, 0xd0, 0x12, 0x52, 0xd5, 0x87, 0x99, 0xcc, 0xe1, 0xa0, 0x00, 0x4a, 0xc0, 0xa6, 0x12, 0x4c, 0x87, 0x78, 0xcc, 0xe3, 0xa4, 0xd8, 0x4a, 0x92, 0xa6, 0x07, 0x4c, 0x1e, 0x78, 0xfd, 0xe1, 0x27, 0xd0, 0x6c, 0x92, 0x38, 0x07, 0xb3, 0x1e, 0x87, 0xfd, 0x1a, 0x27, 0x07, 0x6c, 0x6c, 0x38, 0x78, 0x33, 0x33, 0x87, 0x85, 0x18, 0xc2, 0x0f, 0x6c, 0x7c, 0xb8, 0x78, 0x61, 0x33, 0xd2, 0x85, 0x51, 0xc6, 0x45, 0x6c, 0x5a, 0xb8, 0x26, 0xe1, 0xcc, 0xd2, 0xa8, 0x51, 0xb6, 0x45, 0x85, 0x5a, 0x19, 0x66, 0x33, 0xcc, 0x55, 0xa8, 0x9b, 0xb6, 0xc9, 0x85, 0xf0, 0x18, 0x12, 0x33, 0x55, 0x55, 0x49, 0x9b, 0xb6, 0xc9, 0xa5, 0xf0, 0x19, 0x52, 0xb3, 0x55, 0x55, 0x49, 0x49, 0xb2, 0x92, 0x85, 0x64, 0x18, 0x0b, 0x33, 0xb4, 0x55, 0x99, 0x4b, 0x35, 0x9a, 0x83, 0x74, 0x06, 0x0b, 0x1e, 0xb4, 0x2d, 0x99, 0xa8, 0x31, 0x42, 0xa3, 0x26, 0x07, 0x5e, 0x9e, 0x2d, 0x2d, 0xa8, 0xa8, 0x66, 0x42, 0xe6, 0x36, 0x0c, 0x1e, 0xf8, 0x2d, 0x33, 0xa8, 0x81, 0x62, 0x16, 0xc6, 0xce, 0x0c, 0x3f, 0x78, 0x2d, 0x33, 0xa8, 0x81, 0x62, 0x1e, 0x06, 0xde, 0x9f, 0x3f, 0xff, 0x2d, 0xff, 0xa8, 0xfb, 0x66, 0x0f, 0x06, 0xbc, 0x9e, 0x2a, 0x7f, 0xb4, 0xff, 0x99, 0xf9, 0x35, 0x07, 0x83, 0xbc, 0x87, 0x6a, 0x4c, 0xb4, 0x78, 0x99, 0x33, 0x31, 0x8b, 0x83, 0xc6, 0x87, 0x4c, 0x4c, 0xaa, 0x78, 0xb4, 0x31, 0x41, 0x83, 0xaa, 0xc6, 0xb5, 0x4c,
};
const uint8_t prng_payload_sf12[] = {
0xff, 0xff, 0x2d, 0xff, 0x78, 0xfd, 0xe3, 0xf7, 0x00, 0xcf, 0xc0, 0x3f, 0x12, 0xad, 0x55, 0x78, 0x4b, 0xe1, 0x62, 0x04, 0x1e, 0xe0, 0xde, 0x13, 0x7f, 0xd5, 0x2d, 0x4b, 0x78, 0x64, 0xe1, 0x12, 0xd0, 0xcf, 0x82, 0x3e, 0x07, 0x2d, 0xcc, 0x78, 0xaa, 0xe1, 0xb2, 0xd4, 0x9d, 0x83, 0xd8, 0x86, 0x21, 0x4c, 0x00, 0xaa, 0x00, 0xb4, 0x02, 0x91, 0x00, 0xc9, 0xd0, 0x20, 0x52, 0x80, 0x55, 0x00, 0x99, 0x00, 0xe1, 0x00, 0xd8, 0xc0, 0x92, 0x13, 0x07, 0xd5, 0x1e, 0x99, 0x2d, 0xe1, 0x78, 0xd0, 0xc1, 0x83, 0xe0, 0x06, 0x12, 0x1e, 0x55, 0x2d, 0x99, 0x78, 0x33, 0xe1, 0x53, 0xc0, 0x54, 0x12, 0x4b, 0xd5, 0x66, 0x99, 0x1e, 0x31, 0x29, 0x53, 0x54, 0x65, 0xe8, 0x0b, 0x61, 0xe6, 0x00, 0x1e, 0x00, 0x2d, 0x00, 0x74, 0xd0, 0xc9, 0x92, 0x21, 0x47, 0x00, 0xcc, 0x00, 0x78, 0x00, 0x31, 0xd0, 0x5b, 0xa3, 0x94, 0x86, 0x59, 0x4c, 0x33, 0x78, 0x55, 0x31, 0x9b, 0x53, 0x11, 0x85, 0xb2, 0x18, 0x47, 0xb3, 0xcc, 0x55, 0xaa, 0x99, 0x60, 0x35, 0x16, 0x83, 0x1e, 0x87, 0x6d, 0x4c, 0x78, 0xaa, 0x33, 0x64, 0x53, 0x12, 0x95, 0x2f, 0xd8, 0x2d, 0x21, 0x78, 0x00, 0x33, 0x00, 0x55, 0xd2, 0x95, 0x5b, 0xc9, 0x54, 0x20, 0x0b, 0x00, 0xb4, 0x00, 0x4b, 0xd0, 0x60, 0x53, 0xce, 0x45, 0x9c, 0x8b, 0x2a, 0xb4, 0x66, 0x4b, 0xcc, 0x64, 0xa8, 0xc6, 0x82, 0x8c, 0x64, 0x2b, 0x4b, 0x66, 0x66, 0xcc, 0xcc, 0xa8, 0x78, 0xb6, 0x19, 0x45, 0x62, 0x0a, 0x55, 0xe6, 0x4b, 0xcc, 0x66, 0x78, 0xc8, 0x35, 0x54, 0x63, 0xf8, 0x14, 0x21, 0xcb, 0x00, 0x66, 0xd2, 0xcc, 0x83, 0x70, 0x16, 0xe9, 0xde, 0x21, 0x3f, 0x00, 0xff, 0xd2, 0x2d, 0x85, 0xa8, 0x12, 0x4a, 0xef, 0xf6, 0xbe, 0x4c, 0x7f, 0xaa, 0x2d, 0x66, 0xa8, 0x1a, 0x66, 0xdf, 0xc6, 0x3e, 0x8c, 0x2d, 0x2a, 0xaa, 0x66, 0xb4, 0x1c, 0x4b, 0xf7, 0x42, 0x2f, 0x26, 0xac, 0x5e, 0x2a, 0x2d, 0xb4, 0xaa, 0x49, 0xb2, 0x66, 0x9d, 0x26, 0xd8, 0x1f, 0x61, 0xad, 0xd2, 0xaa, 0x55, 0xb4, 0x9b, 0x95, 0xc1, 0xe9, 0x20, 0xa0, 0x40, 0x52, 0xd2, 0x55, 0x87, 0x99, 0xc8, 0xe1, 0x8c, 0x00, 0x7a, 0x81, 0x26, 0xd2, 0xcc, 0x87, 0x78, 0xcc, 0xe1, 0xa0, 0xd0, 0x6a, 0x82, 0xa7, 0x47, 0xcc, 0x1e, 0x78, 0xff, 0xe1, 0x2b, 0xd0, 0x5c, 0xa3, 0x28, 0x06, 0x33, 0x9e, 0x87, 0xff, 0x1e, 0x2d, 0x2b, 0x70, 0x54, 0x09, 0x38, 0xb2, 0x73, 0x87, 0x87, 0x1e, 0xcc, 0x2d, 0x78, 0x70, 0xc9, 0x29, 0xf0, 0xb2, 0x52, 0x07, 0x55, 0xcc, 0x4b, 0x78, 0x60, 0xe1, 0xce, 0xe0, 0x9c, 0x12, 0x6a, 0x55, 0xb4, 0x4b, 0x99, 0x64, 0x31, 0xc2, 0x53, 0xac, 0x84, 0xab, 0x59, 0xb4, 0xe1, 0x99, 0xd2, 0x31, 0x51, 0x57, 0x4d, 0x85, 0x8a, 0x98, 0x74, 0xe1, 0x99, 0xd2, 0x33, 0x55, 0x51, 0x45, 0x45, 0x8a, 0x9a, 0xb5, 0x74, 0x19, 0x4b, 0x33, 0xb4, 0x55, 0x9b, 0x41, 0x19, 0x8a, 0xa2, 0x35, 0x47, 0x4b, 0x1e, 0xb4, 0x2d, 0x99, 0xaa, 0x31, 0x4a, 0x83, 0x26, 0x07, 0x5e, 0x1e, 0x2d, 0x2d, 0xaa, 0xa8, 0x62, 0x62, 0xc6, 0x26, 0x5c, 0x1f, 0x38, 0x2d, 0x33, 0xaa, 0x87, 0x64, 0x1a, 0xc6, 0xd7, 0x6c, 0x2e, 0x38, 0x6d, 0x33, 0xaa, 0x87, 0x66, 0x1c, 0x18, 0xf7, 0xdf, 0x0f, 0xee, 0xac, 0x7f, 0xaa, 0xff, 0x66, 0x2d, 0x1c, 0xaa, 0xf7, 0x9a, 0xef, 0xb4, 0xbf, 0x59, 0xff, 0x33, 0x2d, 0x87, 0xa8, 0xca, 0xb6, 0x5c, 0xa5, 0x38, 0x19, 0x73, 0xb3, 0x87, 0x87, 0xcc, 0xcc, 0xa8, 0x74, 0x92, 0x29, 0x74, 0xb2, 0x0b, 0x87, 0xb4, 0xcc, 0x99, 0xa8, 0xe1, 0xb2, 0xd8, 0x65, 0x92, 0x8a, 0x47, 0x34,
};
}
}