spikesafe-python 1.12.12__tar.gz → 1.14.1__tar.gz

{spikesafe_python-1.12.12/spikesafe_python.egg-info → spikesafe_python-1.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spikesafe-python
-Version: 1.12.12
+Version: 1.14.1
 Summary: SpikeSafe Python Library
 Author-email: Vektrex <support@vektrex.com>
 Classifier: Programming Language :: Python :: 3

{spikesafe_python-1.12.12 → spikesafe_python-1.14.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spikesafe-python"
-version = "1.12.12"
+version = "1.14.1"
 authors = [
   { name="Vektrex", email="support@vektrex.com" },
 ]

{spikesafe_python-1.12.12 → spikesafe_python-1.14.1}/spikesafe_python/Discharge.py

@@ -77,18 +77,22 @@ class Discharge:
         """
         if spikesafe_info.supports_discharge_query:
             # when Discharge Complete query is supported, query for completion
-            start_time = time.time()
-            expected_max_discharge_time = Discharge.get_spikesafe_channel_discharge_time(spikesafe_info.maximum_compliance_voltage + 35) # 35V gives extra time, some windows pcs return early from wait function
+            expected_compliance_voltage_discharge_time = Discharge.get_spikesafe_channel_discharge_time(compliance_voltage)
+            expected_max_model_discharge_time = Discharge.get_spikesafe_channel_discharge_time(spikesafe_info.maximum_compliance_voltage + 35) # 35V gives extra time, some windows pcs return early from wait function
 
+            start_time = time.time()
             # wait until the channel is fully discharged before disconnecting the load
             is_discharge_complete = ""
-            while is_discharge_complete != "TRUE":
+            while True:
                 spikesafe_socket.send_scpi_command(f"OUTP{channel_number}:DISC:COMP?", enable_logging)
                 is_discharge_complete = spikesafe_socket.read_data(enable_logging)
 
+                if is_discharge_complete == "TRUE":
+                    break
+
                 elapsed_seconds = time.time() - start_time
-                if elapsed_seconds > expected_max_discharge_time:
-                    raise TimeoutError(f"SpikeSafe channel discharge exceeded expected maximum time of {expected_max_discharge_time} seconds")
+                if elapsed_seconds > expected_max_model_discharge_time:
+                    raise TimeoutError(f"SpikeSafe channel discharge expected discharge time is {expected_compliance_voltage_discharge_time} seconds, but this exceeded the model {spikesafe_info.maximum_compliance_voltage}V maximum time of {expected_max_model_discharge_time} seconds.")
         else:
             # when Discharge Complete query is not supported, use a calculated wait time
             wait_time = Discharge.get_spikesafe_channel_discharge_time(compliance_voltage + 35) # 35V gives extra time, some windows pcs return early from wait function

{spikesafe_python-1.12.12 → spikesafe_python-1.14.1}/spikesafe_python/TcpSocket.py

@@ -63,9 +63,10 @@ class TcpSocket:
         try:
             self.socket_ip_address = ip_address
 
-            # create socket with 2 second timeout and connect to SpikeSafe
+            # create socket with 2 second timeout, 512 byte send max buffer to match SpikeSafe's command buffer, and connect to SpikeSafe
             self.tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)          
             self.tcp_socket.settimeout(2)
+            self.tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 512)
 
             if (self.enable_logging):
                 log.log(self.default_log_level, self.__get_formatted_log_message__('Connecting...'))

{spikesafe_python-1.12.12 → spikesafe_python-1.14.1}/spikesafe_python/Threading.py

@@ -14,7 +14,7 @@ class Threading:
     def wait(
         wait_time: float,
         os_timer_resolution_offset_time: float = 0,
-        current_time: float = time.perf_counter()
+        current_time: float | None = None
     ) -> None:
         """
         Suspends the current thread for a specified amount of time.
@@ -25,18 +25,21 @@ class Threading:
             Wait time in seconds to suspend the current thread.
         os_timer_resolution_offset_time: float, optional
             The offset time in seconds to add to wait_time due to the operating system timer resolution limit. Default is 0.
-        current_time: float, optional
-            The current time in seconds. Default is time.perf_counter(), which is the result from a high resolution clock
+        current_time: float | None, optional
+            The current time in seconds. If None, time.perf_counter() is used, which is the result from a high resolution clock.
         """
-        now = current_time
-        end = now + wait_time + os_timer_resolution_offset_time
-        while now < end:
-            now = time.perf_counter()
+        if current_time is None:
+            current_time = time.perf_counter()
+
+        end = current_time + wait_time + os_timer_resolution_offset_time
+
+        while time.perf_counter() < end:
+            pass
 
 def wait(
     wait_time: float,
     os_timer_resolution_offset_time: float = 0,
-    current_time: float = time.perf_counter()
+    current_time: float | None = None
 ) -> None:
     """
     Obsolete: use Threading.wait() instead

{spikesafe_python-1.12.12 → spikesafe_python-1.14.1/spikesafe_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spikesafe-python
-Version: 1.12.12
+Version: 1.14.1
 Summary: SpikeSafe Python Library
 Author-email: Vektrex <support@vektrex.com>
 Classifier: Programming Language :: Python :: 3