Commit a8e7eb8d authored by Guillaume Blanchy's avatar Guillaume Blanchy
Browse files

fix remaining merge <<<<

Showing with 1 addition and 10 deletions
+1 -10
...@@ -1114,7 +1114,6 @@ class OhmPi(object): ...@@ -1114,7 +1114,6 @@ class OhmPi(object):
except Exception as e: except Exception as e:
self.exec_logger.warning(f'Unable to set sequence: {e}') self.exec_logger.warning(f'Unable to set sequence: {e}')
status = False status = False
<<<<<<< HEAD
def stop(self, **kwargs): def stop(self, **kwargs):
warnings.warn('This function is deprecated. Use interrupt instead.', DeprecationWarning) warnings.warn('This function is deprecated. Use interrupt instead.', DeprecationWarning)
...@@ -1122,15 +1121,7 @@ class OhmPi(object): ...@@ -1122,15 +1121,7 @@ class OhmPi(object):
def _switch_mux(self, electrode_nr, state, role): def _switch_mux(self, electrode_nr, state, role):
"""Selects the right channel for the multiplexer cascade for a given electrode. """Selects the right channel for the multiplexer cascade for a given electrode.
=======
def stop(self, **kwargs):
warnings.warn('This function is deprecated. Use interrupt instead.', DeprecationWarning)
self.interrupt(**kwargs)
def _switch_mux(self, electrode_nr, state, role):
"""Selects the right channel for the multiplexer cascade for a given electrode.
Parameters Parameters
---------- ----------
electrode_nr : int electrode_nr : int
......
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