diff --git a/configs/config_mb_2023_2_mux_2024.py b/configs/config_mb_2023_2_mux_2024.py index 58f0eba2b9c596967357637dd33fa89f8b95e822..912c2c1d361c579d62c3812e7891d73d8462a9cc 100644 --- a/configs/config_mb_2023_2_mux_2024.py +++ b/configs/config_mb_2023_2_mux_2024.py @@ -42,7 +42,7 @@ HARDWARE_CONFIG = { 'mcp_0': '0x22', # TODO : Replace this with pos of jumper on MUX board (address doesn't mean anything for the average user... 'mcp_1': '0x23', # TODO : Replace this with pos of jumper on MUX board (address doesn't mean anything for the average user...) 'roles': {'A': 'X', 'B': 'Y', 'M' : 'XX', 'N' : 'YY'}, - 'channels': {(i+16, j): ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)}, + 'channels': {(i, j): ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)}, 'voltage_max': 12.}, 'mux_2': {'model': 'mux_2024_rev_0_0', # 'ohmpi_i2c_mux64_v1.01', diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index f047d9ce14e4dd6324006546ae90a4d3cb693226..38958e7e4a7fe6abc7468a3329d0b914ee8c3653 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -26,7 +26,6 @@ for mux_id, mux_config in HARDWARE_CONFIG['mux']['boards'].items(): MUX_CONFIG[mux_id] = mux_module.MUX_CONFIG MUX_CONFIG[mux_id].update(mux_config) MUX_CONFIG[mux_id].update({'id': mux_id}) - MUX_CONFIG[mux_id].update({'constructor': mux_module.Mux}) # mux_boards.append(mux_id) TX_CONFIG = tx_module.TX_CONFIG @@ -120,7 +119,7 @@ class OhmPiHardware: self.mux_barrier = Barrier(len(self.mux_boards) + 1) self._cabling = {} for mux_id, mux in self.mux_boards.items(): - print(f'{mux_id} CONFIG: {MUX_CONFIG["mux_id"]}') + print(f'{mux_id} CONFIG: {MUX_CONFIG}\n {HARDWARE_CONFIG["mux"]["boards"][mux_id]}') mux.barrier = self.mux_barrier for k, v in mux.cabling.items(): update_dict(self._cabling, {k: (mux_id, k[0])})