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

Add trigger, and program feature to Yokogawa GS200, and digitizer feature to Keithley 7510 #2138

Merged
merged 51 commits into from Oct 22, 2020
Merged

Add trigger, and program feature to Yokogawa GS200, and digitizer feature to Keithley 7510 #2138

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ee8dbb0
add a few new features to Yokogawa GS200
liangosc Aug 21, 2020
3887789
add buffer, digisense, and trigger to the 7510 driver
liangosc Sep 2, 2020
93d4fb2
works with the instruments
liangosc Sep 3, 2020
d3edfb5
add example notebook
liangosc Sep 3, 2020
f0ea5a3
lint fixes
liangosc Sep 3, 2020
436a0f3
add unit and vals to interval and slope, also add example for save an…
liangosc Sep 8, 2020
2fc9b7f
docstring fixes, and make the two methods about elements private
liangosc Sep 10, 2020
51a4ed6
make buffer.data a parameter
liangosc Sep 10, 2020
5e36cb6
try to fix a lint problem
liangosc Sep 10, 2020
31d279c
lint fix, match the return type
liangosc Sep 11, 2020
3b04f21
use name instead of buffer_name in the buffer class
liangosc Sep 22, 2020
c216818
use short_name instead of name
liangosc Sep 23, 2020
3e0b6c9
make buffer.data a parameter
liangosc Sep 23, 2020
6e192dd
I decided to make n_pts a property, not a parameter
liangosc Sep 23, 2020
56f55cc
remove the update method, which is unnecessary, data() will now retur…
liangosc Sep 24, 2020
21a4b89
fix return type
liangosc Sep 24, 2020
a157c8b
add ndarry to return type
liangosc Sep 24, 2020
b982697
use list as return type
liangosc Sep 24, 2020
816923d
use ndarry instead of list
liangosc Sep 24, 2020
03a3377
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
liangosc Oct 9, 2020
fe1cb00
use MultiParameter
liangosc Oct 14, 2020
530b69e
fix return type
liangosc Oct 14, 2020
1a30227
line too long
liangosc Oct 14, 2020
d79786e
oops, typo
liangosc Oct 14, 2020
5f6924e
DataArray is already there, use DataArray7510 instead
liangosc Oct 15, 2020
19a58ae
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
jenshnielsen Oct 15, 2020
9044f6c
make data_start and data_end both parameter, and n_pts will be calcul…
liangosc Oct 15, 2020
3f8937d
match variable type
liangosc Oct 15, 2020
fad3bc6
remove an extra line
liangosc Oct 15, 2020
f66a02e
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
liangosc Oct 16, 2020
2e31af3
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
jenshnielsen Oct 19, 2020
253ef1f
fix the buffer_elements
liangosc Oct 19, 2020
2b319f3
updated the example notebook
liangosc Oct 19, 2020
823f359
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
astafan8 Oct 20, 2020
a4537c8
use MultiParameter only, works with instrument
liangosc Oct 21, 2020
a486d76
Merge branch 'Add_triggering_to_Yokogawa_GS200' of https://github.com…
liangosc Oct 21, 2020
75c8e52
lint fix
liangosc Oct 21, 2020
c544713
val can not be empty
liangosc Oct 21, 2020
e9bdb2b
remove two extra lines
liangosc Oct 21, 2020
ec41fd7
fix the _data type
liangosc Oct 21, 2020
69d30eb
match return type
liangosc Oct 21, 2020
b0721b4
looks like None is not going to work
liangosc Oct 21, 2020
8c8e27a
test
liangosc Oct 21, 2020
66106f1
get the unit inside the function
liangosc Oct 21, 2020
22c13ea
Merge branch 'master' into Add_triggering_to_Yokogawa_GS200
jenshnielsen Oct 21, 2020
e8b1df2
fix types
jenshnielsen Oct 21, 2020
0a4d2a4
update the notebook
liangosc Oct 21, 2020
a3849b8
lint fix
liangosc Oct 21, 2020
0387947
use np.array for data
liangosc Oct 21, 2020
60b45d7
save data in tuple, no ndarray
liangosc Oct 21, 2020
10a346a
add setpoint_names
liangosc Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view