From f546add0f5b7108bb37026b01eadde64c735f16d Mon Sep 17 00:00:00 2001
From: awatlet <arnaud.watlet@umons.ac.be>
Date: Thu, 12 Oct 2023 19:19:23 +0200
Subject: [PATCH] Fixes test_mux
---
dev/test_mb_2024_1_mux_2024.py | 2 +-
ohmpi/hardware_system.py | 2 +-
ohmpi/ohmpi.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev/test_mb_2024_1_mux_2024.py b/dev/test_mb_2024_1_mux_2024.py
index 5a443688..c23186fe 100644
--- a/dev/test_mb_2024_1_mux_2024.py
+++ b/dev/test_mb_2024_1_mux_2024.py
@@ -75,7 +75,7 @@ if part_of_hardware_system:
# time.sleep(1.)
# k.switch_mux(electrodes=[1, 4, 2, 3], roles=['A', 'B', 'M', 'N'], state='off')
# k.mux_boards[mux_id].test(activation_time=.4)
- # k.test_mux_one_relay((1, 'A'))
+ # k.test_mux()
if within_ohmpi:
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index c6ac1c3d..edb8f8b1 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -519,7 +519,7 @@ class OhmPiHardware:
self.exec_logger.event(f'OhmPiHardware\tswitch_mux\tend\t{datetime.datetime.utcnow()}')
return status
- def test_mux_one_relay(self, channel=None, activation_time=1.0): #TODO: is this needed at OhmpiHardware level?
+ def test_mux(self, channel=None, activation_time=1.0): #TODO: is this needed at OhmpiHardware level?
"""Interactive method to test the multiplexer.
Parameters
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index 3212666d..36590e08 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -825,7 +825,7 @@ class OhmPi(object):
"""
self.reset_mux() # All mux boards should be reset even if we only want to test one otherwise we might create a shortcut
if mux_id is None:
- self._hw.test_mux_one_relay(activation_time=activation_time)
+ self._hw.test_mux(activation_time=activation_time)
else:
self._hw.mux_boards[mux_id].test(activation_time=activation_time)
--
GitLab