Skip to content

Commit 6c09f18

Browse files
authored
Merge branch 'main' into add_driver_ITC503
2 parents afc7ab0 + 7e5eef0 commit 6c09f18

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
args: install pandoc
5656
if: runner.os == 'Windows'
5757
- name: Set up Python ${{ matrix.python-version }}
58-
uses: actions/setup-python@v5.3.0
58+
uses: actions/setup-python@v5.4.0
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161
cache: 'pip'
@@ -85,7 +85,7 @@ jobs:
8585
name: docs_${{ matrix.python-version }}_${{ matrix.os }}
8686
path: ${{ github.workspace }}/docs/_build/html
8787
- name: Deploy to gh pages
88-
uses: JamesIves/[email protected].1
88+
uses: JamesIves/[email protected].2
8989
with:
9090
branch: gh-pages
9191
folder: ${{ github.workspace }}/docs/_build/html

.github/workflows/pytest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
uses: ./.github/actions/setup-ubuntu-latest-xvfb
4343
if: runner.os == 'Linux'
4444
- name: Set up Python ${{ matrix.python-version }}
45-
uses: actions/setup-python@v5.3.0
45+
uses: actions/setup-python@v5.4.0
4646
with:
4747
python-version: ${{ matrix.python-version }}
4848
cache: 'pip'
@@ -61,7 +61,7 @@ jobs:
6161
run: |
6262
pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=pyproject.toml tests
6363
- name: Upload coverage to Codecov
64-
uses: codecov/codecov-action@v5.0.7
64+
uses: codecov/codecov-action@v5.3.1
6565
with:
6666
file: ./coverage.xml
6767
env_vars: OS,PYTHON

.github/workflows/upload_to_pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/[email protected]
1616
- name: Set up Python
17-
uses: actions/setup-python@v5.3.0
17+
uses: actions/setup-python@v5.4.0
1818
with:
1919
python-version: '3.10'
2020
- name: Install build deps

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
mypy>=1.1.1,<1.14.0
22
ipython~=8.18.1; python_version < "3.10"
3-
ipython~=8.30.0; python_version >= "3.10"
3+
ipython~=8.32.0; python_version >= "3.10"
44
pytest>=7.4.4,<8.4.0

src/qcodes_contrib_drivers/drivers/Tektronix/FCA3100.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ def __init__(self,
6363
instrument:"FCA3100",
6464
**kwargs: Any
6565
) -> None:
66-
"""
67-
Parameter for a complete time statistics containing all measured switching times.
68-
69-
Args:
70-
name: name of the complete time statistics
71-
instrument: Instrument to which the complete time statistic is bound to.
72-
"""
7366
super().__init__(name=name,
7467
instrument=instrument,
7568
label='Times till switching',
@@ -179,4 +172,22 @@ def __init__(self,
179172
vals=Arrays(shape=(self.samples_number.get_latest,))
180173
)
181174

182-
self.connect_message()
175+
self.add_parameter(name='threshold_slope_A',
176+
label='threshold_slope_A',
177+
get_cmd='INPut1:SLOPe?',
178+
set_cmd='INPut1:SLOPe {}',
179+
get_parser=str,
180+
unit='',
181+
docstring='trigger slope @ threshold channel A'
182+
)
183+
184+
self.add_parameter(name='threshold_slope_B',
185+
label='threshold_slope_B',
186+
get_cmd='INPut2:SLOPe?',
187+
set_cmd='INPut2:SLOPe {}',
188+
get_parser=str,
189+
unit='',
190+
docstring='trigger slope @ threshold channel B'
191+
)
192+
193+
self.connect_message()

0 commit comments

Comments
 (0)