Merge branch 'master' of https://github.com/engelsen/Instrument-control into MyFitsaveParams
Description
Description
Details
Details
- Committed
engelsen Jan 25 2018, 16:01 - Parents
- rINSTCONTROL5d564ed7b9db: 1. Gui fixes for MyFit.m
rINSTCONTROL6d4607bde773: Merge pull request #109 from engelsen/Scope-edits - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 6d4607bde773 | SAFedorov/GitHub | Merge pull request #109 from engelsen/Scope-edits | Jan 25 2018 | |||
| fd5cb37830b3 | SAFedorov | Daq is somehow working with app Gui's | Jan 24 2018 | |||
| caf0e5470a7d | SAFedorov | New RSA control panel and init_val_list | Jan 24 2018 | |||
| 0e71528dfa5e | SAFedorov | runGui introduced | Jan 23 2018 | |||
| 7a9a65cdef81 | SAFedorov | Minor edits to GuiDpo, GuiNa. Started on GuiRsa.mlapp | Jan 22 2018 | |||
| f7e8be445b9a | SAFedorov | MyScope to MyDpo renaming | Jan 22 2018 | |||
| 0fb4590d884a | SAFedorov | Edits for consistency with DPO3034 | Jan 19 2018 | |||
| a8807eb401d9 | SAFedorov | Removed artefact Gui code from MyInstrument | Jan 19 2018 | |||
| 546876cda03b | SAFedorov | readProperty made single command and GuiScope finalized | Jan 19 2018 | |||
| 41edccbeef71 | SAFedorov | Merge branch 'Scope-edits' of https://github.com/engelsen/Instrument-control… | Jan 19 2018 | |||
| a2d1571b8ed6 | SAFedorov | MyInstrument isprop bug fixed | Jan 19 2018 | |||
| e4731277c905 | SAFedorov | MyInstrument isprop bug fixed | Jan 19 2018 | |||
| 9faeb16f4282 | SAFedorov | Binary trace reading indroduced and Gui updated | Jan 19 2018 | |||
| 8d62bddd16b5 | SAFedorov | GuiScope small debugging | Jan 18 2018 | |||
| 9b61040ef22f | SAFedorov | GuiScope usability improvements | Jan 18 2018 | |||
| a1377f2306f7 | SAFedorov | MyInstrument and MyScope fixes | Jan 18 2018 | |||
| a6832a9d23de | SAFedorov | Removed y_data, MyNa address handling changed | Jan 18 2018 | |||
| 9ffb795b0c46 | SAFedorov | GuiScope bug incremental improvement | Jan 18 2018 | |||
| a6432f5f6f68 | engelsen | Various bug fixes in MyScope and GuiScope | Jan 18 2018 | |||
| e6dbb62e0b2d | SAFedorov | Instrument connection fixes | Jan 18 2018 | |||
| fbf6aa8ef9f7 | SAFedorov | FindInstrDialog | Jan 17 2018 | |||
| 468369473f19 | SAFedorov | findInstrDlg deleted | Jan 17 2018 | |||
| a9b3659461a2 | SAFedorov | Revert "findInstrumentDlg deleted" | Jan 17 2018 | |||
| fb2ea37b1c22 | SAFedorov/GitHub | findInstrumentDlg deleted | Jan 17 2018 | |||
| 4aec45d83130 | SAFedorov | Scope GUI 1-st iteration | Jan 17 2018 | |||
| 54e98ff0e849 | SAFedorov | MyInstrument edits | Jan 14 2018 | |||
| 52b0d7d8f6b4 | SAFedorov | InstrListManager consistency edits | Jan 14 2018 | |||
| 5613b46ee7c9 | SAFedorov | FindInstrDlg renamed | Jan 14 2018 | |||
| b3b3bd73c6ba | SAFedorov | Instrument List Manager is introduced | Jan 14 2018 | |||
| c4ebc31daf60 | SAFedorov | MyScope preliminary edits and RunScope added | Jan 13 2018 | |||
| 0c42eddfd516 | engelsen/GitHub | Merge pull request #108 from engelsen/Instrument-find-dialog | Dec 2 2017 | |||
| a6415f1f2fa9 | SAFedorov | Gui dialog for instrument search is added | Dec 2 2017 | |||
| ec3e39839577 | SAFedorov | readProperty default formatting changed | Dec 2 2017 | |||
| 049955c99d8f | SAFedorov | readProperty default formatting changed | Dec 2 2017 |