Skip to content

Commit

Permalink
Merge pull request #312 from HRosete/test-fixes
Browse files Browse the repository at this point in the history 
TH Test fixes for FMCOMMS5, AD9371, ADRV9009
  • Loading branch information
@tfcollins
tfcollins authored Mar 9, 2022
2 parents fc023d5 + 0a8a429 commit 6a983da
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 38 deletions.
27 changes: 14 additions & 13 deletions test/test_ad9371.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,22 +710,23 @@ def test_ad9371_dds_gain_check_vary_power(
@pytest.mark.parametrize("classname", [(classname)])
@pytest.mark.parametrize("channel", [0, 1])
@pytest.mark.parametrize(
"param_set, dds_scale, min_rssi, max_rssi",
"param_set, dds_scale",
[
(params["one_cw_tone_manual"], 0.5, 30, 31),
(params["one_cw_tone_manual"], 0.12, 42.5, 43.5),
(params["one_cw_tone_manual"], 0.25, 35.5, 36.5),
(params["one_cw_tone_auto"], 0.12, 32.5, 33.5),
(params["change_attenuation_5dB_manual"], 0.25, 41, 42),
(params["change_attenuation_10dB_manual"], 0.25, 44, 45),
(params["change_attenuation_0dB_auto"], 0.12, 22.75, 23.75),
(params["change_attenuation_20dB_auto"], 0.12, 42, 43),
(params["change_rf_gain_0dB_manual"], 0.25, 45.5, 46.5),
(params["change_rf_gain_20dB_manual"], 0.25, 26, 27),
(params["change_temp_gain_up"], 0.25, 35.75, 36.75),
(params["change_temp_gain_down"], 0.25, 35.75, 36.75),
(params["one_cw_tone_manual"], 0.5),
(params["one_cw_tone_manual"], 0.12),
(params["one_cw_tone_manual"], 0.25),
(params["one_cw_tone_auto"], 0.12),
(params["change_attenuation_5dB_manual"], 0.25),
(params["change_attenuation_10dB_manual"], 0.25),
(params["change_attenuation_0dB_auto"], 0.12),
(params["change_attenuation_20dB_auto"], 0.12),
(params["change_rf_gain_0dB_manual"], 0.25),
(params["change_rf_gain_20dB_manual"], 0.25),
(params["change_temp_gain_up"], 0.25),
(params["change_temp_gain_down"], 0.25),
],
)
@pytest.mark.parametrize("min_rssi, max_rssi", [(10, 50)])
def test_ad9371_dds_gain_check_vary_power_with_10dB_splitter(
test_gain_check,
iio_uri,
Expand Down
50 changes: 26 additions & 24 deletions test/test_adrv9009_p.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,22 +419,23 @@ def test_adrv9009_dds_loopback(
@pytest.mark.parametrize("classname", [(classname)])
@pytest.mark.parametrize("channel", [0, 1])
@pytest.mark.parametrize(
"param_set, frequency, scale, peak_min",
"param_set, frequency, scale",
[
(params["one_cw_tone_manual"], 2000000, 0.5, -53),
(params["one_cw_tone_manual"], 2000000, 0.12, -66),
(params["one_cw_tone_manual"], 2000000, 0.25, -60),
(params["one_cw_tone_slow_attack"], 1000000, 0.12, -55.5),
(params["one_cw_tone_slow_attack"], 2000000, 0.12, -55.5),
(params["one_cw_tone_slow_attack"], 500000, 0.12, -56),
(params["change_attenuation_5dB_manual"], 2000000, 0.25, -65),
(params["change_attenuation_10dB_manual"], 2000000, 0.25, -69),
(params["change_attenuation_0dB_slow_attack"], 1000000, 0.12, -46),
(params["change_attenuation_20dB_slow_attack"], 1000000, 0.12, -65),
(params["change_rf_gain_0dB_manual"], 2000000, 0.25, -70),
(params["change_rf_gain_20dB_manual"], 2000000, 0.25, -50),
(params["one_cw_tone_manual"], 2000000, 0.5),
(params["one_cw_tone_manual"], 2000000, 0.12),
(params["one_cw_tone_manual"], 2000000, 0.25),
(params["one_cw_tone_slow_attack"], 1000000, 0.12),
(params["one_cw_tone_slow_attack"], 2000000, 0.12),
(params["one_cw_tone_slow_attack"], 500000, 0.12),
(params["change_attenuation_5dB_manual"], 2000000, 0.25),
(params["change_attenuation_10dB_manual"], 2000000, 0.25),
(params["change_attenuation_0dB_slow_attack"], 1000000, 0.12),
(params["change_attenuation_20dB_slow_attack"], 1000000, 0.12),
(params["change_rf_gain_0dB_manual"], 2000000, 0.25),
(params["change_rf_gain_20dB_manual"], 2000000, 0.25),
],
)
@pytest.mark.parametrize("peak_min", [-50])
def test_adrv9009_dds_loopback_with_10dB_splitter(
test_dds_loopback,
iio_uri,
Expand Down Expand Up @@ -577,7 +578,7 @@ def test_adrv9009_two_tone_loopback_with_10dB_splitter(
params["change_trx_lo_5GHz_slow_attack"],
],
)
@pytest.mark.parametrize("sfdr_min", [45])
@pytest.mark.parametrize("sfdr_min", [30])
def test_adrv9009_sfdr(test_sfdr, iio_uri, classname, channel, param_set, sfdr_min):
test_sfdr(iio_uri, classname, channel, param_set, sfdr_min)

Expand Down Expand Up @@ -675,19 +676,20 @@ def test_adrv9009_dds_gain_check_agc(
@pytest.mark.parametrize("classname", [(classname)])
@pytest.mark.parametrize("channel", [0, 1])
@pytest.mark.parametrize(
"param_set, dds_scale, min_rssi, max_rssi",
"param_set, dds_scale, min_rssi",
[
(params["one_cw_tone_slow_attack"], 0.12, 40, 45),
(params["change_attenuation_0dB_slow_attack"], 0.12, 30, 42),
(params["change_attenuation_20dB_slow_attack"], 0.12, 43.5, 45),
(params["change_trx_lo_1GHz_slow_attack"], 0, 43.5, 45.25),
(params["change_trx_lo_1GHz_slow_attack"], 0.9, 30, 40),
(params["change_trx_lo_3GHz_slow_attack"], 0, 43.75, 45),
(params["change_trx_lo_3GHz_slow_attack"], 0.9, 23, 33),
(params["change_trx_lo_5GHz_slow_attack"], 0, 43.75, 45),
(params["change_trx_lo_5GHz_slow_attack"], 0.9, 25, 33),
(params["one_cw_tone_slow_attack"], 0.12, 40),
(params["change_attenuation_0dB_slow_attack"], 0.12, 30),
(params["change_attenuation_20dB_slow_attack"], 0.12, 43.5),
(params["change_trx_lo_1GHz_slow_attack"], 0, 43.5),
(params["change_trx_lo_1GHz_slow_attack"], 0.9, 30),
(params["change_trx_lo_3GHz_slow_attack"], 0, 43.75),
(params["change_trx_lo_3GHz_slow_attack"], 0.9, 23),
(params["change_trx_lo_5GHz_slow_attack"], 0, 43.75),
(params["change_trx_lo_5GHz_slow_attack"], 0.9, 25),
],
)
@pytest.mark.parametrize("max_rssi", [50])
def test_adrv9009_dds_gain_check_agc_with_10db_splitter(
test_gain_check,
iio_uri,
Expand Down
3 changes: 2 additions & 1 deletion test/test_map.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def get_test_map():
"zynq-adrv9361-z7035-box",
"zynq-adrv9361-z7035-bob",
"zynq-adrv9361-z7035-bob-cmos",
] + test_map["fmcomms5"]
]
# + test_map["fmcomms5"]
test_map["ad9364"] = [
"socfpga_cyclone5_sockit_arradio",
"zynq-zc702-adv7511-ad9364-fmcomms4",
Expand Down

0 comments on commit 6a983da

Please sign in to comment.