Commit ed94d720 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Adds joins in vab_pulses

Showing with 6 additions and 3 deletions
+6 -3
...@@ -43,8 +43,9 @@ if within_ohmpi: ...@@ -43,8 +43,9 @@ if within_ohmpi:
from ohmpi.ohmpi import OhmPi from ohmpi.ohmpi import OhmPi
print('Starting test of mux within OhmPi.') print('Starting test of mux within OhmPi.')
k = OhmPi() k = OhmPi()
k.switch_mux_on([1, 4, 2, 3])
time.sleep(1.)
k.reset_mux() k.reset_mux()
k._hw.switch_mux([1, 4, 2, 3], state='on')
k._hw.vab_square_wave(12,1)
k._hw.switch_mux([1, 4, 2, 3], state='off')
k._hw._plot_readings()
change_config('../configs/config_default.py', verbose=False) change_config('../configs/config_default.py', verbose=False)
\ No newline at end of file
...@@ -292,6 +292,8 @@ class OhmPiHardware: ...@@ -292,6 +292,8 @@ class OhmPiHardware:
injection = Thread(target=self._inject, kwargs={'inj_time': 0.2, 'polarity': polarity}) injection = Thread(target=self._inject, kwargs={'inj_time': 0.2, 'polarity': polarity})
gain_auto.start() gain_auto.start()
injection.start() injection.start()
gain_auto.join()
injection.join()
self._vab_pulses(vab, lengths, sampling_rate, append=append) self._vab_pulses(vab, lengths, sampling_rate, append=append)
def _vab_pulse(self, vab, length, sampling_rate=None, polarity=1, append=False): def _vab_pulse(self, vab, length, sampling_rate=None, polarity=1, append=False):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment