Merge branch 'master' of https://github.com/engelsen/Instrument-control
Description
Description
Details
Details
- Committed
He3 <lpqm.he3@outlook.com> Aug 15 2018, 10:51 - Parents
- rINSTCONTROL0d13eb634b97: Merge pull request #135 from engelsen/Temperature-monotor
rINSTCONTROL3f8da379438c: Merge branch 'master' of https://github.com/engelsen/Instrument-control - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0d13eb634b97 | engelsen/GitHub | Merge pull request #135 from engelsen/Temperature-monotor | Jul 21 2018 | |||
78cd72a6b80f | SAFedorov | Finilized temperature monitor | Jul 21 2018 | |||
8d778af0b0b8 | SAFedorov | Output mode callbacks debugged in GuiLakeshore | Jul 21 2018 | |||
45df66137409 | SAFedorov | Added display of output parameters to GuiLakeshore | Jul 21 2018 | |||
c538079f46f5 | SAFedorov | removed read functions for single channels | Jul 21 2018 | |||
8e7a87a2b014 | SAFedorov | Temperature logger works in minimalistic configuration | Jul 20 2018 | |||
07eb8ca78e13 | SAFedorov | Pressure monitor and logger modified according to the input parser changes | Jul 20 2018 | |||
61a7176449b6 | SAFedorov | MyLakeshore336 is working (passed basic tests) | Jul 20 2018 | |||
cb4ec6ecdf9b | SAFedorov | MyLakeshore336 class created | Jul 20 2018 | |||
2fbae56f1d48 | SAFedorov | Finalized MyParsedInputs class and integrated it into MyInstrument | Jul 20 2018 | |||
fe369478e902 | SAFedorov | make MyParsedInputs class to replace parser utilities | Jul 20 2018 | |||
d0441fc484e3 | SAFedorov | Initial commit - run files manipulations | Jul 20 2018 |