diff --git a/dev/test_mb_2024_0_mux_2024.py b/dev/test_mb_2024_0_mux_2024.py index 6d76324ebd724188eca5b9ba5d3c9f58ec26454a..e882cb99972ac0de0b54c7cbe21ff65faefc3fc7 100644 --- a/dev/test_mb_2024_0_mux_2024.py +++ b/dev/test_mb_2024_0_mux_2024.py @@ -1,3 +1,5 @@ +import matplotlib +matplotlib.use('TkAgg') import importlib import time from ohmpi.utils import change_config @@ -14,9 +16,9 @@ pwr_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFI tx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["tx"]["model"]}') rx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["rx"]["model"]}') -stand_alone = True +stand_alone = False part_of_hardware_system = False -within_ohmpi = False +within_ohmpi = True # Stand alone mux if stand_alone: HARDWARE_CONFIG['tx'].update({'ctl': HARDWARE_CONFIG['tx'].pop('ctl', ctl_module.Ctl())}) diff --git a/ohmpi/hardware_components/mb_2024_0_2.py b/ohmpi/hardware_components/mb_2024_0_2.py index 0278228fd9d5e2c17325a63a858a03ad7e1d2efb..7d22b5791d6ce9be4a8cb7c96857344f6ba96371 100644 --- a/ohmpi/hardware_components/mb_2024_0_2.py +++ b/ohmpi/hardware_components/mb_2024_0_2.py @@ -14,16 +14,16 @@ SPECS = {'rx': {'sampling_rate': {'min': 2., 'default': 10., 'max': 100.}, 'data_rate': {'default': 860.}, 'bias': {'min': -5000., 'default': 0., 'max': 5000.}, 'coef_p2': {'default': 1.00}, - 'mcp_address': {'default': 0x21}, + 'mcp_address': {'default': 0x27}, 'ads_address': {'default': 0x49}, 'voltage_min': {'default': 10.0}, - 'vmn_hardware_offset' : {'default': 2500.}, + 'vmn_hardware_offset': {'default': 2500.}, }, 'tx': {'adc_voltage_min': {'default': 10.}, # Minimum voltage value used in vmin strategy 'adc_voltage_max': {'default': 4500.}, # Maximum voltage on ads1115 used to measure current 'voltage_max': {'min': 0., 'default': 12., 'max': 12.}, # Maximum input voltage 'data_rate': {'default': 860.}, - 'mcp_address': {'default': 0x27}, + 'mcp_address': {'default': 0x21}, 'ads_address': {'default': 0x48}, 'compatible_power_sources': {'default': 'pwr_batt', 'others' : ['dps5005']}, 'r_shunt': {'min': 0., 'default': 2.},