diff --git a/configs/config_mb_2023_4_mux_2023.py b/configs/config_mb_2023_4_mux_2023.py index dbfe0b8f20ce1e846e41e0cd67170ecae8a5d776..fa30ccaadc748d016cd2307bff9678217e04259d 100644 --- a/configs/config_mb_2023_4_mux_2023.py +++ b/configs/config_mb_2023_4_mux_2023.py @@ -70,7 +70,7 @@ HARDWARE_CONFIG = { # SET THE LOGGING LEVELS, MQTT BROKERS AND MQTT OPTIONS ACCORDING TO YOUR NEEDS # Execution logging configuration EXEC_LOGGING_CONFIG = { - 'logging_level': logging.DEBUG, # TODO: set logging level back to INFO + 'logging_level': logging.INFO, # TODO: set logging level back to INFO 'log_file_logging_level': logging.DEBUG, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', diff --git a/dev/test_mb_2023_3_mux_2024.py b/dev/test_mb_2023_3_mux_2024.py index 7851dff3cfc86546e4ce88a18db79ea2e27f74bd..b155833ce6314dcf398f9cf7c41e230cfac3dbce 100644 --- a/dev/test_mb_2023_3_mux_2024.py +++ b/dev/test_mb_2023_3_mux_2024.py @@ -68,7 +68,7 @@ if within_ohmpi: d = k.run_measurement([A, B, M, N], injection_duration=1., nb_stack=2, duty_cycle=0.5) print(d) #k._hw._plot_readings() - print(f'OhmPiHardware: Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV') + #print(f'OhmPiHardware: Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV') print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') k._hw._plot_readings(save_fig=False) # plot_exec_log('ohmpi/logs/exec.log') diff --git a/dev/test_mb_2023_4_mux_2023.py b/dev/test_mb_2023_4_mux_2023.py index 057c3bba07d4d45f84e97a62dc0d20cf49f3c13a..b9698bd27b3e96c7354155c5feaa59e19574e97f 100644 --- a/dev/test_mb_2023_4_mux_2023.py +++ b/dev/test_mb_2023_4_mux_2023.py @@ -1,5 +1,6 @@ import matplotlib matplotlib.use('TkAgg') +import matplotlib.pyplot as plt from ohmpi.utils import change_config change_config('../configs/config_mb_2023_4_mux_2023.py', verbose=False) import importlib @@ -7,6 +8,7 @@ import os import time import logging from ohmpi.config import HARDWARE_CONFIG +import pandas as pd stand_alone = False part_of_hardware_system = False @@ -82,7 +84,7 @@ if within_ohmpi: print('Starting test with OhmPi.') k = OhmPi() - k.load_sequence(os.path.join(os.path.dirname(__file__), '../sequences/01_GRAD_8_s4_a4.txt')) + # k.load_sequence(os.path.join(os.path.dirname(__file__), '../sequences/test_circuit_1423.txt')) k.reset_mux() # k.test_mux(mux_id=None, activation_time=0.2) # k._hw.switch_mux([A, B, M, N], state='on') @@ -97,12 +99,20 @@ if within_ohmpi: # k._hw.switch_mux([A, B, M, N], state='off') # print(f'OhmPiHardware Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') # k._hw._plot_readings() + A, B, M, N = (16, 13, 15, 14) A, B, M, N = (1, 4, 2, 3) - d = k.run_measurement([A, B, M, N], injection_duration=2., nb_stack=2, duty_cycle=0.5) + d = k.run_measurement([A, B, M, N], injection_duration=0.5, nb_stack=2, duty_cycle=0.5) print(d) - # k._hw._plot_readings() - print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV') - print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') - k._hw._plot_readings(save_fig=False) + k._hw._plot_readings() + # print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV') + # print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV') + # k._hw._plot_readings(save_fig=False) + # k.run_sequence(nb_stack=2, injection_duration=0.2, duty_cycle=0.5) + # ddir = os.path.join(os.path.dirname(__file__), '../data/') + # print(sorted(os.listdir(ddir))) + # df = pd.read_csv(os.path.join(ddir, sorted(os.listdir(ddir))[-3])) + # fig, ax = plt.subplots() + # df['R [Ohm]'].plot(ax=ax) + # fig.show(block=True) # plot_exec_log('ohmpi/logs/exec.log') change_config('../configs/config_default.py', verbose=False) diff --git a/ohmpi/hardware_components/mb_2023_0_X.py b/ohmpi/hardware_components/mb_2023_0_X.py index dd1933602033173960eb0781119be869bf782d46..db3b5eb86f6394734955f2480b1ce8ff75393b7c 100644 --- a/ohmpi/hardware_components/mb_2023_0_X.py +++ b/ohmpi/hardware_components/mb_2023_0_X.py @@ -268,6 +268,6 @@ class Rx(RxAbstract): """ Gets the voltage VMN in Volts """ self.exec_logger.event(f'{self.model}\trx_voltage\tbegin\t{datetime.datetime.utcnow()}') - u = -AnalogIn(self._ads_voltage, ads.P0, ads.P1).voltage * self._coef_p2 * 1000. - self._bias # TODO: check if it should be negated + u = AnalogIn(self._ads_voltage, ads.P0, ads.P1).voltage * self._coef_p2 * 1000. - self._bias # TODO: check if it should be negated self.exec_logger.event(f'{self.model}\trx_voltage\tend\t{datetime.datetime.utcnow()}') return u diff --git a/sequences/test_circuit_1423.txt b/sequences/test_circuit_1423.txt index 54a617f15afa0fcdffd203dfaaeba72779a79fee..691d10eff3a18e8e8d92ec28d9a5aec2753f7d18 100644 --- a/sequences/test_circuit_1423.txt +++ b/sequences/test_circuit_1423.txt @@ -1,256 +1,13 @@ 1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 -1 4 2 3 +2 5 3 4 +3 6 4 5 +4 7 5 6 +5 8 6 7 +6 9 7 8 +7 10 8 9 +8 11 9 10 +9 12 10 11 +10 13 11 12 +11 14 12 13 +12 15 13 14 +13 16 14 15