diff --git a/.dev/test_dps.py b/.dev/test_dps.py index 875dcb684e913723222e566e466062a398be32ca..2713088715bbef0870e474625e07c831e902b18c 100644 --- a/.dev/test_dps.py +++ b/.dev/test_dps.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__4_mux_2024_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__4_mux_2024_dph5005.py', verbose=False) import importlib import time import logging diff --git a/.dev/test_mb_2024_1_mux_2024.py b/.dev/test_mb_2024_1_mux_2024.py index 95b21f4fae0bee33863fca7d4b538d39665ad006..a1d6cfa0bee7634f2fc85c46036ea55ecefd1545 100644 --- a/.dev/test_mb_2024_1_mux_2024.py +++ b/.dev/test_mb_2024_1_mux_2024.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__1_mux_2024_4roles_dph5005.py', verbose=False) import importlib import time import logging diff --git a/.dev/test_mb_2024_3_mux_2024.py b/.dev/test_mb_2024_3_mux_2024.py index f34b996418e27c8c7bc0993c103ca7ee02cb76d6..700d7d9ccb86ea2408a1f6eb0043b3735def6494 100644 --- a/.dev/test_mb_2024_3_mux_2024.py +++ b/.dev/test_mb_2024_3_mux_2024.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__3_mux_2024_4roles_dph5005.py', verbose=False) import importlib import time import logging diff --git a/.dev/test_mb_2024_4_mux_2023_dps5005.py b/.dev/test_mb_2024_4_mux_2023_dph5005.py similarity index 98% rename from .dev/test_mb_2024_4_mux_2023_dps5005.py rename to .dev/test_mb_2024_4_mux_2023_dph5005.py index b631396284e871bd462575656a6d2874f936b368..7d664c89f10dfa242f0c1db082c6cff0fc7bc6ce 100644 --- a/.dev/test_mb_2024_4_mux_2023_dps5005.py +++ b/.dev/test_mb_2024_4_mux_2023_dph5005.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__4_mux_2023_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__4_mux_2023_dph5005.py', verbose=False) import importlib import time import logging diff --git a/.dev/test_mb_2024_4_mux_2024.py b/.dev/test_mb_2024_4_mux_2024.py index 39fd7d7606963deb49f9b1aa8199c8698dfca295..58ecee66e765f6aeddb682b3b3cd816d87622512 100644 --- a/.dev/test_mb_2024_4_mux_2024.py +++ b/.dev/test_mb_2024_4_mux_2024.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__4_mux_2024_4roles_dph5005.py', verbose=False) import importlib import time import logging diff --git a/.dev/test_mb_2024_4_mux_2024_4_mux_2023.py b/.dev/test_mb_2024_4_mux_2024_4_mux_2023.py index 1c4d03bcd29ab175a5a889bb5a7b6a44d93bca90..0b67e197f1f89d11c52d02edb633fa516f08d85b 100644 --- a/.dev/test_mb_2024_4_mux_2024_4_mux_2023.py +++ b/.dev/test_mb_2024_4_mux_2024_4_mux_2023.py @@ -1,7 +1,7 @@ import matplotlib matplotlib.use('TkAgg') from ohmpi.utils import change_config -change_config('../configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dps5005.py', verbose=False) +change_config('../configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dph5005.py', verbose=False) import importlib import time import logging diff --git a/configs/config_mb_2023.py b/configs/config_mb_2023.py index 5443691112abbb38a8866765a8c2bec07830d839..2ef5840f340365957675fa25ba53edc582dd971f 100644 --- a/configs/config_mb_2023.py +++ b/configs/config_mb_2023.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__1_mux_2024_4roles.py b/configs/config_mb_2023__1_mux_2024_4roles.py index 319207eeb191ce493eb9cd9d5da24a4d975e71b2..b1c64d6d170e0fcb348bcf752c6cae5f9f6216ba 100644 --- a/configs/config_mb_2023__1_mux_2024_4roles.py +++ b/configs/config_mb_2023__1_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__2_mux_2024_2roles.py b/configs/config_mb_2023__2_mux_2024_2roles.py index 61be8588a8063da420f99a2dc1e36e9d2a3a145f..6f14a8215b00aff7c3d5a783d08009cb623f6f8f 100644 --- a/configs/config_mb_2023__2_mux_2024_2roles.py +++ b/configs/config_mb_2023__2_mux_2024_2roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__2_mux_2024_4roles.py b/configs/config_mb_2023__2_mux_2024_4roles.py index 6449f86771aff945594c6b6da9ea58f97f4aa4c2..36cbbc41e1129c452b84e22a44b1578efec644e4 100644 --- a/configs/config_mb_2023__2_mux_2024_4roles.py +++ b/configs/config_mb_2023__2_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__3_mux_2024_4roles.py b/configs/config_mb_2023__3_mux_2024_4roles.py index 5039251734567eab686fd156e85deb9e3a3ab889..0edb73c153794cf03c3534ffca4736222d0ecda0 100644 --- a/configs/config_mb_2023__3_mux_2024_4roles.py +++ b/configs/config_mb_2023__3_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__4_mux_2023.py b/configs/config_mb_2023__4_mux_2023.py index 16b57777be236de6c15721bf17f2ea9f78a3595a..66e7ec87b7b246b6f3646c11e27c187b825fc60d 100644 --- a/configs/config_mb_2023__4_mux_2023.py +++ b/configs/config_mb_2023__4_mux_2023.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__4_mux_2024_2roles.py b/configs/config_mb_2023__4_mux_2024_2roles.py index 7b13a70d838c631d1c144e5160febe056eec97bc..4735f2c7e256860d0ccb82133d4f5425516aba7b 100644 --- a/configs/config_mb_2023__4_mux_2024_2roles.py +++ b/configs/config_mb_2023__4_mux_2024_2roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2023__4_mux_2024_4roles.py b/configs/config_mb_2023__4_mux_2024_4roles.py index 0b3da7543988c06fb568f8061a3c8796558971f3..9b979829d86fee070d1b57bc79fae639f2a8d4eb 100644 --- a/configs/config_mb_2023__4_mux_2024_4roles.py +++ b/configs/config_mb_2023__4_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2.py b/configs/config_mb_2024_0_2.py index 23c77aa7011712a1985e1de6f231b9001e37de74..de3c949ece8eeab1ea9673d9518ffec666816bf7 100644 --- a/configs/config_mb_2024_0_2.py +++ b/configs/config_mb_2024_0_2.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__1_mux_2024_4roles.py b/configs/config_mb_2024_0_2__1_mux_2024_4roles.py index d337f4a61f7b9f7268602b1d78048557ccad0baa..4d0bf01738d56560e87ee36ec7983b485639a4c2 100644 --- a/configs/config_mb_2024_0_2__1_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__1_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__1_mux_2024_4roles_dph5005.py similarity index 96% rename from configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py rename to configs/config_mb_2024_0_2__1_mux_2024_4roles_dph5005.py index 2c3e5b129f0c1b14dc720c6dff3dfb1e3b1ad539..c3fb537eba8e6a73a7f94ecedb9e548b73c54cf7 100644 --- a/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__1_mux_2024_4roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__2_mux_2024_2roles.py b/configs/config_mb_2024_0_2__2_mux_2024_2roles.py index 8741734e3fec72f7d2aed27a567df686205006e9..a08d907948e39d187007cfb07fe6da7d61156aa2 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_2roles.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_2roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_2roles_dph5005.py similarity index 96% rename from configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py rename to configs/config_mb_2024_0_2__2_mux_2024_2roles_dph5005.py index 66f0856b9c56fdf826a85c3bfbb949961ec8b6cf..611b62807df840724cb3dbd19d15d4863c259845 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_2roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__2_mux_2024_4roles.py b/configs/config_mb_2024_0_2__2_mux_2024_4roles.py index 89317c1dad98489c1b01fd5c28ba4b6e70af1527..9b50b845e52b1824a4f4317a1ca6890b837c8feb 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_4roles_dph5005.py similarity index 96% rename from configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py rename to configs/config_mb_2024_0_2__2_mux_2024_4roles_dph5005.py index 5093dc7e841d7d532acf31216e135af0cae15bbd..ab63fb42f09224483e01c650be6ee226e9bb02f2 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_4roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__2_mux_2024_i2cext_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_i2cext_dph5005.py similarity index 100% rename from configs/config_mb_2024_0_2__2_mux_2024_i2cext_dps5005.py rename to configs/config_mb_2024_0_2__2_mux_2024_i2cext_dph5005.py diff --git a/configs/config_mb_2024_0_2__3_mux_2024_4roles.py b/configs/config_mb_2024_0_2__3_mux_2024_4roles.py index b308ca84af7763855ec38c2e5fe8d001be501c9c..7e0f9467ebb9f7a52c73fbb8f9ecde308267aad2 100644 --- a/configs/config_mb_2024_0_2__3_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__3_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__3_mux_2024_4roles_dph5005.py similarity index 97% rename from configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py rename to configs/config_mb_2024_0_2__3_mux_2024_4roles_dph5005.py index b4a4bef95884be324cda063068cc0703d57dcc90..04a57854295e728cbf2e98464bc8ac21e40ed448 100644 --- a/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__3_mux_2024_4roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__4_mux_2023.py b/configs/config_mb_2024_0_2__4_mux_2023.py index a85c8d37b68705fd33d5d7b93ae7f25d7fc18d97..6231883053d5a65898d32fc4e54ceadcfd2eb004 100644 --- a/configs/config_mb_2024_0_2__4_mux_2023.py +++ b/configs/config_mb_2024_0_2__4_mux_2023.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dph5005.py similarity index 100% rename from configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dps5005.py rename to configs/config_mb_2024_0_2__4_mux_2023__2_mux_2024_2roles_dph5005.py diff --git a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2023_dph5005.py similarity index 96% rename from configs/config_mb_2024_0_2__4_mux_2023_dps5005.py rename to configs/config_mb_2024_0_2__4_mux_2023_dph5005.py index 2ec6fef7e208453f9c8d28a95d7b486ff247ddca..1d2fd7d9f5ec64b778d61b8f6fba7101808f85be 100644 --- a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2023_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] @@ -64,7 +64,7 @@ HARDWARE_CONFIG = { 'electrodes': range(1, 65), } }, - 'default': {'interface_name': 'i2c', + 'default': {'interface_name': 'i2c_ext', 'voltage_max': 50., 'current_max': 3.} } diff --git a/configs/config_mb_2024_0_2__4_mux_2024_2roles.py b/configs/config_mb_2024_0_2__4_mux_2024_2roles.py index b4db08099664b279e16060b8a9daf27765e21b01..84c3b009ca979e7b7d281188c5cb2473c518c07b 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_2roles.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_2roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2024_2roles_dph5005.py similarity index 97% rename from configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py rename to configs/config_mb_2024_0_2__4_mux_2024_2roles_dph5005.py index 0d0d69ce5ae8fd53c5ee9d0fc2586e842a34d1cc..72711b9f26aa495f6ccad6ea9857a88827ae9f96 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_2roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__4_mux_2024_4roles.py b/configs/config_mb_2024_0_2__4_mux_2024_4roles.py index d3c1bb27232f4fb4842442efc86fd2b2e28df34c..4710f01e68cecba8b7f6129d59d2486e4ff8f130 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_4roles.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. diff --git a/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2024_4roles_dph5005.py similarity index 97% rename from configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py rename to configs/config_mb_2024_0_2__4_mux_2024_4roles_dph5005.py index 0f17446e60eaea2677088991f0b8c7a25024519a..34eac8fb510023e908b371879211e1e6976710b6 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_4roles_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/configs/config_mb_2024_0_2__8_mux_2023_dps5005.py b/configs/config_mb_2024_0_2__8_mux_2023_dph5005.py similarity index 100% rename from configs/config_mb_2024_0_2__8_mux_2023_dps5005.py rename to configs/config_mb_2024_0_2__8_mux_2023_dph5005.py diff --git a/configs/config_mb_2024_0_2_dps5005.py b/configs/config_mb_2024_0_2_dph5005.py similarity index 96% rename from configs/config_mb_2024_0_2_dps5005.py rename to configs/config_mb_2024_0_2_dph5005.py index 5641b8ebfd6ffb6013a78d665c750aeb81fdf99f..bbf1437c065fdec79292993a6eacf9a5030bc3fb 100644 --- a/configs/config_mb_2024_0_2_dps5005.py +++ b/configs/config_mb_2024_0_2_dph5005.py @@ -13,7 +13,7 @@ logging_suffix = '' # OhmPi configuration OHMPI_CONFIG = { 'id': ohmpi_id, # Unique identifier of the OhmPi board (string) - 'settings': 'settings/default.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE + 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE } r_shunt = 2. @@ -25,7 +25,7 @@ r_shunt = 2. HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'}, + 'pwr': {'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4.80/(50*r_shunt), # Maximum voltage read by the current ADC on the TX board [A] diff --git a/ohmpi/hardware_components/pwr_dps5005.py b/ohmpi/hardware_components/pwr_dph5005.py similarity index 100% rename from ohmpi/hardware_components/pwr_dps5005.py rename to ohmpi/hardware_components/pwr_dph5005.py diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py index 193fd288c58c9f77ec318f8f7b80323885dfb50f..e9e12ceecd8033a04df892172c6bef76d8171ece 100644 --- a/ohmpi/ohmpi.py +++ b/ohmpi/ohmpi.py @@ -663,7 +663,8 @@ class OhmPi(object): vab = self._hw.compute_vab(vab=vab_requested, strategy=strategy, vmn_max=vmn_max, vab_max=vab_max, iab_max=iab_max, vmn_min=vmn_min) # time.sleep(0.5) # to wait for pwr discharge - self._hw.vab_square_wave(vab, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle) + self._hw.vab_square_wave(vab, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, + duty_cycle=duty_cycle, **kwargs.get('vab_square_wave', {})) self.switch_mux_off(quad, cmd_id) if 'delay' in kwargs.keys(): diff --git a/ohmpi/utils.py b/ohmpi/utils.py index 97c9b3fd07e8bd3e53f717bf2e76189ee7d543a0..6b0d061b16c8aa69c7ccbf8b9707ff97edb7632a 100644 --- a/ohmpi/utils.py +++ b/ohmpi/utils.py @@ -176,20 +176,20 @@ def generate_preset_configs(configs_to_generate=None): 'config_mb_2023__1_mux_2024_4roles.py', 'config_mb_2023__2_mux_2024_4roles.py', 'config_mb_2023__3_mux_2024_4roles.py', 'config_mb_2023__4_mux_2024_4roles.py', 'config_mb_2023__2_mux_2024_2roles.py', 'config_mb_2023__4_mux_2024_2roles.py', - 'config_mb_2024_0_2.py', 'config_mb_2024_0_2_dps5005.py', - 'config_mb_2024_0_2__4_mux_2023.py', 'config_mb_2024_0_2__4_mux_2023_dps5005.py', + 'config_mb_2024_0_2.py', 'config_mb_2024_0_2_dph5005.py', + 'config_mb_2024_0_2__4_mux_2023.py', 'config_mb_2024_0_2__4_mux_2023_dph5005.py', 'config_mb_2024_0_2__1_mux_2024_4roles.py', - 'config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py', + 'config_mb_2024_0_2__1_mux_2024_4roles_dph5005.py', 'config_mb_2024_0_2__2_mux_2024_4roles.py', - 'config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py', + 'config_mb_2024_0_2__2_mux_2024_4roles_dph5005.py', 'config_mb_2024_0_2__2_mux_2024_2roles.py', - 'config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py', + 'config_mb_2024_0_2__2_mux_2024_2roles_dph5005.py', 'config_mb_2024_0_2__3_mux_2024_4roles.py', - 'config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py', + 'config_mb_2024_0_2__3_mux_2024_4roles_dph5005.py', 'config_mb_2024_0_2__4_mux_2024_4roles.py', - 'config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py', + 'config_mb_2024_0_2__4_mux_2024_4roles_dph5005.py', 'config_mb_2024_0_2__4_mux_2024_2roles.py', - 'config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py' + 'config_mb_2024_0_2__4_mux_2024_2roles_dph5005.py' ] header = """import logging @@ -223,7 +223,7 @@ HARDWARE_CONFIG = { r_shunt = 2. options = {'pwr': {'battery': """{'model': 'pwr_batt', 'voltage': 12., 'interface_name': 'none'},""", - 'dps5005': """{'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'},""" + 'dph5005': """{'model': 'pwr_dph5005', 'voltage': 3., 'interface_name': 'modbus'},""" }, 'mb': {'mb_2024_0_2': {'tx': """{'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] diff --git a/setup_config.py b/setup_config.py index ae7c5f9389cab2af08ba560dfcbf86b9ce589e5a..4690f6b0bab4a74e07125b4d75d619d18ac8618b 100644 --- a/setup_config.py +++ b/setup_config.py @@ -45,7 +45,7 @@ while True: if pwr in ['battery', 'dps5005']: break else: - pwr = input('Tx power: [battery/dps5005]:') + pwr = input('Tx power: [battery/dph5005]:') config = ('config_mb_' + mb[1:] + '_' + nb_mux + '_mux_' + mux[1:]) if roles is not None: