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

Merge remote-tracking branch 'refs/remotes/rpp0/master' into dev

pull/32/head
Wosser1sProductions 2017-06-02 15:51:49 +02:00
rodzic 676745bd5a 7f457ff6cc
commit 19bbc874cf
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
lib/decoder_impl.cc
Wyświetl plik

@ -32,7 +32,7 @@
#include "utilities.h" #include "utilities.h"
//#define NO_TMP_WRITES 1 /// Debug output file write //#define NO_TMP_WRITES 1 /// Debug output file write
#define CFO_CORRECT 1 /// Correct shift fft estimation //#define CFO_CORRECT 1 /// Correct shift fft estimation
//#undef NDEBUG /// Debug printing //#undef NDEBUG /// Debug printing
//#define NDEBUG /// No debug printing //#define NDEBUG /// No debug printing
@ -351,7 +351,7 @@ namespace gr {
// Cross correlate between start and end of falling edge instead of entire window // Cross correlate between start and end of falling edge instead of entire window
for (uint32_t i = local_max_idx; i < local_min_idx; i++) { for (uint32_t i = local_max_idx; i < local_min_idx; i++) {
const float max_corr = this->cross_correlate_ifreq(samples_ifreq + i, this->d_upchirp_ifreq, 0u, /*std::min(len, window - i - 1u)*/ len); const float max_corr = this->cross_correlate_ifreq(samples_ifreq + i, this->d_upchirp_ifreq, 0u, std::min(len, window - i - 1u));
if (max_corr > max_correlation) { if (max_corr > max_correlation) {
*index = i; *index = i;
max_correlation = max_corr; max_correlation = max_corr;
@ -409,7 +409,7 @@ namespace gr {
gr_complex mult_hf[this->d_samples_per_symbol]; gr_complex mult_hf[this->d_samples_per_symbol];
gr_complex sample[this->d_samples_per_symbol]; gr_complex sample[this->d_samples_per_symbol];
memcpy(sample, samples, this->d_samples_per_symbol); memcpy(sample, samples, this->d_samples_per_symbol*sizeof(gr_complex));
#ifdef CFO_CORRECT #ifdef CFO_CORRECT
this->determine_cfo(&samples[0]); this->determine_cfo(&samples[0]);
#ifndef NDEBUG #ifndef NDEBUG