Merge branch 'master' of https://github.com/engelsen/Instrument-control
Description
Description
Details
Details
- Committed
He3 <lpqm.he3@outlook.com> Jul 20 2018, 17:18 - Parents
- rINSTCONTROL22f2b46a52c5: Fixed bug in linkControlElement
rINSTCONTROLb28746aa064b: Revert "test" - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 22f2b46a52c5 | SAFedorov | Fixed bug in linkControlElement | Jul 17 2018 | |||
| 36013176b449 | SAFedorov | Fixed bug with instrMenuCallback | Jul 17 2018 | |||
| 237dd7a3c6fc | SAFedorov/GitHub | Merge pull request #134 from engelsen/Pressure-monitor | Jul 16 2018 | |||
| 2d3d131974bb | SAFedorov | Test functions deleted | Jul 16 2018 | |||
| 7679577d18f8 | SAFedorov | Finalize pressure logger | Jul 15 2018 | |||
| 3e58fcd5ddf3 | SAFedorov | MyTpg is almost working with GuiLogger | Jul 15 2018 | |||
| ec839ac85827 | SAFedorov | . filtered_varargin output is depreciated in parseClassInputs | Jul 15 2018 | |||
| 397305c13c67 | SAFedorov | GuiTpg is operational to the first approximation | Jul 15 2018 | |||
| 1e7f4aad2878 | SAFedorov | LoggerGui usability and stability improments. Should be fully operational now. | Jul 15 2018 | |||
| 618536b4ca7f | SAFedorov | Debugging and improving GuiLogger | Jul 15 2018 | |||
| bcc304d6f1d3 | SAFedorov | GuiLogger works to the first approximation | Jul 15 2018 | |||
| e1466a34cf70 | SAFedorov | getSubProperty is introduced and progress towards GuiLogger is made | Jul 14 2018 | |||
| 6a7fc82232f6 | SAFedorov | Towards MyLogger gui | Jul 14 2018 | |||
| f15dc2633e5d | SAFedorov | Debugged readPressureUnit and readPressureId | Jul 14 2018 | |||
| 74cccc800f10 | engelsen | Debugging MyTpg | Jul 14 2018 | |||
| df432697cdeb | SAFedorov | GuiGauge created | Jul 14 2018 | |||
| 8a9a2afcb127 | SAFedorov | Functions addClassProperties and parseClassInputs is added | Jul 13 2018 | |||
| 7a69a594258d | SAFedorov | MyLogger tested | Jul 12 2018 | |||
| b74b95db264a | SAFedorov | MyLogger is nominally finalized | Jul 12 2018 | |||
| 6ede5606b03d | SAFedorov | createFile revised | Jul 12 2018 | |||
| 44e213da48f8 | SAFedorov | MyLogger improvements | Jul 12 2018 | |||
| df66c1df5252 | SAFedorov | Progress towards woring logger | Jul 11 2018 | |||
| 12cc3fc02f0b | SAFedorov | Created MyLogger class | Jul 11 2018 | |||
| c93f994f3738 | SAFedorov | Created MyTpg class for the pressure gauge control | Jul 11 2018 | |||
| e9a83c06de5e | engelsen | Peakfinder improvements | Jun 27 2018 | |||
| 6ca805e7e1d6 | engelsen/GitHub | Merge pull request #132 from engelsen/Issue126 | Jun 22 2018 | |||
| 19c28997449f | engelsen | Peakfinder updates | Jun 22 2018 | |||
| 66315e489b64 | engelsen | Fit improvements | Jun 4 2018 | |||
| 94c4268ec9d4 | engelsen | Work towards 126 plus Peakfinder improvements | Jun 4 2018 | |||
| d7bdd885be9f | engelsen/GitHub | Merge pull request #128 from engelsen/Data-saving-edits | May 30 2018 | |||
| cecd1f1d2320 | engelsen/GitHub | Merge branch 'master' into Data-saving-edits | May 30 2018 | |||
| baa1baa5f07f | engelsen | 1. Added functionality to PeakFinder | May 30 2018 | |||
| 46b60fced52e | engelsen/GitHub | Merge pull request #127 from engelsen/Running-instrument-container | May 30 2018 | |||
| 1d8721493e4f | SAFedorov/GitHub | Merge pull request #124 from engelsen/Collector | May 30 2018 | |||
| f7d4f3e6d8da | engelsen | Added some basic checks for instrument name | May 30 2018 | |||
| a10c40699957 | engelsen | Acquiring instrument now in header | May 30 2018 | |||
| dd26bc7d5eb5 | engelsen | Changed Daq to receive from only selected instrument | May 9 2018 | |||
| 31337406c578 | engelsen | DAQmenu handling of Collector | May 9 2018 | |||
| 95ee06d3f789 | engelsen | Minimum functionality restored | May 7 2018 | |||
| a580b8b57020 | engelsen | Cleaned up DAQ | May 7 2018 | |||
| 989c7d4bcfe4 | engelsen | Access protection | May 7 2018 | |||
| 46889984aa86 | engelsen | Added Metadata property to MyTrace | May 7 2018 | |||
| ecb2745adc8e | SAFedorov/GitHub | Merge pull request #123 from engelsen/Data-saving-edits | May 4 2018 | |||
| 72695891e131 | engelsen | 1. Removed deprecated functions | May 4 2018 | |||
| 1d30e1c30add | engelsen | 1. Removed findMyInstrument from runfiles. | May 4 2018 | |||
| e3fd75452a1d | engelsen | 1. Added writing of timestamp to flies 2. Removed runDaqMenu.m and put its… | May 4 2018 | |||
| 692b9ea09fd1 | engelsen | Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… | May 3 2018 | |||
| 5d3355a3fb6a | engelsen | 1. Changed MyDaq to use findMyInstrument for InstrMenuCallback | May 3 2018 | |||
| fe52528237cb | engelsen | Bug fix MyDaq | May 3 2018 | |||
| 57ed5bb3eb3e | engelsen | 1. Made name check for Mycollector more robust 2. Looking for readHeader… | May 3 2018 |