fix range for bbrxatten files

fixes being clipped on the upper bounary by 1
This commit is contained in:
dsaha26
2019-01-16 10:50:51 -08:00
parent 37595dd471
commit d3a319fcb5
5 changed files with 10 additions and 10 deletions

View File

@@ -31,25 +31,25 @@ if __name__ == '__main__':
context = config_loader.get_conf()
context.path_loss = raw_input("What is the path loss?")
print("\nUsing a path loss of " + context.path_loss + "db")
print("Using a path loss of " + context.path_loss + "db")
context.analyzer_name = "TCPIP0::K-N9030B-80108.local::hislip0::INSTR"
se = 'n'
while (se != 'y'):
print("\nUsing analyzer " + context.analyzer_name)
print("\nSelected analyzer " + context.analyzer_name)
se = raw_input("Is this the correct analyzer?(y/n):")
if (se == 'y') or (se == 'Y'):
se = 'y'
print("\nUsing analyzer " + context.analyzer_name)
print("Using analyzer " + context.analyzer_name)
break
else:
context.analyzer_name = raw_input("Please enter the correct analyzer name:")
context.user_band = "0"
while (context.user_band != "3") or (context.user_band != "5") or (context.user_band != "28"):
context.user_band = raw_input("Which band are you running?(3/5/28):")
context.user_band = raw_input("\nWhich band are you running?(3/5/28):")
if (context.user_band == "3") or (context.user_band == "5") or (context.user_band == "28"):
print ("\nUsing Band " + context.user_band)
print ("Using Band " + context.user_band)
break
else:
print context.user_band + " is not a supported band."

View File

@@ -15,7 +15,7 @@ BW10_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 1)
BW20_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 1)
BW5_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+3, RF_UL_TOP_FREQ-2, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ+1, 1)
BW20_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+10, RF_UL_TOP_FREQ-9, 1)
LTE_BANDWIDTHS = [10, 5, 20]

View File

@@ -15,7 +15,7 @@ BW10_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 1)
BW20_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 1)
BW5_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+3, RF_UL_TOP_FREQ-2, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ+1, 1)
BW20_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+10, RF_UL_TOP_FREQ-9, 1)
LTE_BANDWIDTHS = [10, 5, 20]

View File

@@ -15,7 +15,7 @@ BW10_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+5, RF_DL_TOP_FREQ-4, 1)
BW20_ALL_FREQS = range(RF_DL_BOTTOM_FREQ+10, RF_DL_TOP_FREQ-9, 1)
BW5_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+3, RF_UL_TOP_FREQ-2, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ, 1)
BW10_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ, RF_UL_TOP_FREQ+1, 1)
BW20_ALL_FREQS_UL = range(RF_UL_BOTTOM_FREQ+10, RF_UL_TOP_FREQ-9, 1)
LTE_BANDWIDTHS = [10, 5, 20]

View File

@@ -26,8 +26,8 @@ class PrepareCalibration():
fe_rx_attens = [rx_attn_value*context.CALIBRATION_RX_ATTN_RESOLUTION_DIVIDER]*(len(freq_range))
with utils.stack_chdir(context.CALIBRATION_POSTPROCESS_FOLDER):
context.logger.debug('Writing Temp RX Table for bw=%s and tx=%s' % (str(bw), str(tx)))
calib_utils.LTEFERXCalibTable().set_values(freq_range, pwr_range, temp, fe_rx_attens).save(bandwidth=bw, tx=tx)
calib_utils.LTEBBRXCalibTable().set_values(freq_range, bb_rx_attens).save(bandwidth=bw, tx=tx)
calib_utils.LTEFERXCalibTable().set_values(freq_range, pwr_range, temp, fe_rx_attens).save(band=context.RF_BAND, bandwidth=bw, tx=tx)
calib_utils.LTEBBRXCalibTable().set_values(freq_range, bb_rx_attens).save(band=context.RF_BAND, bandwidth=bw, tx=tx)
#@testrunner.not_implemented
#@testrunner.testcase("Calibrate RX1", critical=True)