Commit e0de5993 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Removes the default_mux_cabling in hardware system

No related merge requests found
Showing with 1 addition and 7 deletions
+1 -7
...@@ -27,12 +27,6 @@ current_max = np.min([TX_CONFIG['current_max'], np.min([MUX_CONFIG[i].pop('curre ...@@ -27,12 +27,6 @@ current_max = np.min([TX_CONFIG['current_max'], np.min([MUX_CONFIG[i].pop('curre
voltage_max = np.min([TX_CONFIG['voltage_max'], np.min([MUX_CONFIG[i].pop('voltage_max', np.inf) for i in mux_boards])]) voltage_max = np.min([TX_CONFIG['voltage_max'], np.min([MUX_CONFIG[i].pop('voltage_max', np.inf) for i in mux_boards])])
voltage_min = RX_CONFIG['voltage_min'] voltage_min = RX_CONFIG['voltage_min']
default_mux_cabling = {}
for mux in mux_boards:
update_dict(default_mux_cabling, MUX_CONFIG[mux].pop('default_mux_cabling', {}))
print(f'default_mux_cabling: {default_mux_cabling}')
def elapsed_seconds(start_time): def elapsed_seconds(start_time):
lap = datetime.datetime.utcnow() - start_time lap = datetime.datetime.utcnow() - start_time
return lap.total_seconds() return lap.total_seconds()
...@@ -61,7 +55,7 @@ class OhmPiHardware: ...@@ -61,7 +55,7 @@ class OhmPiHardware:
data_logger=self.data_logger, data_logger=self.data_logger,
soh_logger=self.soh_logger, soh_logger=self.soh_logger,
controller=self.controller)) controller=self.controller))
self._cabling = kwargs.pop('cabling', default_mux_cabling) self._cabling = kwargs.pop('cabling', {})
self.mux_boards = kwargs.pop('mux', {'mux_1': mux_module.Mux(id='mux_1', self.mux_boards = kwargs.pop('mux', {'mux_1': mux_module.Mux(id='mux_1',
exec_logger=self.exec_logger, exec_logger=self.exec_logger,
data_logger=self.data_logger, data_logger=self.data_logger,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment