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.

Sign up for GitHub

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

Jump to bottom

Navigator #3

Open
wants to merge 133 commits into
base: master
Choose a base branch
from
Open

Navigator #3

wants to merge 133 commits into from

Conversation

teodor-krastev
Copy link

No description provided.

jstammers added 30 commits July 13, 2016 15:37
@jstammers
Added a HSDIOPatternGenerator to mimic the DAQmx pattern generator
f31059b
@jstammers
Added HSDIOPatternBuilder which builds a digital script for an NI-HSD…
f88d867 
…IO card
@jstammers
Added hardware defintions to NavigatorHardware
945d45e
@jstammers
Added static controller for HSDIO cards
3c3432a
@jstammers
MOTmaster can now accept a collection of digital/analog patterns whic…
12a7365 
…h are used if multipleCards is set to true
@jstammers
Added RemoteRun method to MOTMaster which stores data from each run i…
7c88035 
…nto a json
@jstammers
Cleaned up Navigator code before merging with Kyle's IMAQ
ef2d180
@jstammers
Started ImageViewer and commiting before merging with kyle's branch
746e1c8
@jstammers
Added RFMOT project
3116694
@jstammers
Added Camera control and some of the RFMOT code
2d49b39
@jstammers
Added ImageController to NavigatorHardwareControl
e95a336
@jstammers
Voltage Logger now reads continuously
a46088a
@jstammers
Fixed hardware state update
158fd9f
@jstammers
Added Background Image
00b34a7
@jstammers
Made improvements to Navigator Hardware Control
850e90e
@jstammers
The ImageController can now be opened and closed without restarting t…
8955b95 
…he Hardware Controller
@jstammers
Added some cicero list manipulation to Navigator Hardware control
9659e5f
@jstammers
Commit before merge with master branch
17e0938
@jstammers
Fixing merge conflicts
6f87590
@jstammers
Switching to navigator_v0.x
76ecafc
@jstammers
Fixing merge conflicts
fcd333d
@jstammers
Merging with master
ea2268f
@jstammers
Fixing merge conflicts with master
f7b473a
@jstammers
Build configuration issues
49cf011
@jstammers
Modified HSDIOPatternGenerator
b1d8736
@jstammers
Added MOTmaster script for loading 3D mot from 2D mot
3bf9c88
@jstammers
Added basic sequences to NavigatorMaster and control for Muquans laser
56bf80c
@jstammers
Added MuquansBuilder which can be used to trigger serial messages by …
907a98f 
…counting edges on a counter channel. Renamed NavigatorMaster to MOTMaster2 and updated UI to allow scanning over parameters and manual changes
@jstammers
Commiting changes before merging upstream
73a2fc9
@jstammers
Changed MuquansController to send serial messages on a SampleClockEve…
99b577a 
…nt. This fires every time the SampleClock channel sees a rising edge
jstammers and others added 30 commits August 9, 2017 16:14
@jstammers
Fixed merge conflicts
067f9ab
@teodor-krastev
UtilsLib - Logger and TimedMessageBox
a956080
@jstammers
Fixed data logging so it is consistent in both Local and Remote
a0e5261
@teodor-krastev
fixed ErrorManager - now ErrorMgr
10fe636
@jstammers
Fixed merge conflicts
dbef37a
@teodor-krastev
some conflicts and some fixes
c636bb6
@jstammers
Fixed data logging so that it is the same for both Remote and Local
9794369
@jstammers
Fixed merge conflicts
4abef0b
@jstammers
Fixed merge conflicts and bugs in Analog input acquisition
fa889f4
@jstammers
Added option to send data remotely to AxelHub
25e8878
@jstammers
Minor bug fixes to parameter scan
38be4de
@jstammers
Added option to loop through sequence without having to reconfigure c…
0751540 
…ards
@jstammers
Repeat run configures cards to continuously generate their samples an…
d28dd2a 
…d asynchronously reads data from analog inputs. However, HSDIO and DAQmx cards become unsynchronised.
@jstammers
Fixed scan data issues to sync it with latest version of Axel_Suite
8a11789 
The scan loop waits for the controller to finish before starting the next iteration
The loop now creates an MMScan object
@jstammers
Fixed problems with repeat run thread synchronisation
c4b7785
@jstammers
Minor fixes. There is a bug with stopping the sequence during repeat …
928404c 
…mode
@jstammers
Added new logging code
af3081c
@jstammers
started new accel acquisition
ae6f2c5
@jstammers
Revert "Added new logging code"
6fab479 
This reverts commit af3081c.
@jstammers
Added Accelerometer Conversion to ExperimentData
7b39189
@teodor-krastev
log, GUI and some others
3752985
@teodor-krastev
changes after merge and pulses params
894a2be
@teodor-krastev
working changes 26/09
aadd6c5
@jstammers
Added MSquared Remote Control Classes to DAQ and moved UtilsLib to Sh…
19a9aa6 
…aredCode
@jstammers
Fixed merge conflicts
21611e3
@jstammers
Added MSquared parameters
ca38641
@jstammers
Fixed serialisation of Parameter dictionary to list
fd8f9bc
@jstammers
Moved control of Msquared laser to controller from ExperimentData
99e253d
@jstammers
Fixed some IceBloc bugs
174846d
@jstammers
Fixes to ICEBlocDCS
274bbc6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@teodor-krastev @jstammers