Skip to content

Pulse Streamer #152

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

Open
egonspin wants to merge 77 commits into
base: dev
Choose a base branch
from
Open

Pulse Streamer #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
13d6448
Initial release of PulseStreamer Driver Module
egonspin Apr 10, 2019
3d1d43f
Initial release of PulseStreamer Driver Module
egonspin Apr 10, 2019
4c67130
imported CWAVE driver
egonspin Jun 7, 2019
81fc796
Merge branch 'pulse_streamer' of https://github.com/mwalsh161/Command…
egonspin Jun 7, 2019
fb3b47d
skeleton code for CWave source, testing mixin
emmakbat Jun 13, 2019
4e1e5f2
added script for testing cwave driver
emmakbat Jun 17, 2019
5d11ecf
minor updates to cwave
emmakbat Jun 18, 2019
70666e8
bug fixes in progress
egonspin Jun 18, 2019
5e8dcfd
more fixes to cwave
egonspin Jun 18, 2019
efc5528
more cwave fixes
emmakbat Jun 18, 2019
8398fc8
fixes
egonspin Jun 18, 2019
f3304e1
Merge branch 'pulse_streamer' of https://github.com/mwalsh161/Command…
egonspin Jun 18, 2019
b079632
fixed abort
emmakbat Jun 18, 2019
e4155ce
testing
egonspin Jun 18, 2019
a01f87b
Merge branch 'pulse_streamer' of https://github.com/mwalsh161/Command…
egonspin Jun 18, 2019
e24482d
first test of cwave driver complete
egonspin Jun 19, 2019
f3e75b0
wavemeter and cwave tests
emmakbat Jun 20, 2019
bcc7a59
debugging status function
emmakbat Jun 20, 2019
af214c5
changed error check inversion logic
emmakbat Jun 20, 2019
4f4ac5a
added cwave singleton, starting wavemeter integration
emmakbat Jun 24, 2019
5010516
cwave driver
egonspin Jun 24, 2019
7bead59
fixed merge conflict over uncommitted debugging lines
egonspin Jun 24, 2019
8e3ea39
made cwave source compatible with TunableLaser
emmakbat Jun 24, 2019
4267c11
debugging
egonspin Jun 24, 2019
41b9396
Merge branch 'pulse_streamer' of https://github.com/mwalsh161/Command…
egonspin Jun 24, 2019
598e058
changed cwave range permissions
emmakbat Jun 24, 2019
584636a
debuggin cwave source
emmakbat Jun 25, 2019
5a4feb8
more debugging cwave source
emmakbat Jun 25, 2019
836544f
more debugging cwave source
emmakbat Jun 25, 2019
7363cc1
debugging
egonspin Jun 25, 2019
2cdb243
debuggin cwave source
egonspin Jun 25, 2019
a5cbb3d
debugging cwave
emmakbat Jun 25, 2019
a04598d
cwave source has basic functionality
emmakbat Jun 25, 2019
9920794
TunePercent functions
emmakbat Jun 28, 2019
4f3faa2
On/Off function added to Cwave source
egonspin Sep 30, 2019
c5ba5af
debugged status functions for CWave driver
egonspin Sep 30, 2019
ee1c598
debugged tuning functions
egonspin Sep 30, 2019
a188075
Corrected error flags in set_pid_target_wavelength
egonspin Oct 7, 2019
ff06fae
added running property
egonspin Oct 8, 2019
e353120
addded opo piezo control and ccleaned up error handling
egonspin Oct 9, 2019
0a314dd
TunePercent + tune updated in source CWave.
egonspin Oct 10, 2019
37e5e9e
Updated dll directory. Fixed range pref
egonspin Oct 10, 2019
8825806
Cwave prefs update. PulseStreamer complies with pulsetimer_invisible
egonspin Oct 16, 2019
19b37a9
Tune range = 450-650nm with 4MHz res. updateStatus bugs fixed.
egonspin Nov 7, 2019
b4d6b33
Updated TuneSetpoint, TuneCoarse, TuneRefPercent.
egonspin Nov 7, 2019
753e48d
Added WLM_tune, etalon tune and set methods, updated centerThickEtalon
egonspin Nov 7, 2019
0750bf6
Added tune percent range: scan cavity to search for res manually
egonspin Nov 7, 2019
4f8a615
opo_pid control method introduced.
egonspin Nov 7, 2019
3b2e7b1
pid_update control method introduced.
egonspin Nov 7, 2019
944bdf1
etalon_pid control method introduced.
egonspin Nov 7, 2019
f04dc10
added etalon sstepper and powerStatus methods.
egonspin Nov 7, 2019
8e8f9c3
Updated centerThickEtalon to include autotune option.
egonspin Nov 7, 2019
27dfbe5
Added setWLM_gains, updated CHeckErrorStatus, getStatus_bits.
egonspin Nov 7, 2019
6b18dc8
updated load, start, stop, reset in PulseStreamerMaster.
egonspin Nov 7, 2019
862cbd9
Fixed instance method for PulseStreamerMaster.
egonspin Nov 7, 2019
d35f30e
Tune is continuously tunable,introduded reset_hystersis.
egonspin Nov 8, 2019
32e935c
MidTuneRange conditions added to tune method.
egonspin Nov 8, 2019
ffee5d2
Initialize wavemeter to read wl in vac prior to tune method.
egonspin Nov 8, 2019
2e84e2a
Corrected typos in etalon_pid.
egonspin Nov 8, 2019
2b249c9
Correctted types and speed up reset_hyst, is_cwaveready, etalonStepper.
egonspin Nov 8, 2019
5fce9ab
added manual relative tuning step for 100 pm to 1 nm steps.
egonspin Nov 10, 2019
c5f108d
Added reorder_program to match expected program for load.
egonspin Nov 18, 2019
0696c7c
getStatusBits has refTemp, corrected typos in checkErrorStatus.
egonspin Nov 18, 2019
8360640
Adjusted PID parameters for etalon_pid.
egonspin Nov 18, 2019
4c4628c
Updated AllElementStep to include conditions for SHG optimization.
egonspin Nov 18, 2019
59b5adc
Removed isCwave ready conditional statement from tune_etalon.
egonspin Nov 18, 2019
408d41e
using tune etalon with 10 ms pause in set.EtalonStep.
egonspin Nov 18, 2019
eec5847
added passes and condtional statement for resetting hysteresis.
egonspin Nov 18, 2019
c51e23b
added break and contine conditions to is_cwaveReady.
egonspin Nov 18, 2019
369e13e
updateStatus now now returns FPGA and Base temp of CWave.
egonspin Nov 18, 2019
b850c67
fixed typos.
egonspin Nov 18, 2019
6713101
fixed typos with PBline.
egonspin Nov 18, 2019
38dcbe1
Updated set.cwave_ip to updateStatus.
egonspin Nov 18, 2019
5aa7c1b
Cleaned up ta bs. Personal preferecne.
egonspin Nov 18, 2019
a1fef08
Delete ConnectableMixin_invisible.m
egonspin Mar 16, 2021
f0f7f3b
Delete cwave_testscript.m
egonspin Mar 16, 2021
c573165
Delete cwave_testscript.m
egonspin Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading