Skip to content
GitLab
Commit 33bbae1e authored by remi.clement@inrae.fr's avatar remi.clement@inrae.fr
Browse files

rs_check and full data

parent fde5429c
master 144-create-testing-framework-for-tests-automation EGU23 MB.2024.ter_restored MUX_board_v2024 Refactor_mb_2023 battery_charger board_v4 code_refactor dev/dummy mqtt update_V2023 v2024_rc v2025_alpha v2024.0.34 v2024.0.33 v2024.0.32 v2024.0.31 v2024.0.30 v2024.0.29 v2024.0.28 v2024.0.27 v2024.0.26 v2024.0.25 v2024.0.24 v2024.0.23 v2024.0.22 v2024.0.21 v2024.0.20 v2024.0.19 v2024.0.18 v2024.0.17 v2024.0.16 v2024.0.15 v2024.0.14 v2024.0.13 v2024.0.12 v2024.0.11 v2024.0.10 v2024.0.9 v2024.0.8 v2024.0.7 v2024.0.0 v2023.0.1 v2023.0.0 archives/mqtt
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 56 deletions
+53 -56
ohmpi.py
+ 53
− 56
View file @ 33bbae1e
...@@ -588,6 +588,14 @@ class OhmPi(object): ...@@ -588,6 +588,14 @@ class OhmPi(object):
# one stack = 2 half-cycles (one positive, one negative) # one stack = 2 half-cycles (one positive, one negative)
pinMN = 0 if polarity > 0 else 2 pinMN = 0 if polarity > 0 else 2
# sampling for each stack at the end of the injection
sampling_interval = 10 # ms
self.nb_samples = int(injection_duration * 1000 // sampling_interval) + 1
# full data for waveform
#fulldata = np.zeros((nb_stack * self.nb_samples, 3)) * np.nan
fulldata = []
# start counter # start counter
# we sample every 10 ms (as using AnalogIn for both current # we sample every 10 ms (as using AnalogIn for both current
# and voltage takes about 7 ms). When we go over the injection # and voltage takes about 7 ms). When we go over the injection
...@@ -595,11 +603,6 @@ class OhmPi(object): ...@@ -595,11 +603,6 @@ class OhmPi(object):
# only the last values in meas will be taken into account # only the last values in meas will be taken into account
start_time = time.time() start_time = time.time()
for n in range(0, nb_stack * 2): # for each half-cycles for n in range(0, nb_stack * 2): # for each half-cycles
# sampling for each stack at the end of the injection
sampling_interval = 10 # ms
self.nb_samples = int(injection_duration * 1000 // sampling_interval) + 1
meas = np.zeros((self.nb_samples, 2))
# current injection # current injection
if (n % 2) == 0: if (n % 2) == 0:
self.pin0.value = True self.pin0.value = True
...@@ -607,11 +610,10 @@ class OhmPi(object): ...@@ -607,11 +610,10 @@ class OhmPi(object):
else: else:
self.pin0.value = False self.pin0.value = False
self.pin1.value = True # current injection nr2 self.pin1.value = True # current injection nr2
start_delay = time.time() # stating measurement time
#time.sleep(injection_duration) # delay depending on current injection duration
# measurement of current i and voltage u # measurement of current i and voltage u during injection
meas = np.zeros((self.nb_samples, 3)) * np.nan
start_delay = time.time() # stating measurement time
dt = 0 dt = 0
for k in range(0, self.nb_samples): for k in range(0, self.nb_samples):
# reading current value on ADS channels # reading current value on ADS channels
...@@ -622,17 +624,39 @@ class OhmPi(object): ...@@ -622,17 +624,39 @@ class OhmPi(object):
meas[k, 1] = AnalogIn(self.ads_voltage, ads.P2).voltage * 1000 *-1 meas[k, 1] = AnalogIn(self.ads_voltage, ads.P2).voltage * 1000 *-1
time.sleep(sampling_interval / 1000) time.sleep(sampling_interval / 1000)
dt = time.time() - start_delay # real injection time (s) dt = time.time() - start_delay # real injection time (s)
meas[k, 2] = time.time() - start_time
if dt > (injection_duration - 0 * sampling_interval /1000): if dt > (injection_duration - 0 * sampling_interval /1000):
break break
# stop current injection # stop current injection
self.pin0.value = False self.pin0.value = False
self.pin1.value = False self.pin1.value = False
end_delay = time.time()
# truncate the meas array if we didn't fill the last samples
meas = meas[:k+1]
# measurement of current i and voltage u during off time
measpp = np.zeros((meas.shape[0], 3)) * np.nan
start_delay = time.time() # stating measurement time
dt = 0
for k in range(0, measpp.shape[0]):
# reading current value on ADS channels
measpp[k, 0] = (AnalogIn(self.ads_current, ads.P0).voltage * 1000) / (50 * self.r_shunt)
if pinMN == 0:
measpp[k, 1] = AnalogIn(self.ads_voltage, ads.P0).voltage * 1000
else:
measpp[k, 1] = AnalogIn(self.ads_voltage, ads.P2).voltage * 1000 *-1
time.sleep(sampling_interval / 1000)
dt = time.time() - start_delay # real injection time (s)
measpp[k, 2] = time.time() - start_time
if dt > (injection_duration - 0 * sampling_interval /1000):
break
end_delay = time.time() end_delay = time.time()
# truncate the meas array if we didn't fill the last samples # truncate the meas array if we didn't fill the last samples
meas = meas[:k+1:] measpp = measpp[:k+1]
# we alternate on which ADS1115 pin we measure because of sign of voltage # we alternate on which ADS1115 pin we measure because of sign of voltage
if pinMN == 0: if pinMN == 0:
...@@ -640,6 +664,22 @@ class OhmPi(object): ...@@ -640,6 +664,22 @@ class OhmPi(object):
else: else:
pinMN = 0 pinMN = 0
# store data for full wave form
fulldata.append(meas)
fulldata.append(measpp)
# wait once the actual injection time between two injection
# so it's a 50% duty cycle
#print('crenaux (s)', (end_delay - start_delay))
#print('sleep for (s)', injection_duration - (end_delay - start_delay))
#print(meas)
#print(measpp)
# TODO get battery voltage and warn if battery is running low
# TODO send a message on SOH stating the battery level
# let's do some calculation (out of the stacking loop)
for n, meas in enumerate(fulldata[::2]):
# take average from the samples per stack, then sum them all # take average from the samples per stack, then sum them all
# average for the last third of the stacked values # average for the last third of the stacked values
# is done outside the loop # is done outside the loop
...@@ -652,16 +692,6 @@ class OhmPi(object): ...@@ -652,16 +692,6 @@ class OhmPi(object):
sum_vmn = sum_vmn + vmn1 sum_vmn = sum_vmn + vmn1
sum_ps = sum_ps + vmn1 sum_ps = sum_ps + vmn1
# TODO get battery voltage and warn if battery is running low
# TODO send a message on SOH stating the battery level
# wait once the actual injection time between two injection
# so it's a 50% duty cycle
print('crenaux (s)', (end_delay - start_delay))
print('sleep for (s)', injection_duration - (end_delay - start_delay))
time.sleep(dt)
#time.sleep(injection_duration) # off time between half-cycles
# time.sleep(2*(end_delay - start_delay) - (end_calc - start_delay))
if self.idps: if self.idps:
self.DPS.write_register(0x0000, 0, 2) # reset to 0 volt self.DPS.write_register(0x0000, 0, 2) # reset to 0 volt
...@@ -686,7 +716,8 @@ class OhmPi(object): ...@@ -686,7 +716,8 @@ class OhmPi(object):
"nbStack": nb_stack, "nbStack": nb_stack,
"CPU temp [degC]": CPUTemperature().temperature, "CPU temp [degC]": CPUTemperature().temperature,
"Time [s]": (time.time() - start_time), "Time [s]": (time.time() - start_time),
"Nb samples [-]": self.nb_samples "Nb samples [-]": self.nb_samples,
"fulldata": np.vstack(fulldata)
} }
print(d) print(d)
...@@ -735,41 +766,7 @@ class OhmPi(object): ...@@ -735,41 +766,7 @@ class OhmPi(object):
self.switch_mux_on(quad) # put before raising the pins (otherwise conflict i2c) self.switch_mux_on(quad) # put before raising the pins (otherwise conflict i2c)
d = self.run_measurement(quad=quad, nb_stack=1, injection_duration=0.5, tx_volt=5, autogain=True) d = self.run_measurement(quad=quad, nb_stack=1, injection_duration=0.5, tx_volt=5, autogain=True)
# NOTE (GB): I'd use the self.run_measurement() for all this middle part so we an make use of autogain and so ... resistance = d['R [ohm]']
# call the switch_mux function to switch to the right electrodes
#self.switch_mux_on(quad)
# run a measurement
#current_measurement = self.run_measurement(quad, 1, 0.25)
# switch mux off
#self.switch_mux_off(quad)
# save data and print in a text file
#self.append_and_save(export_path_rs, current_measurement)
# current injection
# self.pin0 = self.mcp.get_pin(0)
# self.pin0.direction = Direction.OUTPUT
# self.pin1 = self.mcp.get_pin(1)
# self.pin1.direction = Direction.OUTPUT
# self.pin0.value = False
# self.pin1.value = False
# # call the switch_mux function to switch to the right electrodes
# 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)
# self.pin1.value = True # inject from pin1 to self.pin0
# self.pin0.value = False
# 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.P2).voltage * 2.5
# resistance = voltage / current
current = d['R [ohm]']
voltage = d['Vmn [mV]'] voltage = d['Vmn [mV]']
current = d['I [mA]'] current = d['I [mA]']
print(str(quad) + '> 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(
......
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