Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Improvements
- LCR Driver now supports instruments reporting as Keysight or Agilent. Newer models of the LCR meter report as Keysight, whereas older models report as Agilent.
- Fixed a bug where the PPS would crash if it was polled too frequently.
- Changed tolerances for PPS and DMM tests to more accurately match device accuracy.
- Created a new FixateError base class for all exceptions raised by fixate to use. It inherits from Exception instead of BaseExcepetion to improve error handling.

*************
Version 0.6.4
Expand Down
30 changes: 17 additions & 13 deletions src/fixate/core/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
class SequenceAbort(BaseException):
class FixateError(Exception):
pass


class ScriptError(BaseException):
class SequenceAbort(FixateError):
pass


class TestRetryExceeded(BaseException):
class ScriptError(FixateError):
pass


class TestAbort(BaseException):
class TestRetryExceeded(FixateError):
pass


class InstrumentError(BaseException):
class TestAbort(FixateError):
pass


class InstrumentError(FixateError):
pass


class InstrumentTimeOut(InstrumentError):
pass


class ParameterError(BaseException):
class ParameterError(FixateError):
pass


class InvalidScalarQuantityError(BaseException):
class InvalidScalarQuantityError(FixateError):
pass


Expand All @@ -38,29 +42,29 @@ class InstrumentNotConnected(InstrumentError):
pass


class NotCompatible(BaseException):
class NotCompatible(FixateError):
pass


class MissingParameters(ParameterError):
pass


class UserInputError(BaseException):
class UserInputError(FixateError):
pass


class TestClassError(BaseException):
class TestClassError(FixateError):
pass


class TestError(BaseException):
class TestError(FixateError):
pass


class DUTError(BaseException):
class DUTError(FixateError):
pass


class CheckFail(BaseException):
class CheckFail(FixateError):
pass
4 changes: 2 additions & 2 deletions src/fixate/drivers/ftdi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import fixate.drivers
from fixate.core.common import bits
from fixate.core.exceptions import InstrumentNotConnected
from fixate.core.exceptions import FixateError, InstrumentNotConnected

from fixate.drivers._ftdi import ftdI2xx

Expand Down Expand Up @@ -44,7 +44,7 @@
}


class FTD2XXError(BaseException):
class FTD2XXError(FixateError):
pass


Expand Down