From a8e7eb8d3ac54fd59f57e7e291f4091a28de8cd7 Mon Sep 17 00:00:00 2001
From: Guillaume <sagitta1618@gmail.com>
Date: Wed, 9 Nov 2022 07:32:41 +0000
Subject: [PATCH] fix remaining merge <<<<
---
ohmpi.py | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/ohmpi.py b/ohmpi.py
index d9b92038..a91b9057 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -1114,7 +1114,6 @@ class OhmPi(object):
except Exception as e:
self.exec_logger.warning(f'Unable to set sequence: {e}')
status = False
-<<<<<<< HEAD
def stop(self, **kwargs):
warnings.warn('This function is deprecated. Use interrupt instead.', DeprecationWarning)
@@ -1122,15 +1121,7 @@ class OhmPi(object):
def _switch_mux(self, electrode_nr, state, role):
"""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
----------
electrode_nr : int
--
GitLab