forked from pymeasure/pymeasure
-
Notifications
You must be signed in to change notification settings - Fork 1
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
Andor iDus #5
Merged
Merged
Andor iDus #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix a couple of typos in procedure.rst
commit 50af9f8 Merge: 08e0a22 1c3d78d Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Tue Jul 23 09:28:25 2024 +0200 Merge branch 'pymeasure:master' into master commit 08e0a22 Merge: 0f75d87 4846672 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Wed May 29 09:02:16 2024 +0200 Merge branch 'pymeasure:master' into master commit 0f75d87 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Wed May 15 13:03:10 2024 +0200 Add VSP product line of Thyracont Smartline gauges commit 9d91d47 Merge: 121a8eb 92175a1 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Wed May 15 13:01:16 2024 +0200 Merge remote-tracking branch 'upstream/master' commit 121a8eb Merge: 482f20f dac032b Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Wed Feb 7 12:10:25 2024 +0100 Merge remote-tracking branch 'upstream/master' commit 482f20f Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Feb 1 18:01:29 2024 +0100 use StrEnum instead of old string values this is a breaking change with respect to the instrument in the published package version and there a note is added in the changelog commit 1dad20a Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Feb 1 15:35:02 2024 +0100 full backward compatible version. Enum only for writing commit 0bd069c Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Feb 1 15:20:38 2024 +0100 Indicate minimal version at which fallback code can be removed Co-authored-by: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> commit 47dc65a Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Feb 1 14:33:24 2024 +0100 simplify Unit implementation commit f889dab Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Feb 1 14:27:31 2024 +0100 use StrEnum with a fallback implementation commit 5243c07 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 12:02:10 2024 +0100 backward compatible setting of unit property for MKS937B Setting the unit is now backward compatible, but reading the unit still changed. This depends on the order of the values in the dictionary. commit e0d2fc9 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 10:01:31 2024 +0100 code formatting fixes commit f601d71 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 09:58:23 2024 +0100 fix docstring reference and more StrEnum commit 2f152a3 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 09:53:11 2024 +0100 avoid StrEnum which needs python>=3.11 commit 1b75dd0 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 09:50:41 2024 +0100 update documentation commit fc0a46c Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 09:49:25 2024 +0100 harmonize use of RelayChannel add new feature of RelayChannels to MKS937B commit 55dc91e Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Mon Jan 29 09:10:37 2024 +0100 harmonize use of mksinst Unit use specific imports from standard library Units for MKS937B and MKS974B are unfortunately a bit different (MBAR vs. mBAR and missing MICRON) commit f3f3d33 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Fri Jan 26 13:46:59 2024 +0100 rename SetpointChannel to RelayChannel at the same time I renamed the SetpointChannel.value to RelayChannel.setpoint commit 7c8ece8 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Fri Jan 26 12:50:29 2024 +0100 Apply suggestions from code review Co-authored-by: Benedikt Burger <67148916+BenediktBurger@users.noreply.github.com> commit e9acf33 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Fri Jan 26 09:20:54 2024 +0100 fixes after testing all options with the hardware also add an id() implementation. Note that this rapid succession of property queries in the id function might fail with some cheap USB-Serial converters. But the MKS hardware can handle it. commit 2c10f85 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Jan 25 15:00:38 2024 +0100 more whitespace fixes commit fe72a03 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Jan 25 14:55:49 2024 +0100 fix whitespace commit 31d27a3 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Jan 25 14:42:33 2024 +0100 fix docstrings line length commit 08e2dd5 Author: Dominik Kriegner <dominik.kriegner@gmail.com> Date: Thu Jan 25 12:35:59 2024 +0100 add MKS974 pressure transducer Instrument * create an abstract MKSInstrument to avoid code duplication for the two MKS instruments. * add documentation * add unit tests
…e_types Add more Thyracont vacuum transducer device types
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.