Updates a test in dev for 4 and 2 muxes 2024

configs/config_mb_2023_4_mux_2024.py

@@ -42,7 +42,7 @@ HARDWARE_CONFIG = {
                           'mcp_0': '0x22',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'mcp_1': '0x23',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
-                          'cabling': {(i, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},  # TODO: avoid redundency of mux_id
+                          'cabling': {(i+8, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},  # TODO: avoid redundency of mux_id
                           'voltage_max': 12.},
                      'mux_05':
                          {'model': 'mux_2024_rev_0_0',  # 'ohmpi_i2c_mux64_v1.01',
@@ -51,7 +51,7 @@ HARDWARE_CONFIG = {
                           'mcp_0': '0x26',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'mcp_1': '0x27',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
-                          'cabling': {(i+8, j): ('mux_05', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+                          'cabling': {(i+16, j): ('mux_05', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
                           'voltage_max': 12.},
                      'mux_04':
                          {'model': 'mux_2024_rev_0_0',  # 'ohmpi_i2c_mux64_v1.01',
@@ -60,7 +60,7 @@ HARDWARE_CONFIG = {
                           'mcp_0': '0x24',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'mcp_1': '0x25',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
-                          'cabling': {(i+16, j): ('mux_04', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+                          'cabling': {(i+24, j): ('mux_04', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
                           'voltage_max': 12.},
                      'mux_03':
                          {'model': 'mux_2024_rev_0_0',  # 'ohmpi_i2c_mux64_v1.01',
@@ -69,7 +69,7 @@ HARDWARE_CONFIG = {
                           'mcp_0': '0x26',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'mcp_1': '0x27',  # NOTE: Check pos of jumper on MUX board (refer to doc)
                           'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
-                          'cabling': {(i+24, j): ('mux_03', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+                          'cabling': {(i+32, j): ('mux_03', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
                           'voltage_max': 12.}
                      },
              'default': {'voltage_max': 100.,

dev/test_2_mux_2024.py

@@ -8,8 +8,8 @@ from ohmpi.hardware_components import raspberry_pi_i2c as ctl_module
 # from ohmpi.config import HARDWARE_CONFIG
 
 stand_alone_mux = False
-part_of_hardware_system = False
-within_ohmpi = True
+part_of_hardware_system = True
+within_ohmpi = False
 # Stand alone mux
 if stand_alone_mux:
     MUX_CONFIG['ctl'] = ctl_module.Ctl()

dev/test_4_mux_2024.py

@@ -7,8 +7,8 @@ from ohmpi.hardware_components.mux_2024_rev_0_0 import Mux, MUX_CONFIG
 from ohmpi.hardware_components import raspberry_pi_i2c as ctl_module
 from ohmpi.config import HARDWARE_CONFIG
 
-stand_alone_mux = True
-part_of_hardware_system = False
+stand_alone_mux = False
+part_of_hardware_system = True
 within_ohmpi = False