Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Added USB support for AFG31K and MDO3 models. #331

Merged
merged 1 commit into from
Oct 21, 2024

Conversation

v12ganesh
Copy link
Contributor

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Functionality update (non-breaking change which updates or changes existing functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • CI/CD update (an update to the CI/CD workflows, scripts, and/or configurations)
  • Documentation update (an update to enhance the user experience when reading through the docs)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have followed the guidelines in the CONTRIBUTING document
  • I have signed the CLA
  • I have checked to ensure there aren't other open Pull Requests for the same update/change
  • I have created (or updated) an Issue to track the status of this update/change and updated the link in this PR description (see above in the Proposed changes section) using the wording Addresses #<issue_number>
  • I have performed a self-review of my code
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • Basic linting passes locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have added necessary documentation (if appropriate)
  • I have updated the Changelog with a brief description of my changes

@v12ganesh v12ganesh requested review from a team as code owners October 18, 2024 16:33
@nfelt14 nfelt14 enabled auto-merge (squash) October 21, 2024 13:34
Copy link

codecov bot commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (e69233a) to head (22bc2c0).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #331   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          152       152           
  Lines         4899      4899           
  Branches       780       780           
=========================================
  Hits          4899      4899           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

github-actions bot commented Oct 21, 2024

Breaking API Changes

src/tm_devices/helpers/constants_and_dataclasses.py:588: USB_MODEL_ID_LOOKUP:
Attribute value was changed:
  Old: MappingProxyType({SupportedModels.MDO3K: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0408'), SupportedModels.MSO2: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0105'), SupportedModels.MSO2KB: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x03A4'), SupportedModels.MSO4: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0527'), SupportedModels.MSO4B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0527'), SupportedModels.MSO5: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0522'), SupportedModels.MSO5B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0522'), SupportedModels.MSO5LP: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0529'), SupportedModels.MSO6: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0528'), SupportedModels.MSO6B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0530'), SupportedModels.LPD6: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x052F'), SupportedModels.AFG3K: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0345'), SupportedModels.SMU2450: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2450'), SupportedModels.SMU2460: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2460'), SupportedModels.SMU2461: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2461'), SupportedModels.SMU2470: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2470'), SupportedModels.SMU2601A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2601'), SupportedModels.SMU2602A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2602'), SupportedModels.SMU2604A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2604'), SupportedModels.SMU2611A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2611'), SupportedModels.SMU2612A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2612'), SupportedModels.SMU2614A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2614'), SupportedModels.SMU2634A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2634'), SupportedModels.SMU2635A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2635'), SupportedModels.SMU2636A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2636'), SupportedModels.SMU2601B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2601'), SupportedModels.SMU2602B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2602'), SupportedModels.SMU2604B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2604'), SupportedModels.SMU2606B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2606'), SupportedModels.SMU2611B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2611'), SupportedModels.SMU2612B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2612'), SupportedModels.SMU2614B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2614'), SupportedModels.SMU2634B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2634'), SupportedModels.SMU2635B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2635'), SupportedModels.SMU2636B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2636'), SupportedModels.PSU2200: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2200'), SupportedModels.PSU2220: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2220'), SupportedModels.PSU2230: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2230'), SupportedModels.PSU2231: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2231'), SupportedModels.PSU2231A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2231'), SupportedModels.PSU2280: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2280'), SupportedModels.PSU2281: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2281'), SupportedModels.AWG5200: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.AWG70KA: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.AWG70KB: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.SS3706A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x3706')})
  New: MappingProxyType({SupportedModels.MDO3: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x052C'), SupportedModels.MDO3K: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0408'), SupportedModels.MSO2: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0105'), SupportedModels.MSO2KB: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x03A4'), SupportedModels.MSO4: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0527'), SupportedModels.MSO4B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0527'), SupportedModels.MSO5: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0522'), SupportedModels.MSO5B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0522'), SupportedModels.MSO5LP: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0529'), SupportedModels.MSO6: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0528'), SupportedModels.MSO6B: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0530'), SupportedModels.LPD6: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x052F'), SupportedModels.AFG3K: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0345'), SupportedModels.AFG31K: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x035E'), SupportedModels.SMU2450: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2450'), SupportedModels.SMU2460: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2460'), SupportedModels.SMU2461: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2461'), SupportedModels.SMU2470: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2470'), SupportedModels.SMU2601A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2601'), SupportedModels.SMU2602A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2602'), SupportedModels.SMU2604A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2604'), SupportedModels.SMU2611A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2611'), SupportedModels.SMU2612A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2612'), SupportedModels.SMU2614A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2614'), SupportedModels.SMU2634A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2634'), SupportedModels.SMU2635A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2635'), SupportedModels.SMU2636A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2636'), SupportedModels.SMU2601B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2601'), SupportedModels.SMU2602B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2602'), SupportedModels.SMU2604B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2604'), SupportedModels.SMU2606B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2606'), SupportedModels.SMU2611B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2611'), SupportedModels.SMU2612B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2612'), SupportedModels.SMU2614B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2614'), SupportedModels.SMU2634B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2634'), SupportedModels.SMU2635B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2635'), SupportedModels.SMU2636B: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2636'), SupportedModels.PSU2200: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2200'), SupportedModels.PSU2220: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2220'), SupportedModels.PSU2230: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2230'), SupportedModels.PSU2231: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2231'), SupportedModels.PSU2231A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2231'), SupportedModels.PSU2280: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2280'), SupportedModels.PSU2281: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x2281'), SupportedModels.AWG5200: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.AWG70KA: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.AWG70KB: USBTMCConfiguration(vendor_id=TEKTRONIX_USBTMC_VENDOR_ID, model_id='0x0503'), SupportedModels.SS3706A: USBTMCConfiguration(vendor_id=KEITHLEY_USBTMC_VENDOR_ID, model_id='0x3706')})

