Merge pull request #2 from NET-BYU/fix_mesh

Fix mesh

Author: doglman

README.md

@@ -38,16 +38,18 @@ Here you will gather the static attenuation values that reside between your send
 
 In the process of transmitting messages from one device to another, you will be trying to measure and control the attenuation between devices. Some of this attenuation will be adjusted automatically by the mesh attenuator. However, the natural properties of the mesh attenuator, RF cabling, and any splitters you are using, will introduce additional static attenuation. How much static attenuation is introduced can vary from one cable to the next, and this variation needs to be controlled for in order to prevent the data from being artificially skewed.
 
-In order for the attenuation values to be equal across receiving devices, you need to take measurements of the total _static attenuation_ between the transmitters and the receivers while the _dynamic attenuation_ is set to 0. To make this easy, you can simply edit and run the following file:
+In order for the attenuation values to be equal across receiving devices, you need to take measurements of the total _static attenuation_ between the transmitters and the receivers while the _dynamic attenuation_ is set to 0. To make this easy, you can simply edit and run the following lines:
 
-In `resource/clear_mesh.py`, edit the following line, replacing `192.168.0.1` with the IPv4 ip address of the Mini-Circuits ZTMN-0695B-S.
+Run this command after editing the following line, replacing `192.168.0.1` with the IPv4 ip address of the Mini-Circuits ZTMN-0695B-S.
 ```python
-ip_address = '192.168.0.1'
+echo ip_address: 192.168.0.1 > resources/mesh_ip.yml
 ```
-then run it using the command
+then run the clear_mesh.py file using the command
 ```bash
 python3 resources/clear_mesh.py
 ```
+If the IP address is invalid or does not connect to a mesh attenuator device, the script will fail.
+
 This should set the dynamic attenuation between each and every link to 0. If you have everything hooked up on RF cables, though, you will still get some static attenuation from the RF cables, the mesh, and any splitters you are using. What you need to do is take measurements using something like a spectrum analyzer at the receiving end of _each_ communication endpoint to measure how attenuated the transmitted signal is compared to coming out of the sending device (so record once at the transmitter and again at the end of the line of cables leading to each receiver). Record these static attenuation values for each receiver; we will refer to these as `static_att` measurements later on in this readme.
 
 <details>

resources/clear_mesh.py

@@ -3,24 +3,45 @@
 #----------------------------------------------------------------------------
 # Created By  : Bryson Schiel - @schielb (GitHub)
 # Created Date: Feb 1, 2023
-# Latest Update: Feb 15, 2023
-# version ='1.0'
+# Latest Update: May 26, 2023
+# version ='1.1'
 # ---------------------------------------------------------------------------
 """ 
     A python file to clear the Mini-Circuits Mesh Attenuator
 """
 # ---------------------------------------------------------------------------
 
 from mesh_class import MeshClass
+import sys
+from yaml import safe_load
 
-ip_address = '192.168.0.1'
+# It is anticipated that this file be run from the cv2x_testing folder as "python3 resources/clear_mesh.py"
+with open("./resources/mesh_ip.yml") as f:
+    yaml_data = safe_load(f)
+
+ip_address = yaml_data["ip_address"]
 
 mesh = MeshClass(ip_address)
 
 port1s = ['A', 'B', 'C', 'D', 'E', 'F']
 port2s = ['A', 'B', 'C', 'D', 'E', 'F']
 
+att_to_set = 0
+args = sys.argv
+
+if len(args) == 1:
+    pass
+elif len(args) == 2:
+    if args[1] == "--reset":
+        att_to_set = 95
+    else:
+        print("Error: incorrect arg passed - expecting nothing or '--reset'", file=sys.stderr)
+        exit(1)
+else:
+    print("Error: too many args passed - expecting nothing or '--reset'", file=sys.stderr)
+    exit(1)
+
 for port1 in port1s:
     for port2 in port2s:
         if port1 != port2:
-            mesh.set_att(port1, port2, 0)
+            mesh.set_att(port1, port2, att_to_set)

resources/mesh_class.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: