diff --git a/examples/qa_BasicTest_usrp.log b/examples/qa_BasicTest_usrp.log index 0ca4ecc..6464258 100644 --- a/examples/qa_BasicTest_usrp.log +++ b/examples/qa_BasicTest_usrp.log @@ -1,4 +1,4 @@ --------- Test Results on 2017-08-23 17:19:43 --------- +-------- Test Results on 2017-08-23 17:39:53 --------- Test serie 0: [u'01 23 45 67 89 ab cd ef'] * 10 Test 1 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 10 out of 10 (100.00%) Test 2 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 9 out of 10 ( 90.00%) @@ -12,32 +12,32 @@ Test serie 0: [u'01 23 45 67 89 ab cd ef'] * 10 Test serie 1: [u'11 11 11'] * 1 Test 8 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 1 out of 1 (100.00%) Test 9 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 1 out of 1 (100.00%) - Test 10 :: cr4-5 bw125 sf12 crc1 pwr1 :: passed 1 out of 1 (100.00%) + Test 10 :: cr4-5 bw125 sf12 crc1 pwr1 :: passed 0 out of 1 ( 0.00%) Test 11 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 1 out of 1 (100.00%) Test 12 :: cr4-7 bw125 sf7 crc1 pwr1 :: passed 1 out of 1 (100.00%) Test 13 :: cr4-6 bw125 sf6 crc1 pwr1 :: passed 0 out of 1 ( 0.00%) Test 14 :: cr4-6 bw125 sf7 crc1 pwr1 :: passed 1 out of 1 (100.00%) - => Total passed: 6 out of 7 (85.71%) + => Total passed: 5 out of 7 (71.43%) Test serie 2: [u'11 11 11'] * 5 Test 15 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 5 out of 5 (100.00%) Test 16 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 5 out of 5 (100.00%) Test 17 :: cr4-5 bw125 sf12 crc1 pwr1 :: passed 1 out of 5 ( 20.00%) - Test 18 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 4 out of 5 ( 80.00%) + Test 18 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 3 out of 5 ( 60.00%) Test 19 :: cr4-7 bw125 sf7 crc1 pwr1 :: passed 5 out of 5 (100.00%) Test 20 :: cr4-6 bw125 sf6 crc1 pwr1 :: passed 1 out of 5 ( 20.00%) Test 21 :: cr4-6 bw125 sf7 crc1 pwr1 :: passed 5 out of 5 (100.00%) - => Total passed: 26 out of 35 (74.29%) + => Total passed: 25 out of 35 (71.43%) Test serie 3: [u'aa aa aa aa'] * 3 Test 22 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 3 out of 3 (100.00%) Test 23 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 3 out of 3 (100.00%) Test 24 :: cr4-5 bw125 sf12 crc1 pwr1 :: passed 0 out of 3 ( 0.00%) - Test 25 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 0 out of 3 ( 0.00%) + Test 25 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 2 out of 3 ( 66.67%) Test 26 :: cr4-7 bw125 sf7 crc1 pwr1 :: passed 3 out of 3 (100.00%) Test 27 :: cr4-6 bw125 sf6 crc1 pwr1 :: passed 0 out of 3 ( 0.00%) Test 28 :: cr4-6 bw125 sf7 crc1 pwr1 :: passed 3 out of 3 (100.00%) - => Total passed: 12 out of 21 (57.14%) + => Total passed: 14 out of 21 (66.67%) Test serie 4: [u'ff ff ff ff'] * 1 Test 29 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 1 out of 1 (100.00%) @@ -51,13 +51,13 @@ Test serie 4: [u'ff ff ff ff'] * 1 Test serie 5: [u'ff ff ff ff'] * 10 Test 36 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 9 out of 10 ( 90.00%) - Test 37 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 9 out of 10 ( 90.00%) + Test 37 :: cr4-5 bw125 sf8 crc1 pwr1 :: passed 8 out of 10 ( 80.00%) Test 38 :: cr4-5 bw125 sf12 crc1 pwr1 :: passed 0 out of 10 ( 0.00%) Test 39 :: cr4-7 bw125 sf6 crc1 pwr1 :: passed 0 out of 10 ( 0.00%) Test 40 :: cr4-7 bw125 sf7 crc1 pwr1 :: passed 10 out of 10 (100.00%) Test 41 :: cr4-6 bw125 sf6 crc1 pwr1 :: passed 0 out of 10 ( 0.00%) Test 42 :: cr4-6 bw125 sf7 crc1 pwr1 :: passed 10 out of 10 (100.00%) - => Total passed: 38 out of 70 (54.29%) + => Total passed: 37 out of 70 (52.86%) Test serie 6: [u'55 55 55 55'] * 3 Test 43 :: cr4-5 bw125 sf7 crc1 pwr1 :: passed 3 out of 3 (100.00%) @@ -110,5 +110,5 @@ Test serie 10: [u'88 88 88 88'] * 10 => Total passed: 40 out of 70 (57.14%) - ====== Total passed: 240 out of 413 (58.11%) ====== + ====== Total passed: 239 out of 413 (57.87%) ====== diff --git a/lib/decoder_impl.cc b/lib/decoder_impl.cc index 16de87f..699fe12 100644 --- a/lib/decoder_impl.cc +++ b/lib/decoder_impl.cc @@ -536,7 +536,7 @@ namespace gr { uint32_t bin_idx = this->max_frequency_gradient_idx(samples, is_header); fine_sync(samples, bin_idx); - if(d_fine_sync >= d_decim_factor) + if(abs(d_fine_sync) >= d_decim_factor-1) d_fine_sync = 0; //uint32_t bin_idx = this->get_shift_fft(samples); diff --git a/lib/decoder_impl.h b/lib/decoder_impl.h index bd42f6e..5dbc46c 100644 --- a/lib/decoder_impl.h +++ b/lib/decoder_impl.h @@ -119,7 +119,7 @@ namespace gr { float cross_correlate_ifreq_fast(const float *samples_ifreq, const float *ideal_chirp, const uint32_t window); void fine_sync(const gr_complex* in_samples, uint32_t bin_idx); - uint32_t d_fine_sync; + int32_t d_fine_sync; /** * \brief Calculates the average energy from the given samples and returns whether its higher than the given threshold.