Skip to content
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

Navigator #3

Open
wants to merge 133 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
f31059b
Added a HSDIOPatternGenerator to mimic the DAQmx pattern generator
jstammers Jul 13, 2016
f88d867
Added HSDIOPatternBuilder which builds a digital script for an NI-HSD…
jstammers Jul 24, 2016
945d45e
Added hardware defintions to NavigatorHardware
jstammers Jul 26, 2016
3c3432a
Added static controller for HSDIO cards
jstammers Jul 26, 2016
12a7365
MOTmaster can now accept a collection of digital/analog patterns whic…
jstammers Aug 2, 2016
7c88035
Added RemoteRun method to MOTMaster which stores data from each run i…
jstammers Aug 11, 2016
ef2d180
Cleaned up Navigator code before merging with Kyle's IMAQ
jstammers Sep 23, 2016
746e1c8
Started ImageViewer and commiting before merging with kyle's branch
jstammers Sep 26, 2016
3116694
Added RFMOT project
jstammers Sep 27, 2016
2d49b39
Added Camera control and some of the RFMOT code
jstammers Sep 27, 2016
e95a336
Added ImageController to NavigatorHardwareControl
jstammers Sep 28, 2016
a46088a
Voltage Logger now reads continuously
jstammers Sep 29, 2016
158fd9f
Fixed hardware state update
jstammers Oct 3, 2016
00b34a7
Added Background Image
jstammers Oct 18, 2016
850e90e
Made improvements to Navigator Hardware Control
jstammers Nov 23, 2016
8955b95
The ImageController can now be opened and closed without restarting t…
jstammers Nov 28, 2016
9659e5f
Added some cicero list manipulation to Navigator Hardware control
jstammers Dec 2, 2016
17e0938
Commit before merge with master branch
jstammers Jan 17, 2017
6f87590
Fixing merge conflicts
jstammers Jan 22, 2017
76ecafc
Switching to navigator_v0.x
jstammers Feb 1, 2017
fcd333d
Fixing merge conflicts
jstammers Feb 2, 2017
ea2268f
Merging with master
jstammers Feb 2, 2017
f7b473a
Fixing merge conflicts with master
jstammers Feb 2, 2017
49cf011
Build configuration issues
jstammers Feb 2, 2017
b1d8736
Modified HSDIOPatternGenerator
jstammers Feb 16, 2017
3bf9c88
Added MOTmaster script for loading 3D mot from 2D mot
jstammers Feb 17, 2017
56bf80c
Added basic sequences to NavigatorMaster and control for Muquans laser
jstammers Feb 21, 2017
907a98f
Added MuquansBuilder which can be used to trigger serial messages by …
jstammers Mar 3, 2017
73a2fc9
Commiting changes before merging upstream
jstammers Mar 3, 2017
99b577a
Changed MuquansController to send serial messages on a SampleClockEve…
jstammers Mar 24, 2017
e72f72c
Staging changes before merge with upstream
jstammers Mar 24, 2017
a7ce4ba
Fixing merge conflicts
jstammers Mar 24, 2017
fde6957
Added a function to AnalogPatternBuilder to build a voltage pattern b…
jstammers Mar 24, 2017
d5e3e33
Changed MOTSequence to use times defined in milliseconds. A helper fu…
jstammers Mar 27, 2017
07bcdaa
Fixing merge conflicts
jstammers Mar 27, 2017
27c62a5
Added new MolassesSequence
jstammers Mar 30, 2017
c564a38
Added Parameter serialisation to json
jstammers Mar 31, 2017
1abc301
Added PropertyGrid for configuring hardware and filesystem
jstammers Apr 3, 2017
82aea19
Added Options viewer to MOTMaster2 and made paths in NavigatorFileSys…
jstammers Apr 4, 2017
fede9f3
Improvements to MOTMaster2 GUI to update scanning and manual parameters
jstammers Apr 5, 2017
5106e9b
Commiting before checkout
jstammers Apr 18, 2017
b05ecba
Added a base sequence step class
jstammers Apr 18, 2017
b3ed793
Merge branch 'navigator_v0.x' of https://github.com/ColdMatter/EDMSui…
jstammers Apr 18, 2017
f2b7201
Each SequenceStep now contains a SequenceStartTime and EndTime. The …
jstammers Apr 18, 2017
8bce06c
Added a function to MMDataIOHelper called SaveRawSequence which saves…
jstammers Apr 19, 2017
4e8c2ce
Added a class to communicate with MSquared ICE-BLOC systems and a uni…
jstammers Apr 25, 2017
d599b51
Fixed MuquansBuilder bug
jstammers Apr 25, 2017
ccd0971
Added a full interferometer MOTMasterSequence. Started work on adding…
jstammers May 30, 2017
794a3ff
Added some functionality to SequenceDataGrid
jstammers May 30, 2017
29748e8
Added a ViewModel class for SequenceSteps
jstammers May 31, 2017
9ede50e
Fixed SequenceDataGrid to bind to underlying data
jstammers May 31, 2017
ca2116a
Added Parser class for Equations and SequenceBuilder to create a MOTM…
jstammers Jun 5, 2017
0549ebb
Added a SequenceClass which contains both a list of sequence steps an…
jstammers Jun 13, 2017
fb60b2b
Added parameters window, so that the user can add new parameters, alo…
jstammers Jun 13, 2017
ed71ddc
Analog channel arguments can now take parameter names as well as nume…
jstammers Jun 13, 2017
74ea449
Serial Commands in MOTMaster2 can now be parsed using parameter names…
jstammers Jun 14, 2017
6c988fd
Added packages folder to .gitignore
jstammers Jun 14, 2017
b44ccb4
Fixed merge conflicts from remote branch
jstammers Jun 14, 2017
a8969e7
Removed Merge conflicts from xaml files
jstammers Jun 14, 2017
92e3029
Added Test Class
jstammers Jul 10, 2017
15668b9
Added CiceroConverter class after it was deleted during a rebase
jstammers Jul 10, 2017
50a992f
Added CiceroConverter class after it was deleted during a rebase
jstammers Jul 10, 2017
233fb86
Fixing merge commits and rebase problem
jstammers Jul 10, 2017
b53555f
FIxed a lot of bigs in the CiceroConverter class. The RS232 commands …
jstammers Jul 10, 2017
00097ae
Minor changes to sequencebuilder
jstammers Jul 11, 2017
f2693d7
test change
teodor-krastev Jul 11, 2017
63e491d
test 1
teodor-krastev Jul 12, 2017
08fd7e6
changes
teodor-krastev Jul 12, 2017
761ca39
current changes
teodor-krastev Jul 12, 2017
2026685
current changes
teodor-krastev Jul 12, 2017
42d82fa
current changes
teodor-krastev Jul 12, 2017
f5c862b
Added a flag to MMConfig to specify whether or not to use MotMasterSc…
jstammers Jul 13, 2017
f09a732
events fixed
teodor-krastev Jul 14, 2017
e42b9d3
Fixed CiceroConverter to ignore disabled channels
jstammers Jul 14, 2017
b77601b
unessential
teodor-krastev Jul 14, 2017
3560b47
Fixed merge conflicts with remote branch
jstammers Jul 14, 2017
79205b0
More merge conflict fixing
jstammers Jul 14, 2017
d9a69f5
Fixed merge conflicts as well as some bugs in loading a Cicero sequen…
jstammers Jul 15, 2017
c9e6bf2
Fixed problems with Muquans Serial output and building the digital pa…
jstammers Jul 16, 2017
9545a66
Some minor bug fixes
jstammers Jul 17, 2017
1942e44
Merge conflicts
jstammers Jul 17, 2017
b320225
Minor fixes
jstammers Jul 17, 2017
3193734
Bug fixes
jstammers Jul 20, 2017
3abd151
json and visuals
teodor-krastev Jul 20, 2017
768a1df
last minute
teodor-krastev Jul 20, 2017
9bf723b
Added extra hardware for Microwave synth and saving of parameters
jstammers Jul 20, 2017
3174c62
Fixed merge conflicts
jstammers Jul 20, 2017
bdca93c
Fixed bugs with saving during scan
jstammers Jul 20, 2017
4db0b6a
Added some remote command to MOTMaster
jstammers Jul 24, 2017
70a0c72
test1
teodor-krastev Jul 24, 2017
11313d5
Changed Synthesiser to the WindfreakSynth
jstammers Jul 24, 2017
c0e3b83
Merging with remote branch
jstammers Jul 24, 2017
bb727e3
Fixed merge conflicts
jstammers Jul 24, 2017
7248fac
Fixed synth
jstammers Jul 24, 2017
325c099
Added WindFreak synth
jstammers Jul 25, 2017
b0e1011
Merge branch 'navigator_v0.x' of https://github.com/ColdMatter/EDMSui…
jstammers Jul 25, 2017
7df63b0
RemoteMessanger for Mat; RemoteMessaging for Axel-hub; ErrorManager
teodor-krastev Jul 27, 2017
8d4427e
Using Gigatronics
jstammers Jul 28, 2017
bf1f43f
Merge branch 'navigator_v0.x' of https://github.com/ColdMatter/EDMSui…
jstammers Jul 28, 2017
7ed030c
some bugs in the last additions
teodor-krastev Jul 28, 2017
5fa488a
Added an ExperimentData class to represent data logged in MOTMaster. …
jstammers Jul 31, 2017
1a0c26d
minor improv
teodor-krastev Jul 31, 2017
4543be3
Improved ExperimentData, modified how Warning and Errors are handled …
jstammers Aug 9, 2017
067f9ab
Fixed merge conflicts
jstammers Aug 9, 2017
a956080
UtilsLib - Logger and TimedMessageBox
teodor-krastev Aug 9, 2017
a0e5261
Fixed data logging so it is consistent in both Local and Remote
jstammers Aug 10, 2017
10fe636
fixed ErrorManager - now ErrorMgr
teodor-krastev Aug 10, 2017
dbef37a
Fixed merge conflicts
jstammers Aug 10, 2017
c636bb6
some conflicts and some fixes
teodor-krastev Aug 10, 2017
9794369
Fixed data logging so that it is the same for both Remote and Local
jstammers Aug 14, 2017
4abef0b
Fixed merge conflicts
jstammers Aug 14, 2017
fa889f4
Fixed merge conflicts and bugs in Analog input acquisition
jstammers Aug 14, 2017
25e8878
Added option to send data remotely to AxelHub
jstammers Aug 16, 2017
38be4de
Minor bug fixes to parameter scan
jstammers Aug 31, 2017
0751540
Added option to loop through sequence without having to reconfigure c…
jstammers Sep 1, 2017
d28dd2a
Repeat run configures cards to continuously generate their samples an…
jstammers Sep 1, 2017
8a11789
Fixed scan data issues to sync it with latest version of Axel_Suite
jstammers Sep 5, 2017
c4b7785
Fixed problems with repeat run thread synchronisation
jstammers Sep 7, 2017
928404c
Minor fixes. There is a bug with stopping the sequence during repeat …
jstammers Sep 8, 2017
af3081c
Added new logging code
jstammers Sep 11, 2017
ae6f2c5
started new accel acquisition
jstammers Sep 11, 2017
6fab479
Revert "Added new logging code"
jstammers Sep 11, 2017
7b39189
Added Accelerometer Conversion to ExperimentData
jstammers Sep 21, 2017
3752985
log, GUI and some others
teodor-krastev Sep 25, 2017
894a2be
changes after merge and pulses params
teodor-krastev Sep 25, 2017
aadd6c5
working changes 26/09
teodor-krastev Sep 26, 2017
19a9aa6
Added MSquared Remote Control Classes to DAQ and moved UtilsLib to Sh…
jstammers Sep 26, 2017
21611e3
Fixed merge conflicts
jstammers Sep 26, 2017
ca38641
Added MSquared parameters
jstammers Sep 27, 2017
fd8f9bc
Fixed serialisation of Parameter dictionary to list
jstammers Sep 27, 2017
99e253d
Moved control of Msquared laser to controller from ExperimentData
jstammers Sep 28, 2017
174846d
Fixed some IceBloc bugs
jstammers Sep 29, 2017
274bbc6
Fixes to ICEBlocDCS
jstammers Oct 2, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .dropbox
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"tag": "shared", "ns": 1421135978}
48 changes: 40 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
bin
obj
*.suo
*.csproj.user
*.licx
*.lnk
iamjack.sh
iamjoe.sh

bin


obj


*.suo

*.csproj

*.user


*.licx


*.lnk


*.csv


iamjack.sh


iamjoe.sh


MotMaster2/Data/*

*.sm2

MotMaster2/Scripts/*.sm2

packages/*

*.tmp_proj

.vscode/*
357 changes: 184 additions & 173 deletions BuffergasHardwareControl/BuffergasHardwareControl.csproj

Large diffs are not rendered by default.

656 changes: 328 additions & 328 deletions BuffergasHardwareControl/ControlWindow.Designer.cs

Large diffs are not rendered by default.

Loading