diff --git a/lf_tx_power.py b/lf_tx_power.py index 4320a0ef..46ad8858 100755 --- a/lf_tx_power.py +++ b/lf_tx_power.py @@ -239,7 +239,7 @@ Ant 1, Ant 2, Ant 3, Ant 4 : () rssi_adj (only used if --adjust_nf and _noise_bare != None) (~line 1263) _noise_i(_noise_bear) - nf_at_calibration (fixed value of -105) - Thus calc_antX = int(antX read from Lanforge) + pi (path loss from command line) + rssi_adj - ag (antenna gain from command line) + Thus calc_antX = int(antX read from Lanforge) + pi (path loss from command line) + rssi_adj + ag (antenna gain from command line) calc_antX is put on the spread sheet under Ant X @@ -833,16 +833,16 @@ def main(): worksheet.write(row, col, 'Client Reported\nAnt Sig dBm\n SS 4', dpeach_bold) col += 1 worksheet.set_column(col, col, 20) # Set width - worksheet.write(row, col, 'Calc Ant 1 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n - ant gain', dpink_bold) + worksheet.write(row, col, 'Calc Ant 1 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n + ant gain', dpink_bold) col += 1 worksheet.set_column(col, col, 20) # Set width - worksheet.write(row, col, 'Calc Ant 2 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n - ant gain', dpink_bold) + worksheet.write(row, col, 'Calc Ant 2 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n + ant gain', dpink_bold) col += 1 worksheet.set_column(col, col, 20) # Set width - worksheet.write(row, col, 'Calc Ant 3 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n - ant gain', dpink_bold) + worksheet.write(row, col, 'Calc Ant 3 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n + ant gain', dpink_bold) col += 1 worksheet.set_column(col, col, 20) # Set width - worksheet.write(row, col, 'Calc Ant 4 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n - ant gain', dpink_bold) + worksheet.write(row, col, 'Calc Ant 4 =\n Ant Sig dBm\n + pathloss\n + rssi_adj\n + ant gain', dpink_bold) col += 1 worksheet.set_column(col, col, 20) # Set width worksheet.write(row, col, 'Offset 1 = \nCalc Ant\n - cc_dbm(per SS)\n (cc_dbm(per SS)\n is allowed_per_path)', dyel_bold) @@ -1788,11 +1788,11 @@ def main(): pi = int(pathloss) ag = int(antenna_gain) - calc_dbm_beacon = int(beacon_sig) + pi + rssi_adj - ag + calc_dbm_beacon = int(beacon_sig) + pi + rssi_adj + ag logg.info("calc_dbm_beacon {}".format(calc_dbm_beacon)) logg.info("sig: %s" % sig) - calc_dbm = int(sig) + pi + rssi_adj - ag + calc_dbm = int(sig) + pi + rssi_adj + ag logg.info("calc_dbm %s" % (calc_dbm)) # Calculated per-antenna power is what we calculate the AP transmitted @@ -1802,22 +1802,22 @@ def main(): # then we calculate AP transmitted at +2 calc_ant1 = 0 if (ants[0] != ""): - calc_ant1 = int(ants[0]) + pi + rssi_adj - ag - logg.info("calc_ant1: {} = ants[0]: {} + pi: {} + rssi_adj: {} - ag: {}".format(calc_ant1, ants[0], pi, rssi_adj, ag)) + calc_ant1 = int(ants[0]) + pi + rssi_adj + ag + logg.info("calc_ant1: {} = ants[0]: {} + pi: {} + rssi_adj: {} + ag: {}".format(calc_ant1, ants[0], pi, rssi_adj, ag)) calc_ant2 = 0 calc_ant3 = 0 calc_ant4 = 0 if (len(ants) > 1 and ants[1] != ""): - calc_ant2 = int(ants[1]) + pi + rssi_adj - ag - logg.info("calc_ant2: {} = ants[1]: {} + pi: {} + rssi_adj: {} - ag: {}".format(calc_ant2, ants[1], pi, rssi_adj, ag)) + calc_ant2 = int(ants[1]) + pi + rssi_adj + ag + logg.info("calc_ant2: {} = ants[1]: {} + pi: {} + rssi_adj: {} + ag: {}".format(calc_ant2, ants[1], pi, rssi_adj, ag)) if (len(ants) > 2 and ants[2] != ""): - calc_ant3 = int(ants[2]) + pi + rssi_adj - ag - logg.info("calc_ant3: {} = ants[2]: {} + pi: {} + rssi_adj: {} - ag: {}".format(calc_ant3, ants[2], pi, rssi_adj, ag)) + calc_ant3 = int(ants[2]) + pi + rssi_adj + ag + logg.info("calc_ant3: {} = ants[2]: {} + pi: {} + rssi_adj: {} + ag: {}".format(calc_ant3, ants[2], pi, rssi_adj, ag)) if (len(ants) > 3 and ants[3] != ""): - calc_ant4 = int(ants[3]) + pi + rssi_adj - ag - logg.info("calc_ant4: {} = ants[3]: {} + pi: {} + rssi_adj: {} - ag: {}".format(calc_ant4, ants[3], pi, rssi_adj, ag)) + calc_ant4 = int(ants[3]) + pi + rssi_adj + ag + logg.info("calc_ant4: {} = ants[3]: {} + pi: {} + rssi_adj: {} + ag: {}".format(calc_ant4, ants[3], pi, rssi_adj, ag)) diff_a1 = "" diff_a2 = "" diff --git a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json index ed582c18..c1aa8a02 100644 --- a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json +++ b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json @@ -37,6 +37,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_24g 0", " use_ssid_idx=0 --wlan SSID_USED --wlan_id 3 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=0 --radio wiphy3 --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -56,10 +57,6 @@ "USE_BATCH_TX_POWER for tx_power batch"], "enabled":"FALSE", "load_db":"skip", - "batch_channel":"1 2 3 4 5 6 7 8 9 10 11", - "batch_nss":"1 2", - "batch_bandwidth":"20", - "batch_tx_power":"1 2 3 4 5 6 7 8", "timeout":"180", "command":"lf_tx_power.py", "args":"", @@ -70,6 +67,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_24g 0", " use_ssid_idx=0 --wlan SSID_USED --wlan_id 3 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=0 --radio wiphy3 --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -102,6 +100,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_5g 1", " use_ssid_idx=1 --wlan SSID_USED --wlan_id 2 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=1 --radio wiphy3 --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -121,10 +120,6 @@ "USE_BATCH_TX_POWER for tx_power batch"], "enabled":"FALSE", "load_db":"skip", - "batch_channel":"36 100 149", - "batch_nss":"1 2", - "batch_bandwidth":"20 40 80 160", - "batch_tx_power":"1 2 3 4 5 6 7 8", "timeout":"180", "command":"lf_tx_power.py", "args":"", @@ -135,6 +130,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_5g 1", " use_ssid_idx=1 --wlan SSID_USED --wlan_id 2 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=1 --radio wiphy3 --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -169,6 +165,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_6g 2", " use_ssid_idx=2 --wlan SSID_USED --wlan_id 2 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=2 --radio wiphy2 --station sta0000 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -198,6 +195,7 @@ " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_6g 2", " use_ssid_idx=2 --wlan SSID_USED --wlan_id 1 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=2 --radio wiphy2 --station sta0000 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -220,6 +218,7 @@ " --ap USE_DUT_NAME --ap_band_slot_6g 3 ", " use_ssid_idx=2 --create_wlan --wlan SSID_USED --wlan_id 1 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=2 --radio wiphy2 --create_station --station ax210a --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 56 --antenna_gain 6", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -241,6 +240,7 @@ " --ap USE_DUT_NAME --ap_slot 4 --ap_band_slot_5g 1 ", " use_ssid_idx=1 --create_wlan --wlan SSID_USED --wlan_id WLAN_ID_USED --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=1 --radio wiphy4 --create_station --station mt7915e --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 56 --antenna_gain 6", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", @@ -265,6 +265,7 @@ " --ap USE_DUT_NAME --ap_slot 4 --ap_band_slot_5g 1 ", " use_ssid_idx=3 --wlan SSID_USED --wlan_id 6 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", + " --create_station", " use_ssid_idx=3 --radio wiphy4 --station mt7915e --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", " --pathloss 56 --antenna_gain 6", " --lfmgr LF_MGR_IP --upstream_port UPSTREAM_ALIAS --lfresource 1",