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

TekScope2K - turn on HEADER and VERBOSE options to query available data sources correctly #327

Merged
merged 9 commits into from
Oct 24, 2024

Conversation

RoaCode
Copy link
Contributor

@RoaCode RoaCode commented Oct 14, 2024

Proposed changes

Please include a summary of the changes and any links to related issues. Please also include relevant motivation and context.

Addresses #326

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply

  • 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

@RoaCode RoaCode requested review from a team as code owners October 14, 2024 16:04
CHANGELOG.md Outdated Show resolved Hide resolved
@nfelt14
Copy link
Collaborator

nfelt14 commented Oct 14, 2024

Blocked by PyCQA/docformatter#293

@nfelt14
Copy link
Collaborator

nfelt14 commented Oct 22, 2024

@RoaCode you will need to rebase your branch to get builds to pass

nfelt14
nfelt14 previously approved these changes Oct 23, 2024
@nfelt14
Copy link
Collaborator

nfelt14 commented Oct 23, 2024

@RoaCode, it looks like there are more conflicts with the changelog

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (f20bbdd) to head (577b396).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #327   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          152       152           
  Lines         4904      4907    +3     
  Branches       780       780           
=========================================
+ Hits          4904      4907    +3     

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

nfelt14
nfelt14 previously approved these changes Oct 23, 2024
@nfelt14
Copy link
Collaborator

nfelt14 commented Oct 23, 2024

@RoaCode your last few commits are unsigned

@nfelt14
Copy link
Collaborator

nfelt14 commented Oct 24, 2024

@RoaCode, it looks like this needs to be rebased again

CHANGELOG.md Show resolved Hide resolved
RoaCode and others added 8 commits October 24, 2024 11:44
…ions properly

Added HEADER calls to 'get_available_data_sources' function
Added driver functions for MSO2KB series oscilloscope. Added "curve_query", "all_channel_names_list", "turn_channel_on/off", and "total_channels" functions, and added model ID 0x03A4 to supported models list
…CT? functions properly

If the MSO2K scope is not in HEADER and VERBOSE mode when SELECT? is called to determine the number of active channels, the channel names will not be read properly
Co-authored-by: Nicholas Felt <[email protected]>
Signed-off-by: Joe <[email protected]>
.pre-commit-config.yaml Outdated Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
@nfelt14 nfelt14 enabled auto-merge (squash) October 24, 2024 19:04
@nfelt14 nfelt14 merged commit 81503b7 into tektronix:main Oct 24, 2024
71 checks passed
Copy link

github-actions bot commented Oct 24, 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 24, 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 24, 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.

2 participants