Skip to content

Commit 219690c

Browse files
Standardizing the PR File
1 parent 45a17b0 commit 219690c

File tree

3 files changed

+1
-427
lines changed

3 files changed

+1
-427
lines changed

src/navigate/model/devices/APIs/asi/asi_tiger_controller.py

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,49 +1011,4 @@ def logic_card_off(self, axis : str):
10111011
self.send_command(f'6 M E = {axis}\r')
10121012
self.read_response()
10131013
self.send_command(f'6 CCA Z=0\r')
1014-
self.read_response()
1015-
1016-
def SA_waveform(self, axis:str, waveform=0, amplitude=1000, offset=500):
1017-
"""Programs the analog waveforms using SAA, SAO, and SAP
1018-
Default waveform is a sawtooth waveform with an amplitude of 1V with an offset of 0.5V
1019-
1020-
Parameters
1021-
----------
1022-
axis: str
1023-
Laser axis
1024-
waveform:
1025-
Type of waveform pattern according to https://asiimaging.com/docs/commands/sap
1026-
amplitude:
1027-
amplitude of the waveform
1028-
offset:
1029-
sets the center position of the waveform
1030-
"""
1031-
1032-
"Verify if this is for synchronous or asynchronous"
1033-
self.send_command(f"SAP {axis}={waveform}")
1034-
self.read_response()
1035-
self.send_command(f"SAA {axis}={amplitude}")
1036-
self.read_response()
1037-
self.send_command(f"SAO {axis}={offset}")
1038-
self.read_response()
1039-
1040-
def SAM(self, axis: str, mode: int):
1041-
"""Sets the single-axis mode according to the integer code.
1042-
1043-
0: stops waveforms if they are running
1044-
1: starts generating the waveform pattern
1045-
2: waveform only runs for one cycle, then waits for another trigger
1046-
3: starts generating the waveform pattern, restarts the other waveform on the same card
1047-
4: starts generating the waveform, free running after the trigger
1048-
1049-
Parameters
1050-
----------
1051-
axis: str
1052-
Laser axis
1053-
mode:
1054-
Integer code
1055-
"""
1056-
1057-
self.send_command(f"SAM {axis}={mode}")
1058-
self.read_response()
1059-
1014+
self.read_response()

src/navigate/model/devices/daq/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,3 @@ def enable_microscope(self, microscope_name: str) -> None:
168168
self.sample_rate = self.configuration["configuration"]["microscopes"][
169169
microscope_name
170170
]["daq"]["sample_rate"]
171-

0 commit comments

Comments
 (0)