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.

Sign up for GitHub

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

Jump to bottom

Rigol DS1074Z oscilloscope driver #1652

Merged
merged 80 commits into from
Aug 22, 2019
Merged

Rigol DS1074Z oscilloscope driver #1652

merged 80 commits into from
Aug 22, 2019

Conversation

lakhotiaharshit
Copy link
Contributor

The driver for RigolDS1074Z oscilloscope.

Reason:
The oscilloscope is present in lab at Delft but had no relevant drivers available. Hence we decided to undertake this task to have an overview on writing drivers.

Driver status:

  • can set up x, y-axis
  • can be used to take traces from any channel in the oscilloscope.
  • can set up trigger mode and levels.

Things left to do:

  • Edit example document.

@astafan8

Harshit Lakhotia (Blue Lynx Employment BV) and others added 30 commits July 17, 2019 12:11
Oscilloscope RIGOLDS1074 Drivers
10a30b4
@lakhotiaharshit
Add: YAML file for Rigol_DS1074Z
4c083a1
@lakhotiaharshit
Refactor: Driver and example files
0c46f1b
@lakhotiaharshit
Edit: Example file Copy:Driver file
076a4c3
@lakhotiaharshit
Write test for Rigol drivers
f65ef51
@lakhotiaharshit
Edit YAML file: Correct indentations etc
b41798a
@lakhotiaharshit
Add tests
9c3dd15
@lakhotiaharshit
Add properties in YAML file.
905e1a1 
Also correct some syntax
@lakhotiaharshit
Fix PEP8 recommendations
c2cfb09
@lakhotiaharshit
Example notebook for both actual and sim instrument
ff185b8
@lakhotiaharshit
Edit YAML file to incorporate reponse for get_trace
cbfeb14
@lakhotiaharshit
Add tests
68ddb29
@lakhotiaharshit
Example Notebook
0e86cd4
@lakhotiaharshit
PEP8 + Remove the test for get_trace
12a0d5b 
This test will be added in next commit
@lakhotiaharshit
PEP8 recommendation
7ab5d20
@lakhotiaharshit
Delete unecessary test_sampling_measurement.py
80c474d
@lakhotiaharshit
Edit example notebook
ea907af
@lakhotiaharshit
Remove duplicated parameter
67d2d60 
trigger_level and trigger_level1 have same functionality hence first is
removed.
@lakhotiaharshit
Add units to the get_trace parameter
d0dc36c
@lakhotiaharshit
Correct the y axis of the trace
0da455b
@lakhotiaharshit
Add parameters to choose trigger source and slope
4ea7823
@lakhotiaharshit
Edit example notebook for the driver
24cbff3
@lakhotiaharshit
Delete notebook used as a sketch for example notebook
d46380e
@lakhotiaharshit
Fix YAML file: remove get_trace
91c4348
@lakhotiaharshit
Fix: unecessary doctrings into block comments
3b6f826
@lakhotiaharshit
Remove unnecessary imports
5d05700
@lakhotiaharshit
Edit example notebook to contain the output after execution
28f5bd4
@lakhotiaharshit
Fix: Save example notebook for execution
d921aa9
@lakhotiaharshit
Edit metadata of example file to stop execution while doc preparation.
fa810b0
@lakhotiaharshit
Fix: Docstring
7ed3a24
lakhotiaharshit and others added 17 commits August 14, 2019 18:23
@lakhotiaharshit @astafan8
Change name of parameter
363990e 
Co-Authored-By: Mikhail Astafev <[email protected]>
@lakhotiaharshit
Call connect_message() and the end of init
22d9fdd
@lakhotiaharshit
Merge branch 'RigolDS1074Z' of https://github.com/lakhotiaharshit/Qcodes
13ece2d 
 into RigolDS1074Z
@lakhotiaharshit
Edit example notebook
6fac580
@lakhotiaharshit
Edit example notebook
9b0ccc2
@lakhotiaharshit
Correct the val_mappings
59e1184
@lakhotiaharshit
Edit val_mappings for channel number
a2c6487
@lakhotiaharshit
Merge branch 'RigolDS1074Z' of https://github.com/lakhotiaharshit/Qcodes
9ce2c8b 
 into RigolDS1074Z
@lakhotiaharshit
Fix val_mapping trigger edge source
c06be8f
@lakhotiaharshit
PEP8
6e063a5
@lakhotiaharshit
Fix unnecessary privatization of variable.
39039c9
@lakhotiaharshit
Edit example notebook
072bfa3
@lakhotiaharshit
Remove unused import
fd64fe0
@lakhotiaharshit
Edit example notebook for correct channel.
558a263
@lakhotiaharshit
Remove unnecessary val_mapping for trigger_mode
ff046b9
@lakhotiaharshit
Remove unnecessary val_mapping for trigger_mode
739ea14
@lakhotiaharshit
Merge branch 'RigolDS1074Z' of https://github.com/lakhotiaharshit/Qcodes
6049687 
 into RigolDS1074Z
astafan8
astafan8 approved these changes Aug 22, 2019
View reviewed changes
Copy link
Contributor

@astafan8 astafan8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Thanks for the patience!

@astafan8 astafan8 merged commit c07ae5e into microsoft:master Aug 22, 2019
@lakhotiaharshit lakhotiaharshit deleted the RigolDS1074Z branch January 22, 2020 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WilliamHPNielsen WilliamHPNielsen WilliamHPNielsen left review comments

@jenshnielsen jenshnielsen jenshnielsen left review comments

@astafan8 astafan8 astafan8 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lakhotiaharshit @WilliamHPNielsen @jenshnielsen @astafan8