Homec4science
Diffusion Instrument Control (master) Graph

rINSTCONTROL/@MyInstrument
master

History Graph

CommitAuthorDetailsCommitted
613bcbe89063SAFedorov
MyLog and MyInstrument constructors are adopted to use MyClassParser instead of… 
Sep 9 2018
5812c2d7ae95SAFedorov
MyLog saving functionality progress 
Sep 8 2018
ef09a4041d7dSAFedorov
MyLog class is created + MyInputHandler edits 
Sep 8 2018
3d7aa591e1cbSAFedorov
Misc improvements before deployment 
Aug 30 2018
3cb79c196aa6SAFedorov
Introduced no_new_header flag in NewData event. Also the use of MyNewDataEvent… 
Aug 29 2018
e4b6cbcf82d4SAFedorov
Changed name, address and interface of an instrument to be protected variables 
Aug 29 2018
1439c8e2bf22SAFedorov
Added removal of \n and \r symbols from idn_str directly in MyInstrument 
Aug 25 2018
8aa80295e013SAFedorov
In MyLakeshore and MyTpg added triggering of PropertyRead event 
Aug 25 2018
d6a319c1142eSAFedorov
More edits towards event-based gui updates 
Aug 25 2018
30e3c8017ef2SAFedorov
Added event NewParameter to MyInstrument and introduced initInstrGui 
Aug 24 2018
de2afc2e960dSAFedorov
MyMetadata and related edit 
Aug 24 2018
09a15f08dc05SAFedorov
Edits of readHeaders in MyMetadata and renaming str_spec to fmt_spec 
Aug 23 2018
224d2de9d98dSAFedorov
Started messing up with MyMetadata 
Aug 23 2018
7bcb752913e8SAFedorov
MyInstrument connectDevice revision 
Aug 20 2018
defc43732c8eSAFedorov
MyInstrument edits - idn functionality 
Aug 20 2018
19b013337d28SAFedorov
In MyInstrument, move trace assignment to constructor 
Aug 20 2018
35021d4f5960SAFedorov
MyTlb6700 works to the first approximation 
Aug 17 2018
133bd8af2ce3SAFedorov
Creation of command list and parser is added to MyScpiInstrument constructor. 
Aug 16 2018
fd9f28445ce5SAFedorov
Collector works again to the first approximation 
Aug 15 2018
cd67dd1c2095SAFedorov
MyInstrument.connectDevice edits 
Aug 15 2018
44e64c314374SAFedorov
InstrumentManager merged with FindInstrumentDlg 
Aug 15 2018
05ba1cbfddd4SAFedorov
MyInstrument is subdivided into new MyInstrument and MyScpiInstrument 
Jul 30 2018
61a7176449b6SAFedorov
MyLakeshore336 is working (passed basic tests) 
Jul 20 2018
cb4ec6ecdf9bSAFedorov
MyLakeshore336 class created 
Jul 20 2018
2fbae56f1d48SAFedorov
Finalized MyParsedInputs class and integrated it into MyInstrument 
Jul 20 2018
74cccc800f10engelsen
Debugging MyTpg 
Jul 14 2018
12cc3fc02f0bSAFedorov
Created MyLogger class 
Jul 11 2018
57ed5bb3eb3eengelsen
1. Made name check for Mycollector more robust 2. Looking for readHeader… 
May 3 2018
61b517c9dee0engelsen
Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… 
Apr 30 2018
eab28b003ec3engelsen
1 
Apr 25 2018
dcb3b3d5624fengelsen
Header writing additions 
Apr 17 2018
e821a4f6e55fSAFedorov
New header functions 
Apr 5 2018
1a1fcbfb5f00SAFedorov
1. Progress made towards instrument headers, but still significant changes… 
Feb 15 2018
1e644cf5c42bSAFedorov
1. Incremental edits 
Feb 12 2018
37cdd8b7ffaeSAFedorov
LocalInstrumentControlSettings introduced to generalize InstrumentList 
Feb 11 2018
b5d683ffac08SAFedorov
MyDso is working 
Feb 9 2018
8e4d174b4f68SAFedorov
Fixed wrong limits for the Start freq field in GuiRsa 
Jan 31 2018
10e2ab5a2f4bSAFedorov
'instr_list' interface value introduced 
Jan 28 2018
9632d3d67692SAFedorov
genericInitGui is introduced 
Jan 26 2018
b719fc4c129fSAFedorov
New instrument manager 
Jan 25 2018
fd5cb37830b3SAFedorov
Daq is somehow working with app Gui's 
Jan 24 2018
caf0e5470a7dSAFedorov
New RSA control panel and init_val_list 
Jan 24 2018
f7e8be445b9aSAFedorov
MyScope to MyDpo renaming 
Jan 22 2018
0fb4590d884aSAFedorov
Edits for consistency with DPO3034 
Jan 19 2018
a8807eb401d9SAFedorov
Removed artefact Gui code from MyInstrument 
Jan 19 2018
546876cda03bSAFedorov
readProperty made single command and GuiScope finalized 
Jan 19 2018
a2d1571b8ed6SAFedorov
MyInstrument isprop bug fixed 
Jan 19 2018
a1377f2306f7SAFedorov
MyInstrument and MyScope fixes 
Jan 18 2018
a6832a9d23deSAFedorov
Removed y_data, MyNa address handling changed 
Jan 18 2018
a6432f5f6f68engelsen
Various bug fixes in MyScope and GuiScope 
Jan 18 2018
e6dbb62e0b2dSAFedorov
Instrument connection fixes 
Jan 18 2018
4aec45d83130SAFedorov
Scope GUI 1-st iteration 
Jan 17 2018
54e98ff0e849SAFedorov
MyInstrument edits 
Jan 14 2018
c4ebc31daf60SAFedorov
MyScope preliminary edits and RunScope added 
Jan 13 2018
ec3e39839577SAFedorov
readProperty default formatting changed 
Dec 2 2017
049955c99d8fSAFedorov
readProperty default formatting changed 
Dec 2 2017
9e4d8bd5c023engelsen
Merge branch 'MyScope-MyInstrument-fixes' of https://github. 
Nov 30 2017
9bcd798f1748engelsen
1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a… 
Nov 30 2017
1968664ea2b0engelsen/GitHub
Merge branch 'MyScope-MyInstrument-fixes' into MyFit-MyInstrument-fixes 
Nov 29 2017
b5fc72794f24engelsen
1. Changed str_spec to take any arbitrary string 
Nov 29 2017
1bb2fd6a61beengelsen
1. Fixes relating to readProperty functionality 
Nov 29 2017
7b331f6443cdengelsen/GitHub
Merge pull request #98 from engelsen/MyFit-MyInstrument-fixes 
Nov 24 2017
747411410c1eengelsen
1. Generalized Catch call in openDevice to look for resource name instead of… 
Nov 23 2017
acaa69dec939engelsen
1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2. 
Nov 23 2017
60dacaa31e4fSAFedorov
My Instrument and MyNa changes 
Nov 23 2017
58a6633c1b7bengelsen
Finished debugging of the new MyInstrument 
Nov 21 2017
61065f1898a0SAFedorov
MyInstrument edits 
Nov 20 2017
d69872e772bcSAFedorov
Update 
Nov 20 2017
0fe61bee412fengelsen
1. Bug fixes of dynamic properties 2. Added new field in GUI for reading… 
Nov 17 2017
9aa6574ef202engelsen
1. Significant revision to write and read property commands 2. Further… 
Nov 17 2017
794a5ef1a0c0engelsen
Merge branch 'DynamicProps' of https://github.com/engelsen/Instrument-control… 
Nov 16 2017
68c2b344cc8dengelsen
1. Added conv_factor to CommandList and Parser 
Nov 16 2017
7675e0765c72engelsen
1. Added dynamic properties to MyRsa class 
Nov 16 2017
b917839bfa4dengelsen
1. Testing DynamicProps 
Nov 16 2017
38abe6a1b149engelsen
1. Removed axes_handle property from MyInstrument 
Nov 13 2017
182704aea791engelsen
1. Removed read and write functions from MyInstrument.m and subclasses 
Nov 13 2017
34935c7b5387engelsen
1. Added clearData function to MyInstrument.m 2. Made Trace a MyInstrument.m… 
Nov 6 2017
bab4394503f3engelsen
1. Set Access properties of MyInstrument.m 
Nov 2 2017
ea176b6575b8engelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control 
Oct 26 2017
1221d4833a55engelsen
1. Removed redundant Deletion events and its triggers. Now using… 
Oct 26 2017
53a8ad479968engelsen
1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and… 
Oct 25 2017
10cb1d0d9b17engelsen
1. Added instrument helper functions 2. Added instrument listeners and listener… 
Oct 25 2017
7f21abfad5d0engelsen
1. Changed names of events to 'NewData' and 'NewFit' for MyInstrument.m and… 
Oct 20 2017
482406ff1420engelsen
1. Created event in MyInstrument.m that is triggered when data is acquired 2. 
Oct 19 2017
ba22ee5ee62aengelsen
1. Added delete function for MyFit.m 2. Numerous GUI optimizations relating to… 
Oct 19 2017
1495480258c5engelsen
1. Added figure callbacks to MyNa.m 2. Added and modified figure file for MyNa. 
Oct 12 2017
261f0da1c863engelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control 
Oct 12 2017
118b25728fbbengelsen
1. Added continuous read function as callback to checkbox in MyScope.m… 
Oct 12 2017
5cda62a738aaengelsen
Fixed bugs in MyRsa.m related to new inputparser for MyTrace.m 
Oct 12 2017
20f034f334d8engelsen
1. Removed unused functions from MyRsa.m 2. Added readProperty function to… 
Oct 12 2017
1651e39cdf9bengelsen
1. Added try catch block to open instruments to find if the instrument is… 
Oct 11 2017
446e97f39455engelsen
1. Added inputParser to class constructor of MyInstrument.m 2. Allowed for GUI… 
Oct 11 2017
e6c4e2850ae9He3
1. Added MyScope with associated GUI. Started writing basic functionality for… 
Oct 10 2017
b4c9827b0884He3
First commit of files to repository 
Oct 9 2017
c4science · Help