commit 4f5788d6bb7f312e2950513eada8ade95a0391b1
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 15 20:52:01 2022 +0000
committer Omar El Ayach <oelayach@google.com> Tue Mar 15 20:55:36 2022 +0000
tree cc9e650cda1c31d93de607560f1edaa4240354e9
parent a395c9a97ea3fcf5fabe12e4f9d267b23098b4e2
parent 548987213960f22d87b3189d7c5a901077fd987f

[conflict] Merge "Update Mini-circuits attenuator controller." am: 0f68ced64e am: 10b0edf3fd am: 5489872139

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2025185

Change-Id: Iaef87f5786a1ee47927cca64318223f80fd6e7b0

acts/framework/acts/controllers/attenuator_lib/minicircuits/http.py

diff --git a/acts/framework/acts/controllers/attenuator_lib/minicircuits/http.py b/acts/framework/acts/controllers/attenuator_lib/minicircuits/http.py
index 95fa0ba..e1805f0 100644
--- a/acts/framework/acts/controllers/attenuator_lib/minicircuits/http.py
+++ b/acts/framework/acts/controllers/attenuator_lib/minicircuits/http.py
@@ -111,10 +111,11 @@
             raise ValueError('Attenuator value out of range!', self.max_atten,
                              value)
         # The actual device uses one-based index for channel numbers.
+        adjusted_value = min(max(0, value), self.max_atten)
         att_req = urllib.request.urlopen(
             'http://{}:{}/CHAN:{}:SETATT:{}'.format(self._ip_address,
                                                     self._port, idx + 1,
-                                                    value),
+                                                    adjusted_value),
             timeout=self._timeout)
         att_resp = att_req.read().decode('utf-8').strip()
         if att_resp != '1':

acts/framework/acts/controllers/attenuator_lib/minicircuits/telnet.py

diff --git a/acts/framework/acts/controllers/attenuator_lib/minicircuits/telnet.py b/acts/framework/acts/controllers/attenuator_lib/minicircuits/telnet.py
index 2c85cea..ddda6ab 100644
--- a/acts/framework/acts/controllers/attenuator_lib/minicircuits/telnet.py
+++ b/acts/framework/acts/controllers/attenuator_lib/minicircuits/telnet.py
@@ -37,6 +37,7 @@
     the functionality of AttenuatorInstrument is contingent upon a telnet
     connection being established.
     """
+
     def __init__(self, num_atten=0):
         super(AttenuatorInstrument, self).__init__(num_atten)
         self._tnhelper = _tnhelper._TNHelper(tx_cmd_separator='\r\n',
@@ -116,7 +117,9 @@
             raise ValueError('Attenuator value out of range!', self.max_atten,
                              value)
         # The actual device uses one-based index for channel numbers.
-        self._tnhelper.cmd('CHAN:%s:SETATT:%s' % (idx + 1, value), retry=retry)
+        adjusted_value = min(max(0, value), self.max_atten)
+        self._tnhelper.cmd('CHAN:%s:SETATT:%s' % (idx + 1, adjusted_value),
+                           retry=retry)
 
     def get_atten(self, idx, retry=False):
         """Returns the current attenuation of the attenuator at the given index.