refactor: Addressed issues that arose from merges and rebasing

CHANGELOG.md

@@ -16,31 +16,31 @@ Valid subsections within a version are:
 
 ## Unreleased
 
-- Things to be included in the next release go here.
+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 drivers for the 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.
+- Added two burst functions to `SignalGeneratorMixin`: one to set up burst and one to generate the burst by forcing trigger.
+    - NOTE: Only the AFGs and Internal AFGs have these functions implemented.
+- Added `OutputSignalPath` enum attribute in AWGs representing output signal path options.
+- Added two functions for loading waveform set files in the AWG70k and AWG5200 drivers: 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 the AWG70k and AWG5200 drivers to define the default waveform set file.
 
 ### Changed
 
 - <span style="color:red">BREAKING CHANGE</span>. 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.
+    - All uses of this term are changed. Import paths now use `signal_generator` instead of `signal_source`.
 - <span style="color:red">BREAKING CHANGE</span>. Changed the function name of `generate_waveform()` to `generate_function()`.
     - `generate_waveform()` only exists on AWGs now, however the functionality is entirely changed.
 - <span style="color:red">BREAKING CHANGE</span>. 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.
+- Updated AWGs such that the `family_base_class` is at the series level.
 
 ---
 
@@ -216,27 +216,15 @@ Valid subsections within a version are:
 
 ### 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.
+- Added TekVISA as one of the VISA backends supported.
 
 ### Changed
 
-- <span style="color:red">BREAKING CHANGE</span>. 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.
-- <span style="color:red">BREAKING CHANGE</span>. Changed the function name of `generate_waveform()` to `generate_function()`.
-    - `generate_waveform()` only exists on AWGs now, however the functionality is entirely changed.
-- <span style="color:red">BREAKING CHANGE</span>. 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.
+- Updated the `get_model_series()` function to only warn the user if the model is not found in the `SupportedModels` enumeration. This also eliminates false warnings during unit tests.
+
+### Fixed
+
+- Updated the measurement source selection command for the MDO3K, MDO4K, MSO4K and DPO4K models to work properly.
 
 ---
 

src/tm_devices/helpers/constants_and_dataclasses.py

@@ -704,16 +704,6 @@ def __str__(self) -> str:
         ),
     }
 )
-
-LOAD_IMPEDANCE_LOOKUP: Final[Mapping[Union[float, str], LoadImpedanceAFG]] = MappingProxyType(
-    {
-        9.97e37: LoadImpedanceAFG.HIGHZ,
-        1.0e6: LoadImpedanceAFG.HIGHZ,
-        "HIGHZ": LoadImpedanceAFG.HIGHZ,
-        50.0: LoadImpedanceAFG.FIFTY,
-        "FIFTY": LoadImpedanceAFG.FIFTY,
-    }
-)
 """A mapping of model USBTMC info."""
 
 LOAD_IMPEDANCE_LOOKUP: Final[Mapping[Union[float, str], LoadImpedanceAFG]] = MappingProxyType(