Link to workflow run

@nfelt14 nfelt14 merged commit fb29ac3 into tektronix:main Oct 21, 2024
72 checks passed
Copy link

github-actions bot commented Oct 21, 2024

Test Results (windows)

path passed subtotal
tests\test_afgs.py 2 2
tests\test_alias_dict.py 1 1
tests\test_all_device_drivers.py 1 1
tests\test_alternative_connection_addresses.py 19 19
tests\test_awgs.py 4 4
tests\test_config_parser.py 38 38
tests\test_device_manager.py 17 17
tests\test_devices_legacy_tsp_ieee_cmds.py 3 3
tests\test_extension_mixin.py 1 1
tests\test_generate_waveform.py 6 6
tests\test_helpers.py 73 73
tests\test_ieee_scpi_cmds.py 1 1
tests\test_margin_testers.py 5 5
tests\test_pi_device.py 1 1
tests\test_psu.py 1 1
tests\test_rest_api_device.py 10 10
tests\test_scopes.py 8 8
tests\test_singleton.py 1 1
tests\test_smu.py 4 4
tests\test_ss.py 1 1
tests\test_tm_devices.py 5 5
tests\test_unsupported_device_type.py 1 1
TOTAL 203 203

Link to workflow run

Copy link

github-actions bot commented Oct 21, 2024

Test Results (ubuntu)

path passed subtotal
tests/test_afgs.py 2 2
tests/test_alias_dict.py 1 1
tests/test_all_device_drivers.py 1 1
tests/test_alternative_connection_addresses.py 19 19
tests/test_awgs.py 4 4
tests/test_config_parser.py 38 38
tests/test_device_manager.py 17 17
tests/test_devices_legacy_tsp_ieee_cmds.py 3 3
tests/test_extension_mixin.py 1 1
tests/test_generate_waveform.py 6 6
tests/test_helpers.py 73 73
tests/test_ieee_scpi_cmds.py 1 1
tests/test_margin_testers.py 5 5
tests/test_pi_device.py 1 1
tests/test_psu.py 1 1
tests/test_rest_api_device.py 10 10
tests/test_scopes.py 8 8
tests/test_singleton.py 1 1
tests/test_smu.py 4 4
tests/test_ss.py 1 1
tests/test_tm_devices.py 5 5
tests/test_unsupported_device_type.py 1 1
TOTAL 203 203

Link to workflow run

Copy link

github-actions bot commented Oct 21, 2024

Test Results (macos)

path passed subtotal
tests/test_afgs.py 2 2
tests/test_alias_dict.py 1 1
tests/test_all_device_drivers.py 1 1
tests/test_alternative_connection_addresses.py 19 19
tests/test_awgs.py 4 4
tests/test_config_parser.py 38 38
tests/test_device_manager.py 17 17
tests/test_devices_legacy_tsp_ieee_cmds.py 3 3
tests/test_extension_mixin.py 1 1
tests/test_generate_waveform.py 6 6
tests/test_helpers.py 73 73
tests/test_ieee_scpi_cmds.py 1 1
tests/test_margin_testers.py 5 5
tests/test_pi_device.py 1 1
tests/test_psu.py 1 1
tests/test_rest_api_device.py 10 10
tests/test_scopes.py 8 8
tests/test_singleton.py 1 1
tests/test_smu.py 4 4
tests/test_ss.py 1 1
tests/test_tm_devices.py 5 5
tests/test_unsupported_device_type.py 1 1
TOTAL 203 203

Link to workflow run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants