diff --git a/configs/config_mb_2023_4_mux_2024.py b/configs/config_mb_2023_4_mux_2024.py index 6eb0fb8fe7375e2aedcf7d897054b3b46cbee36f..66dbfda33dd5ce862528d707059f91bad3ae8432 100644 --- a/configs/config_mb_2023_4_mux_2024.py +++ b/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., diff --git a/dev/test_2_mux_2024.py b/dev/test_2_mux_2024.py index 48e3f2890dc1966a6bdec626a2ec6487e17d7a36..714721062be3a6862ed9d8e05d99dcbbbc03650d 100644 --- a/dev/test_2_mux_2024.py +++ b/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() diff --git a/dev/test_4_mux_2024.py b/dev/test_4_mux_2024.py index 75e6e049bc31d52115ee162cd2260cfc8497eb1e..394898715cd370db29b169e1490e2bdcb73a3cab 100644 --- a/dev/test_4_mux_2024.py +++ b/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 diff --git a/doc/source/Ohmpi_V2024/mux_2024/mux_2024_address_jumpers.png b/doc/source/Ohmpi_V2024/mux_2024/mux_2024_address_jumpers.png new file mode 100644 index 0000000000000000000000000000000000000000..820f5db06849b570772c4409dc138a0bc50c63dd Binary files /dev/null and b/doc/source/Ohmpi_V2024/mux_2024/mux_2024_address_jumpers.png differ