Replacing DriverError with Error. Adding additional error code for timeout exceeded error. (#216)

* Replacing DriverError with Error. Adding additional error code for timeout exceeded error.

Signed-off-by: Chris Delpire <chris.delpire@ni.com>

* Replacing.Error with .errors.DriverError. Fixing fgen example as well.

Signed-off-by: Chris Delpire <chris.delpire@ni.com>

Signed-off-by: Chris Delpire <chris.delpire@ni.com>

Author: DelpireNI

examples/nidcpower_source_dc_voltage/measurement.py

@@ -17,6 +17,7 @@
 
 
 NIDCPOWER_WAIT_FOR_EVENT_TIMEOUT_ERROR_CODE = -1074116059
+NIDCPOWER_TIMEOUT_EXCEEDED_ERROR_CODE = -1074097933
 
 measurement_info = nims.MeasurementInfo(
     display_name="NI-DCPower Source DC Voltage (Py)",
@@ -129,15 +130,18 @@ def cancel_callback():
                 try:
                     channels.wait_for_event(nidcpower.enums.Event.SOURCE_COMPLETE, timeout=0.1)
                     break
-                except nidcpower.DriverError as e:
+                except nidcpower.errors.DriverError as e:
                     """
                     There is no native way to support cancellation when taking a DCPower
                     measurement. To support cancellation, we will be calling WaitForEvent
                     until it succeeds or we have gone past the specified timeout. WaitForEvent
                     will throw an exception if it times out, which is why we are catching
                     and doing nothing.
                     """
-                    if e.code == NIDCPOWER_WAIT_FOR_EVENT_TIMEOUT_ERROR_CODE:
+                    if (
+                        e.code == NIDCPOWER_WAIT_FOR_EVENT_TIMEOUT_ERROR_CODE
+                        or e.code == NIDCPOWER_TIMEOUT_EXCEEDED_ERROR_CODE
+                    ):
                         pass
                     else:
                         raise

examples/nifgen_standard_function/measurement.py

@@ -138,7 +138,7 @@ def cancel_callback():
             else:
                 try:
                     sessions[0].wait_until_done(hightime.timedelta(seconds=sleep_time))
-                except nifgen.Error as e:
+                except nifgen.errors.DriverError as e:
                     """
                     There is no native way to support cancellation when generating a waveform.
                     To support cancellation, we will be calling wait_until_done