diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2e6e93d68a55eaefb2e97cae411327e4b70ef3e..6a33db667831a41fbe32e110317ce4e7ae1f96ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ pages: - pip install sphinx numpydoc sphinx_rtd_theme pandoc recommonmark - cd doc - make html + # also make latex? pdf? - cd .. - mv doc/build/html/ public/ diff --git a/ohmpi.py b/ohmpi.py index 5046ccd69a1f5ab26de74f9637aae1fd500c4f9b..23b27fc01900676080d5c0d1550c74ad9649c584 100644 --- a/ohmpi.py +++ b/ohmpi.py @@ -483,7 +483,8 @@ class OhmPi(object): "Time [s]": (-start_time + time.time()), "Nb samples [-]": self.nb_samples } - + print(d) + # round number to two decimal for nicer string output output = [f'{k}\t' for k in d.keys()] output = str(output)[:-1] + '\n' @@ -539,7 +540,7 @@ class OhmPi(object): # save data and print in a text file #self.append_and_save(export_path_rs, current_measurement) - + self.switch_mux_on(quad) # put before raising the pins (otherwise conflict i2c) # current injection pin0 = self.mcp.get_pin(0) @@ -550,19 +551,19 @@ class OhmPi(object): pin1.value = False # call the switch_mux function to switch to the right electrodes - self.switch_mux_on(quad) + self.ads_current = ads.ADS1115(self.i2c, gain=2 / 3, data_rate=860, address=0x48) # ADS1115 for voltage measurement (MN) self.ads_voltage = ads.ADS1115(self.i2c, gain=2 / 3, data_rate=860, address=0x49) pin1.value = True # inject from pin1 to pin0 pin0.value = False - time.sleep(0.2) + time.sleep(0.5) # measure current and voltage current = AnalogIn(self.ads_current, ads.P0).voltage / (50 * self.r_shunt) voltage = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * 2.5 resistance = voltage / current - print('I: {:>10.3f} mA, V: {:>10.3f} mV, R: {:>10.3f} Ohm'.format( + print(str(quad) + '> I: {:>10.3f} mA, V: {:>10.3f} mV, R: {:>10.3f} Ohm'.format( current*1000, voltage*1000, resistance)) # compute resistance measured (= contact resistance) @@ -732,8 +733,8 @@ print(current_time.strftime("%Y-%m-%d %H:%M:%S")) if __name__ == "__main__": ohmpi = OhmPi(config='ohmpi_param.json') #ohmpi.measure() - ohmpi.read_quad('breadboard.txt') + #ohmpi.read_quad('breadboard.txt') ohmpi.rs_check() - ohmpi.measure() - time.sleep(4) - ohmpi.stop() + #ohmpi.measure() + #time.sleep(20) + #ohmpi.stop()