Merge branch 'main' into dev

Author: schielb

live_capture.py

@@ -3,8 +3,8 @@
 #----------------------------------------------------------------------------
 # Created By  : Bryson Schiel - @schielb (GitHub)
 # Created Date: Feb 1, 2023
-# Latest Update: Feb 15, 2023
-# version ='1.0'
+# Latest Update: May 25, 2023
+# version ='1.1'
 # ---------------------------------------------------------------------------
 """ 
     A python file to iteratively test different attenuation values on 
@@ -19,7 +19,7 @@
 from threading import Event, Thread
 import time
 import os
-from datetime import date
+from datetime import datetime
 import matplotlib.pyplot as plt
 
 def call_repeatedly(interval, func, *args):
@@ -81,37 +81,38 @@ def uniquify(path):
 
     return path
 
+cap_folder_name = "Packet_Captures/" + datetime.now().strftime("%b-%d-%H:%M:%S")
+res_folder_name = "Results/" + datetime.now().strftime("%b-%d-%H:%M:%S")
+
+#See if we need to create a new folder and csv file for today for today
+for newpath in [cap_folder_name, res_folder_name]:
+    if not os.path.exists(newpath):
+        os.makedirs(newpath)
+
+###############################################################################
+# At this point, folders have been set up, now we will gather the attenuations.
+###############################################################################
 for attenuation in yaml_data["attenuations"]:
     # Clear the data and declare the start of the trial
     clear_data()
     print("\x1B[32mSetting up trial on attenuation value\x1B[35m %d\x1B[32m db for\x1B[35m %d\x1B[32m seconds...\x1B[37m" 
         % (attenuation, yaml_data["trial_length"]))
 
-    cap_folder_name = "Packet_Captures/" + date.today().strftime("%b-%d")
-    res_folder_name = "Results/" + date.today().strftime("%b-%d")
-
-    #See if we need to create a new folder and csv file for today for today
-    for newpath in [cap_folder_name, res_folder_name]:
-        if not os.path.exists(newpath):
-            os.makedirs(newpath)
-
     cap_file_name = uniquify(cap_folder_name + "/attenuation_%d.pcap" % attenuation)
 
     cap = pyshark.LiveCapture(interface=yaml_data["wireshark_interface"], 
         bpf_filter="udp and not src host %s" % yaml_data['host_ip'],
         output_file=cap_file_name)
 
-    
 
     # Go through and set all the attenuation values we need
     for tx_port in yaml_data["static_mesh_ports"]:
         for rsu in rsus.keys():
             rx_port = rsus[rsu]["mesh_port"]
-            partial_att = rsus[rsu]["att_offset"]
+            partial_att = rsus[rsu]["static_att"]
             diff_att = attenuation - partial_att
             diff_att = round(diff_att * 4) / 4 # needs a multiple of 0.25
 
-            #print('dbg: mesh.set_att(%s, %s, %f)' % (tx_port, rx_port, diff_att))
             mesh.set_att(tx_port, rx_port, diff_att)
 
     time.sleep(10) # Delay to allow new setup to settle
@@ -130,31 +131,22 @@ def uniquify(path):
             pass
     finally:
         end_timer()
-    #timer.cancel()
     print()
     print("\x1B[32mEnding trial for\x1B[35m %d\x1B[32m db\x1B[37m" % attenuation, end="\n")
 
     print("Saving data from trial...")
-    # Save the results in their own files
-    res_folder_name = "Results/" + date.today().strftime("%b-%d")
-
-    #See if we need to create a new folder and csv file for today for today
-    if not os.path.exists(res_folder_name):
-        os.makedirs(res_folder_name)
+    
 
+    # Save the results in their own files
     cap.close()
     for rsu in rsus:
 
-        
         total_time_gap = yaml_data["trial_length"]
         num_packets = data[rsu]
 
         estimated_num_spaced = int(total_time_gap * 10)
         percent_reception = float(float(num_packets) / float(estimated_num_spaced))
 
-        
-
-
         summaries_file_name = '%s/summaries_%s.txt' % (res_folder_name, rsu)
 
         print("Saving %s data in %s" % (rsu, summaries_file_name))
@@ -173,10 +165,9 @@ def uniquify(path):
 # At this point, all attenuations have been gathered, and we are ready to display the results.
 ##############################################################################################
 
-folder_name = "Results/" + date.today().strftime("%b-%d")
-
+# Display each individual RSU's performance
 for rsu in rsus:
-    file_name = folder_name + "/summaries_%s.txt" % rsu
+    file_name = res_folder_name + "/summaries_%s.txt" % rsu
 
     values = []
 
@@ -213,9 +204,10 @@ def uniquify(path):
     plt.ylim(-4, 104)
     plt.axhline(y=90, color='red', linestyle='--', label='Critical Safety Limit: 90%')
     plt.show()
-    plt.savefig(folder_name + '/Attenuations-%s.png' % rsu)
+    plt.savefig(res_folder_name + '/Attenuations-%s.png' % rsu)
     plt.clf()
 
+# Display all performances on a single graph for comparison
 for rsu in rsus:
     plt.plot(data['att'], data[rsu]['rate'], label=rsu, marker = 'o')
 
@@ -225,7 +217,7 @@ def uniquify(path):
 plt.title("Reception Rate per Attenuation (All RSU Comparison)")
 plt.axhline(y=90, color='red', linestyle='--', label='Critical Safety Limit: 90%')
 plt.legend()
-plt.savefig(folder_name + '/Comparison-Attenuations.png')
+plt.savefig(res_folder_name + '/Comparison-Attenuations.png')
 plt.show()
 plt.clf()
 

resources/Indoor_Setup.png

@@ -3,8 +3,8 @@
 #----------------------------------------------------------------------------
 # Created By  : Bryson Schiel - @schielb (GitHub)
 # Created Date: Feb 6, 2023
-# Latest Update: Feb 15, 2023
-# version ='1.0'
+# Latest Update: May 22, 2023
+# version ='1.1'
 # ---------------------------------------------------------------------------
 """ 
     Python file to setup initial files that aren't included due to the 
