diff --git a/PCB_boards/accessories/battery_charge_control_2024.0.0/battery_management.ods b/PCB_boards/accessories/battery_charge_control_2024.0.0/battery_management.ods
new file mode 100644
index 0000000000000000000000000000000000000000..e9e3fee6155b01cade3095d29023dba04d446b50
Binary files /dev/null and b/PCB_boards/accessories/battery_charge_control_2024.0.0/battery_management.ods differ
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/0805-NO.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/0805-NO.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/0805-NO.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/0805-NO.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/1X12_ROUND.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/1X12_ROUND.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/1X12_ROUND.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/1X12_ROUND.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/ADAFRUIT_TEXT_20MM.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/ADAFRUIT_TEXT_20MM.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/ADAFRUIT_TEXT_20MM.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/ADAFRUIT_TEXT_20MM.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/FIDUCIAL_1MM.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/FIDUCIAL_1MM.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/FIDUCIAL_1MM.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/FIDUCIAL_1MM.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/MOUNTINGHOLE_2.5_PLATED.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/MOUNTINGHOLE_2.5_PLATED.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/MOUNTINGHOLE_2.5_PLATED.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/MOUNTINGHOLE_2.5_PLATED.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/PCBFEAT-REV-040.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/PCBFEAT-REV-040.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/PCBFEAT-REV-040.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/PCBFEAT-REV-040.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_ARROW_NOPASTE.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_ARROW_NOPASTE.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_ARROW_NOPASTE.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_ARROW_NOPASTE.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_CLOSEDWIRE.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_CLOSEDWIRE.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_CLOSEDWIRE.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/SOLDERJUMPER_CLOSEDWIRE.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/TSSOP24.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/TSSOP24.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/TSSOP24.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/TSSOP24.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/_0805MP.kicad_mod b/PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/_0805MP.kicad_mod
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/_0805MP.kicad_mod
rename to PCB_boards/accessories/i2c_ext.2024.0.0/Adafruit TCA9548A.pretty/_0805MP.kicad_mod
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_dru b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_dru
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_dru
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_dru
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pcb b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pcb
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pcb
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pcb
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_prl b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_prl
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_prl
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_prl
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pro b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pro
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pro
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_pro
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch-bak b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch-bak
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch-bak
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.kicad_sch-bak
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.png b/PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.png
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/MUX_v2024_tca_board.png
rename to PCB_boards/accessories/i2c_ext.2024.0.0/MUX_v2024_tca_board.png
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/TCA_board_2.png b/PCB_boards/accessories/i2c_ext.2024.0.0/TCA_board_2.png
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/TCA_board_2.png
rename to PCB_boards/accessories/i2c_ext.2024.0.0/TCA_board_2.png
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/empty.kicad_wks b/PCB_boards/accessories/i2c_ext.2024.0.0/empty.kicad_wks
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/empty.kicad_wks
rename to PCB_boards/accessories/i2c_ext.2024.0.0/empty.kicad_wks
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/fp-info-cache b/PCB_boards/accessories/i2c_ext.2024.0.0/fp-info-cache
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/fp-info-cache
rename to PCB_boards/accessories/i2c_ext.2024.0.0/fp-info-cache
diff --git a/PCB_boards/accessory/i2c_ext.2024.0.0/fp-lib-table b/PCB_boards/accessories/i2c_ext.2024.0.0/fp-lib-table
similarity index 100%
rename from PCB_boards/accessory/i2c_ext.2024.0.0/fp-lib-table
rename to PCB_boards/accessories/i2c_ext.2024.0.0/fp-lib-table
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 03a5e220d19ec4efb8967026853e600c25a0bd81..ca65eba4bf4ada3fdafa39cdff4be7578de18a05 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -43,13 +43,14 @@ for k, v in rx_module.SPECS['rx'].items():
except Exception as e:
print(f'Cannot set value {v} in RX_CONFIG[{k}]:\n{e}')
-current_max = np.min([TX_CONFIG['current_max'], HARDWARE_CONFIG['pwr'].pop('current_max', np.inf), # TODO: replace 50 by a TX config
+current_max = np.min([TX_CONFIG['current_max'], HARDWARE_CONFIG['pwr'].pop('current_max', np.inf),
np.min(np.hstack((np.inf, [MUX_CONFIG[i].pop('current_max', np.inf) for i in MUX_CONFIG.keys()])))])
voltage_max = np.min([TX_CONFIG['voltage_max'],
np.min(np.hstack((np.inf, [MUX_CONFIG[i].pop('voltage_max', np.inf) for i in MUX_CONFIG.keys()])))])
voltage_min = RX_CONFIG['voltage_min']
# TODO: should replace voltage_max and voltage_min by vab_max and vmn_min...
+
def elapsed_seconds(start_time):
lap = datetime.datetime.utcnow() - start_time
return lap.total_seconds()
@@ -189,7 +190,7 @@ class OhmPiHardware:
self._start_time = None
self._pulse = 0
- def _gain_auto(self, polarities=(1, -1), vab=5., switch_pwr_off=False): #TODO: improve _gain_auto
+ def _gain_auto(self, polarities=(1, -1), vab=5., switch_pwr_off=False): #TODO: improve _gain_auto
self.exec_logger.event(f'OhmPiHardware\ttx_rx_gain_auto\tbegin\t{datetime.datetime.utcnow()}')
current, voltage = 0., 0.
if self.tx.pwr.voltage_adjustable:
@@ -238,7 +239,7 @@ class OhmPiHardware:
mux.barrier = self.mux_barrier
@property
- def pulses(self): # TODO: is this obsolete?
+ def pulses(self): # TODO: is this obsolete? I don't think so...
pulses = {}
for i in np.unique(self.readings[:, 1]):
r = self.readings[self.readings[:, 1] == i, :]
@@ -485,7 +486,7 @@ class OhmPiHardware:
diff_vab = np.inf
if strategy == 'vmax' or strategy == 'vmin':
while (k < n_steps) and (diff_vab > diff_vab_lim) and (vab_list[k] < vab_max):
- if strategy=='vmax':
+ if strategy == 'vmax':
vmn_min = vmn_max
vabs = []
self._vab_pulses(vab_list[k], sampling_rate=self.rx.sampling_rate, durations=[0.2, 0.2], polarities=[1, -1])