diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ca947c0..0ca1c422 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,31 +16,7 @@ Valid subsections within a version are: ## Unreleased -- Things to be included in the next release go here. - -### Added - -- Added the constraint ranges for all signal generators -- Added drivers for AWG and AFG channels -- Added a property named `source_channel` in AWG's and AFG's. -- Added drivers for internal AFG in TekScopes. -- Added a property named `internal_afg` in TekScope. -- Added implementation of `generate_function` for all AWG models. -- Added two burst functions to SignalGeneratorMixin: one to set up burst and one to generate the burst by forcing trigger. - - NOTE: Only the AFG's and internal AFG have these functions implemented. -- Added `OutputSignalPath` enum attribute in AWG's representing output signal path options. -- Added two functions for loading waveform set files in the AWG70k's and AWG5200: one for loading a waveform set file and another for loading a specific waveform from a waveform set file. -- Added `sample_waveform_set_file` attribute in AWG70k's and AWG5200 to define the default waveform set file. - -### Changed - -- BREAKING CHANGE. Changed the term "signal source" to "signal generator". - - All uses of this term are changed. Import paths now use signal_generator instead of signal_source. -- BREAKING CHANGE. Changed the function name of `generate_waveform()` to `generate_function()`. - - `generate_waveform()` only exists on AWGs now, however the functionality is entirely changed. -- BREAKING CHANGE. Changed the `generate_function()` function by removing burst functionality. - - Any use of burst now must use `setup_burst()` and `generate_burst()` instead. -- Updated AWG's such that the `family_base_class` is at the series level. +Things to be included in the next release go here. ### Added diff --git a/src/tm_devices/drivers/pi/signal_generators/afgs/afg.py b/src/tm_devices/drivers/pi/signal_generators/afgs/afg.py index eca4d55f..25e4c129 100644 --- a/src/tm_devices/drivers/pi/signal_generators/afgs/afg.py +++ b/src/tm_devices/drivers/pi/signal_generators/afgs/afg.py @@ -243,7 +243,6 @@ def _get_series_specific_constraints( Returns: Ranges for amplitude, frequency, offset, and sample rate. """ - raise NotImplementedError class AFGSourceChannel(BaseAFGSourceChannel): diff --git a/src/tm_devices/drivers/pi/signal_generators/afgs/afg3k.py b/src/tm_devices/drivers/pi/signal_generators/afgs/afg3k.py index 303835b1..a5980563 100644 --- a/src/tm_devices/drivers/pi/signal_generators/afgs/afg3k.py +++ b/src/tm_devices/drivers/pi/signal_generators/afgs/afg3k.py @@ -180,5 +180,5 @@ def _reboot(self) -> None: """Reboot the device.""" # TODO: implement raise NotImplementedError( - f"``.reboot()`` is not yet implemented for the {self.__class__.__name__} driver" + f"``._reboot()`` is not yet implemented for the {self.__class__.__name__} driver" ) diff --git a/src/tm_devices/drivers/pi/signal_generators/awgs/awg.py b/src/tm_devices/drivers/pi/signal_generators/awgs/awg.py index 353eda08..2e0f11a7 100644 --- a/src/tm_devices/drivers/pi/signal_generators/awgs/awg.py +++ b/src/tm_devices/drivers/pi/signal_generators/awgs/awg.py @@ -352,7 +352,9 @@ def _get_series_specific_constraints( def _reboot(self) -> None: """Reboot the device.""" - # TODO: overwrite the reboot code here + raise NotImplementedError( + f"``._reboot()`` is not yet implemented for the {self.__class__.__name__} driver" + ) @family_base_class diff --git a/src/tm_devices/drivers/pi/signal_generators/awgs/awg5200.py b/src/tm_devices/drivers/pi/signal_generators/awgs/awg5200.py index 0edf4c8e..b4af9756 100644 --- a/src/tm_devices/drivers/pi/signal_generators/awgs/awg5200.py +++ b/src/tm_devices/drivers/pi/signal_generators/awgs/awg5200.py @@ -333,10 +333,3 @@ def set_output_signal_path( ) raise ValueError(output_signal_path_error) self._awg.set_if_needed(f"OUTPUT{self.num}:PATH", value.value) - - def _reboot(self) -> None: - """Reboot the device.""" - # TODO: implement - raise NotImplementedError( - f"``.reboot()`` is not yet implemented for the {self.__class__.__name__} driver" - ) diff --git a/src/tm_devices/drivers/pi/signal_generators/awgs/awg5k.py b/src/tm_devices/drivers/pi/signal_generators/awgs/awg5k.py index eec30f05..ebce2d0e 100644 --- a/src/tm_devices/drivers/pi/signal_generators/awgs/awg5k.py +++ b/src/tm_devices/drivers/pi/signal_generators/awgs/awg5k.py @@ -158,10 +158,3 @@ def set_output_signal_path( ) raise ValueError(output_signal_path_error) self._awg.set_if_needed(f"AWGCONTROL:DOUTPUT{self.num}:STATE", output_state) - - def _reboot(self) -> None: - """Reboot the device.""" - # TODO: implement - raise NotImplementedError( - f"``.reboot()`` is not yet implemented for the {self.__class__.__name__} driver" - ) diff --git a/src/tm_devices/drivers/pi/signal_generators/awgs/awg70ka.py b/src/tm_devices/drivers/pi/signal_generators/awgs/awg70ka.py index f02bd591..6a14b1f8 100644 --- a/src/tm_devices/drivers/pi/signal_generators/awgs/awg70ka.py +++ b/src/tm_devices/drivers/pi/signal_generators/awgs/awg70ka.py @@ -275,10 +275,3 @@ def set_output_signal_path( f"{value.value} is an invalid output signal path for {self._awg.model}." ) raise ValueError(output_signal_path_error) - - def _reboot(self) -> None: - """Reboot the device.""" - # TODO: implement - raise NotImplementedError( - f"``.reboot()`` is not yet implemented for the {self.__class__.__name__} driver" - ) diff --git a/src/tm_devices/drivers/pi/signal_generators/awgs/awg7k.py b/src/tm_devices/drivers/pi/signal_generators/awgs/awg7k.py index c22f6612..45e8dfa9 100644 --- a/src/tm_devices/drivers/pi/signal_generators/awgs/awg7k.py +++ b/src/tm_devices/drivers/pi/signal_generators/awgs/awg7k.py @@ -157,10 +157,3 @@ def set_output_signal_path( if not ("02" in self._awg.opt_string or "06" in self._awg.opt_string): # Can only set the output signal path on AWG7k's without 02 and 06 options. super().set_output_signal_path(value) - - def _reboot(self) -> None: - """Reboot the device.""" - # TODO: implement - raise NotImplementedError( - f"``.reboot()`` is not yet implemented for the {self.__class__.__name__} driver" - ) diff --git a/src/tm_devices/helpers/constants_and_dataclasses.py b/src/tm_devices/helpers/constants_and_dataclasses.py index 6726d3ee..80f11ee1 100644 --- a/src/tm_devices/helpers/constants_and_dataclasses.py +++ b/src/tm_devices/helpers/constants_and_dataclasses.py @@ -704,6 +704,7 @@ def __str__(self) -> str: ), } ) +"""A mapping of model USBTMC info.""" LOAD_IMPEDANCE_LOOKUP: Final[Mapping[Union[float, str], LoadImpedanceAFG]] = MappingProxyType( {