@@ -25,7 +25,7 @@
     "#     src_port: <src port at RSU>\n" \
     "#     dst_port: <destination port at host>\n" \
     "#     mesh_port: <A-F single character on mesh ports>\n" \
-    "#     att_offset: <attenuation offset for RSU (float value)>\n" \
+    "#     static_att: <attenuation offset for RSU (float value)>\n" \
     "#\n" \
     "# An example has already been provided for you below...\n\n" \
     "################### META PARAMETERS ###################\n" \
@@ -40,7 +40,7 @@
     "\n" \
     "# List of total attenuation values to test\n" \
     "#  An example list from our lab experiment is [90, 100, 105, 107, 109, 111, 113, 115]\n" \
-    "#  IMPORTANT!!! Make sure that these are all higher than any 'att_offset' in your RSUs!!!\n" \
+    "#  IMPORTANT!!! Make sure that these are all higher than any 'static_att' in your RSUs!!!\n" \
     "attenuations: [90, 100, 105, 107, 109, 111, 113, 115]\n" \
     "\n" \
     "# Time length of a trial in seconds (integer)\n" \
@@ -53,10 +53,9 @@
     "rsus:\n" \
     "    rsu_1:\n" \
     "        ip: 192.168.0.1\n" \
-    "        src_port: 8080\n" \
     "        dst_port: 8081\n" \
     "        mesh_port: B\n" \
-    "        att_offset: 50.0"
+    "        static_att: 50.0"
 
 with open('cv2x.yml', 'w') as rsu_yaml:
     rsu_yaml.write(yaml_string)

resources/build.py

@@ -45,3 +45,5 @@
     for port2 in port2s:
         if port1 != port2:
             mesh.set_att(port1, port2, att_to_set)
+
+

resources/clear_mesh.py

@@ -81,6 +81,18 @@ def __init__(self, address):
         """
         self.address = address
 
+        ports = channels["AB"]
+        block = ports[0]
+        channel = ports[1]
+
+        http = urllib3.PoolManager()
+        response = http.request(
+            'GET', f"http://{self.address}/:0{block}:CHAN:{channel}:ATT?")
+
+        if response.status != 200:
+            raise ValueError('Device at %s is not a viable mesh attenuator.' % address)
+
+
     def set_att(self, port1: str, port2: str, atten: float):
         """
         set_att: