From 91fb5e4930379e03797b860ff8d2fb934f474e8a Mon Sep 17 00:00:00 2001 From: Pieter Robyns Date: Mon, 23 Mar 2020 17:28:49 +0100 Subject: [PATCH] Force SF 11 and SF 12 in test suite to use reduced rate --- docs/test-results/decode_long_hackrf.md | 2 +- docs/test-results/decode_long_rtl-sdr.md | 6 +++--- docs/test-results/decode_long_usrp.md | 2 +- docs/test-results/short_hackrf.md | 6 +++--- docs/test-results/short_rtl-sdr.md | 6 +++--- docs/test-results/short_usrp.md | 18 +++++++++--------- python/qa_testsuite.py | 5 ++++- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/docs/test-results/decode_long_hackrf.md b/docs/test-results/decode_long_hackrf.md index 92f3a5a..a0cbabb 100644 --- a/docs/test-results/decode_long_hackrf.md +++ b/docs/test-results/decode_long_hackrf.md @@ -1,6 +1,6 @@ # Test suite: 'decode_long_hackrf' -*Results on 2020-03-23 15:06:33.743658* +*Results on 2020-03-23 16:43:46.732121* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off diff --git a/docs/test-results/decode_long_rtl-sdr.md b/docs/test-results/decode_long_rtl-sdr.md index c3cbdcf..389d7e2 100644 --- a/docs/test-results/decode_long_rtl-sdr.md +++ b/docs/test-results/decode_long_rtl-sdr.md @@ -1,6 +1,6 @@ # Test suite: 'decode_long_rtl-sdr' -*Results on 2020-03-23 15:52:32.617155* +*Results on 2020-03-23 16:38:49.298826* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off @@ -30,7 +30,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`00010203040506..f8f9fafbfcfdfe` | 0 | 1 | 0.00% +`00010203040506..f8f9fafbfcfdfe` | 1 | 1 | 100.00% ### 868.1 MHz, SF 12, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off @@ -40,5 +40,5 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: ### Summary for suite 'decode_long_rtl-sdr' -Total payloads passed: 4 out of 6 (66.67%) +Total payloads passed: 5 out of 6 (83.33%) diff --git a/docs/test-results/decode_long_usrp.md b/docs/test-results/decode_long_usrp.md index c7fc7e6..5f0e658 100644 --- a/docs/test-results/decode_long_usrp.md +++ b/docs/test-results/decode_long_usrp.md @@ -1,6 +1,6 @@ # Test suite: 'decode_long_usrp' -*Results on 2020-03-23 15:02:11.420446* +*Results on 2020-03-23 16:39:24.283343* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off diff --git a/docs/test-results/short_hackrf.md b/docs/test-results/short_hackrf.md index 2b14742..1944b4a 100644 --- a/docs/test-results/short_hackrf.md +++ b/docs/test-results/short_hackrf.md @@ -1,6 +1,6 @@ # Test suite: 'short_hackrf' -*Results on 2020-03-23 15:07:09.545964* +*Results on 2020-03-23 16:44:22.531402* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off @@ -86,7 +86,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 5 | 5 | 100.00% +`deadbeef ` | 4 | 5 | 80.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -196,5 +196,5 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: ### Summary for suite 'short_hackrf' -Total payloads passed: 384 out of 384 (100.00%) +Total payloads passed: 383 out of 384 (99.74%) diff --git a/docs/test-results/short_rtl-sdr.md b/docs/test-results/short_rtl-sdr.md index 01ef266..b8f05ac 100644 --- a/docs/test-results/short_rtl-sdr.md +++ b/docs/test-results/short_rtl-sdr.md @@ -1,6 +1,6 @@ # Test suite: 'short_rtl-sdr' -*Results on 2020-03-23 15:02:49.201441* +*Results on 2020-03-23 16:40:02.093267* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off @@ -118,7 +118,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 5 | 5 | 100.00% +`deadbeef ` | 1 | 5 | 20.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -196,5 +196,5 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: ### Summary for suite 'short_rtl-sdr' -Total payloads passed: 384 out of 384 (100.00%) +Total payloads passed: 380 out of 384 (98.96%) diff --git a/docs/test-results/short_usrp.md b/docs/test-results/short_usrp.md index e73d702..320dae1 100644 --- a/docs/test-results/short_usrp.md +++ b/docs/test-results/short_usrp.md @@ -1,6 +1,6 @@ # Test suite: 'short_usrp' -*Results on 2020-03-23 15:48:15.192566* +*Results on 2020-03-23 16:34:31.993193* ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off @@ -134,7 +134,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -142,7 +142,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -150,7 +150,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -158,7 +158,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -174,7 +174,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 2 | 5 | 40.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -182,7 +182,7 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% @@ -190,11 +190,11 @@ Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: Transmitted payload | :heavy_check_mark: | :hash: | :heavy_division_sign: --- | --- | --- | --- -`deadbeef ` | 0 | 5 | 0.00% +`deadbeef ` | 5 | 5 | 100.00% `88 ` | 1 | 1 | 100.00% `ffff ` | 10 | 10 | 100.00% ### Summary for suite 'short_usrp' -Total payloads passed: 351 out of 384 (91.41%) +Total payloads passed: 384 out of 384 (100.00%) diff --git a/python/qa_testsuite.py b/python/qa_testsuite.py index e413f4c..6883f69 100755 --- a/python/qa_testsuite.py +++ b/python/qa_testsuite.py @@ -224,7 +224,10 @@ class qa_testsuite(): # Build flowgraph tb = gr.top_block() file_source = blocks.file_source(gr.sizeof_gr_complex, data_file, False) - lora_receiver = lora.lora_receiver(sample_rate, capture_freq, [868100000], bw, sf, False, 4, True, reduced_rate=False, decimation=1) + if sf > 10: # The devices used in the test suites use reduced rate mode for SF > 10 TODO this should be calculated based on symbol time exceeding 16ms per symbol + lora_receiver = lora.lora_receiver(sample_rate, capture_freq, [868100000], bw, sf, False, 4, True, reduced_rate=True, decimation=1) + else: + lora_receiver = lora.lora_receiver(sample_rate, capture_freq, [868100000], bw, sf, False, 4, True, reduced_rate=False, decimation=1) throttle = blocks.throttle(gr.sizeof_gr_complex, sample_rate, True) message_socket_sink = lora.message_socket_sink("127.0.0.1", 40868, 2) freq_xlating_fir_filter = filter.freq_xlating_fir_filter_ccc(1, (firdes.low_pass(1, sample_rate, 200000, 100000, firdes.WIN_HAMMING, 6.67)), frequency_offset, sample_rate)