Commit ff245bc6 authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

tries to fix vmax issue

Showing with 4 additions and 5 deletions
+4 -5
...@@ -607,8 +607,8 @@ class OhmPiHardware: ...@@ -607,8 +607,8 @@ class OhmPiHardware:
if self.pwr_state == 'off': if self.pwr_state == 'off':
self.pwr_state = 'on' self.pwr_state = 'on'
switch_tx_pwr_off = True switch_tx_pwr_off = True
# if self.tx.pwr.pwr_state == 'off': if self.tx.pwr.pwr_state == 'off':
# self.tx.pwr.pwr_state = 'on' self.tx.pwr.pwr_state = 'on'
# switch_pwr_off = True # switch_pwr_off = True
self._gain_auto(vab=vab) self._gain_auto(vab=vab)
...@@ -624,8 +624,7 @@ class OhmPiHardware: ...@@ -624,8 +624,7 @@ class OhmPiHardware:
polarities = None polarities = None
self._vab_pulses(vab, durations, sampling_rate, polarities=polarities, append=append) self._vab_pulses(vab, durations, sampling_rate, polarities=polarities, append=append)
self.exec_logger.event(f'OhmPiHardware\tvab_square_wave\tend\t{datetime.datetime.utcnow()}') self.exec_logger.event(f'OhmPiHardware\tvab_square_wave\tend\t{datetime.datetime.utcnow()}')
if switch_pwr_off: self.tx.pwr.pwr_state = 'off'
self.tx.pwr.pwr_state = 'off'
if switch_tx_pwr_off: if switch_tx_pwr_off:
self.pwr_state = 'off' self.pwr_state = 'off'
...@@ -662,7 +661,7 @@ class OhmPiHardware: ...@@ -662,7 +661,7 @@ class OhmPiHardware:
# switches tx pwr on if needed (relays switching dps on and off) # switches tx pwr on if needed (relays switching dps on and off)
if self.pwr_state == 'off': if self.pwr_state == 'off':
self.pwr_state = 'on' self.pwr_state = 'on'
switch_pwr_off = True switch_tx_pwr_off = True
n_pulses = len(durations) n_pulses = len(durations)
self.exec_logger.debug(f'n_pulses: {n_pulses}') self.exec_logger.debug(f'n_pulses: {n_pulses}')
if self.tx.pwr.voltage_adjustable: if self.tx.pwr.voltage_adjustable:
......
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