From 8f5047e682dce59c5a22e5440da74e8f89451de2 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 27 Apr 2023 12:29:54 +0200
Subject: [PATCH] Works on issue #101
---
hardware_components/mux_2024_rev_0_0.py | 1 +
hardware_system.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index cc53429b..1a493ba7 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -7,6 +7,7 @@ from adafruit_mcp230xx.mcp23017 import MCP23017 # noqa
from digitalio import Direction # noqa
MUX_CONFIG = HARDWARE_CONFIG['mux']
+MUX_CONFIG['default_mux_cabling': {(i, j) : ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)}] # 4 roles cabling electrodes from 1 to 8
inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(2, 'X'): {'MCP': 0, 'MCP_GPIO': 1},
diff --git a/hardware_system.py b/hardware_system.py
index 4f254b5f..81b9a0ac 100644
--- a/hardware_system.py
+++ b/hardware_system.py
@@ -19,7 +19,7 @@ current_max = np.min([TX_CONFIG['current_max'], MUX_CONFIG['current_max']])
voltage_max = np.min([TX_CONFIG['voltage_max'], MUX_CONFIG['voltage_max']])
voltage_min = RX_CONFIG['voltage_min']
-default_mux_cabling = {(i, j) : ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)}
+default_mux_cabling = MUX_CONFIG.pop('default_mux_cabling', None)
def elapsed_seconds(start_time):
lap = datetime.datetime.utcnow() - start_time
--
GitLab