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

Signal Generation Restructure and addition of high level methods #183

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
24 changes: 24 additions & 0 deletions .github/workflows/create_temp_html.yml
qthompso marked this conversation as resolved.
Show resolved Hide resolved
qthompso marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Create Temp HTML
on:
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:
# Cancel running jobs for the same workflow and branch.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
# IMPORTANT: Any new jobs need to be added to the check-docs-passed job to ensure they correctly gate code changes
jobs:
create-fake-doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: upload-temp-artifact
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: artifact_docs
path: test3.zip
42 changes: 42 additions & 0 deletions .github/workflows/upload_artifacts.yml
qthompso marked this conversation as resolved.
Show resolved Hide resolved
qthompso marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: Upload Artifact
on:
workflow_run:
branches: [main]
workflows: [Create Temp HTML]
types:
- completed
# Cancel running jobs for the same workflow and branch.
concurrency:
group: publish-docs
jobs:
publish-docs:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }} && github.ref ==
'refs/heads/main'
permissions:
pages: write
id-token: write
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- run: echo 'The Test docs workflow passed'
- name: download-artifact
uses: dawidd6/action-download-artifact@v2.28.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
run_id: ${{ github.event.workflow_run.id }}
workflow_conclusion: success
name: artifact_docs
- name: unzip-artifact
run: |
unzip test3.zip
rm -r docs_results/.results_docs/html/.doctrees
- name: upload-pages-artifact
uses: actions/upload-pages-artifact@v2
with:
path: docs_results/.results_docs/html
- name: deploy-to-github-pages
uses: actions/deploy-pages@v2
id: deployment
8 changes: 3 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,15 @@ repos:
args: [--number, --end-of-line, keep]
additional_dependencies:
- setuptools # This is required since Python 3.12 no longer installs setuptools by default in virtual environments
- mdformat-myst
- mdformat-toc
- mdformat-frontmatter
- black==23.12.1 # This may need to be updated/removed in the future once ruff supports formatting python code blocks in markdown
- mdformat-beautysh
- mdformat-black
- black==23.12.1 # This may need to be updated/removed in the future once ruff supports formatting python code blocks in markdown
- mdformat-config
- mdformat-shfmt
- mdformat-web
- mdformat-gfm
- mdformat-footnote
- mdformat-myst
- mdformat-toc
# Currently rstcheck doesn't work with the templates
# - repo: https://github.com/rstcheck/rstcheck
# rev: v6.1.2
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,34 @@ Things to be included in the next release go here.

______________________________________________________________________

## v2.0.0 (2024-02-12)
qthompso marked this conversation as resolved.
Show resolved Hide resolved

### Merged Pull Requests
qthompso marked this conversation as resolved.
Show resolved Hide resolved

- feat: AWG Generate Function and Waveform Constraints

### Added

- 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
qthompso marked this conversation as resolved.
Show resolved Hide resolved

- Changed the term "signal source" to "signal generator".
- Changed the function name of `generate_waveform` to `generate_function`.
qthompso marked this conversation as resolved.
Show resolved Hide resolved
- Changed the `generate_function` function by removing burst functionality.
qthompso marked this conversation as resolved.
Show resolved Hide resolved
- Updated AWG's such that the `family_base_class` is at the model level.
qthompso marked this conversation as resolved.
Show resolved Hide resolved

______________________________________________________________________

## v1.2.1 (2024-02-27)

### Merged Pull Requests
Expand Down
1 change: 1 addition & 0 deletions docs/advanced/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Advanced information about the `tm_devices` package.
maxdepth: 2
---
architecture.md
signal_generators.md
```

## Advanced Usage and Examples
Expand Down