diff --git a/ohmpi/hardware_components/ohmpi_card_3_15.py b/ohmpi/hardware_components/ohmpi_card_3_15.py index 8aebe656effcc79a0c78758b829ecfbcb7d66d75..c901338fd8186dc31806ca4de6e6ddee2e724d4f 100644 --- a/ohmpi/hardware_components/ohmpi_card_3_15.py +++ b/ohmpi/hardware_components/ohmpi_card_3_15.py @@ -254,6 +254,6 @@ class Rx(RxAbstract): """ Gets the voltage VMN in Volts """ self.exec_logger.event(f'{self.board_name}\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.board_name}\trx_voltage\tend\t{datetime.datetime.utcnow()}') return u diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index 0171c50969f1a4f547d22aa7d99504b9fa867445..45e29214fb1a49b8231935f7322f1665be7bae3b 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -319,7 +319,7 @@ class OhmPiHardware: plt.show() def calibrate_rx_bias(self): - self.tx._bias = np.mean(self.readings[self.readings[:, 2] == 1, 4]) \ + self.rx._bias = np.mean(self.readings[self.readings[:, 2] == 1, 4]) \ + np.mean(self.readings[self.readings[:, 2] == -1, 4]) / 2. def vab_square_wave(self, vab, cycle_length, sampling_rate=None, cycles=3, polarity=1, append=False):