Skip to content
GitLab
Commit d5ec11de authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Uses nonblocking zmq recv to allow for a clean quit()

parent 6a7d1d75
master EGU23 MUX_board_v2024 battery_charger board_v4 code_refactor dev2 mqtt revert-559ef012 v2023.0.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 110 additions and 106 deletions
+110 -106
ohmpi.py
+ 110
− 106
View file @ d5ec11de
...@@ -546,69 +546,72 @@ class OhmPi(object): ...@@ -546,69 +546,72 @@ class OhmPi(object):
self.run = True self.run = True
self.status = 'running' self.status = 'running'
# make sure all mux are off to start with if self.on_pi:
self.reset_mux() # make sure all mux are off to start with
self.reset_mux()
# measure all quad of the RS sequence # measure all quad of the RS sequence
for i in range(0, quads.shape[0]): for i in range(0, quads.shape[0]):
quad = quads[i, :] # quadrupole quad = quads[i, :] # quadrupole
# NOTE (GB): I'd use the self.run_measurement() for all this middle part so we an make use of autogain and so ... # NOTE (GB): I'd use the self.run_measurement() for all this middle part so we an make use of autogain and so ...
# call the switch_mux function to switch to the right electrodes # call the switch_mux function to switch to the right electrodes
# self.switch_mux_on(quad) # self.switch_mux_on(quad)
# run a measurement # run a measurement
# current_measurement = self.run_measurement(quad, 1, 0.25) # current_measurement = self.run_measurement(quad, 1, 0.25)
# switch mux off # switch mux off
# self.switch_mux_off(quad) # self.switch_mux_off(quad)
self.switch_mux_on(quad) self.switch_mux_on(quad)
# current injection # current injection
pin0 = self.mcp.get_pin(0) pin0 = self.mcp.get_pin(0)
pin0.direction = Direction.OUTPUT pin0.direction = Direction.OUTPUT
pin1 = self.mcp.get_pin(1) pin1 = self.mcp.get_pin(1)
pin1.direction = Direction.OUTPUT pin1.direction = Direction.OUTPUT
pin0.value = False pin0.value = False
pin1.value = False pin1.value = False
# call the switch_mux function to switch to the right electrodes # 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) self.ads_current = ads.ADS1115(self.i2c, gain=2 / 3, data_rate=860, address=0x48)
# ADS1115 for voltage measurement (MN) # ADS1115 for voltage measurement (MN)
self.ads_voltage = ads.ADS1115(self.i2c, gain=2 / 3, data_rate=860, address=0x49) self.ads_voltage = ads.ADS1115(self.i2c, gain=2 / 3, data_rate=860, address=0x49)
pin1.value = True # inject from pin1 to pin0 pin1.value = True # inject from pin1 to pin0
pin0.value = False pin0.value = False
time.sleep(0.2) time.sleep(0.2)
# measure current and voltage # measure current and voltage
current = AnalogIn(self.ads_current, ads.P0).voltage / (50 * self.r_shunt) current = AnalogIn(self.ads_current, ads.P0).voltage / (50 * self.r_shunt)
voltage = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * 2.5 voltage = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * 2.5
# compute resistance measured (= contact resistance) # compute resistance measured (= contact resistance)
resistance = np.abs(voltage / current) resistance = np.abs(voltage / current)
msg = f'Contact resistance {str(quad):s}: I: {current * 1000.:>10.3f} mA, V: {voltage * 1000.:>10.3f} mV, ' \ msg = f'Contact resistance {str(quad):s}: I: {current * 1000.:>10.3f} mA, V: {voltage * 1000.:>10.3f} mV, ' \
f'R: {resistance /1000.:>10.3f} kOhm' f'R: {resistance /1000.:>10.3f} kOhm'
self.exec_logger.debug(msg) self.exec_logger.debug(msg)
# if contact resistance = 0 -> we have a short circuit!! # if contact resistance = 0 -> we have a short circuit!!
if resistance < 1e-2: if resistance < 1e-2:
msg = f'!!!SHORT CIRCUIT!!! {str(quad):s}: {resistance / 1000.:.3f} kOhm' msg = f'!!!SHORT CIRCUIT!!! {str(quad):s}: {resistance / 1000.:.3f} kOhm'
self.exec_logger.warning(msg) self.exec_logger.warning(msg)
# save data and print in a text file # save data and print in a text file
self.append_and_save(export_path_rs, { self.append_and_save(export_path_rs, {
'A': quad[0], 'A': quad[0],
'B': quad[1], 'B': quad[1],
'RS [kOhm]': resistance / 1000., 'RS [kOhm]': resistance / 1000.,
}) })
# close mux path and put pin back to GND # close mux path and put pin back to GND
self.switch_mux_off(quad) self.switch_mux_off(quad)
pin0.value = False pin0.value = False
pin1.value = False pin1.value = False
self.reset_mux() self.reset_mux()
else:
pass
self.status = 'idle' self.status = 'idle'
self.run = False self.run = False
...@@ -652,61 +655,62 @@ class OhmPi(object): ...@@ -652,61 +655,62 @@ class OhmPi(object):
f' Make sure your client interface is running and bound to this port...', 'blue')) f' Make sure your client interface is running and bound to this port...', 'blue'))
self.exec_logger.debug(f'Start listening for commands on port {tcp_port}') self.exec_logger.debug(f'Start listening for commands on port {tcp_port}')
while self.cmd_listen: while self.cmd_listen:
message = socket.recv()
self.exec_logger.debug(f'Received command: {message}')
e = None
try: try:
cmd_id = None message = socket.recv(flags=zmq.NOBLOCK)
decoded_message = json.loads(message.decode('utf-8')) self.exec_logger.debug(f'Received command: {message}')
cmd_id = decoded_message.pop('cmd_id', None)
cmd = decoded_message.pop('cmd', None)
args = decoded_message.pop('args', None)
status = False
e = None e = None
if cmd is not None and cmd_id is not None: try:
if cmd == 'update_settings' and args is not None: cmd_id = None
self._update_acquisition_settings(args) decoded_message = json.loads(message.decode('utf-8'))
elif cmd == 'start': cmd_id = decoded_message.pop('cmd_id', None)
self.measure(cmd_id) cmd = decoded_message.pop('cmd', None)
while not self.status == 'idle': args = decoded_message.pop('args', None)
time.sleep(0.1) status = False
status = True e = None
elif cmd == 'stop': if cmd is not None and cmd_id is not None:
self.stop() if cmd == 'update_settings' and args is not None:
status = True self._update_acquisition_settings(args)
elif cmd == 'read_sequence': elif cmd == 'start':
try: self.measure(cmd_id)
self.read_quad(args) while not self.status == 'idle':
status = True time.sleep(0.1)
except Exception as e:
self.exec_logger.warning(f'Unable to read sequence: {e}')
elif cmd == 'set_sequence':
try:
self.sequence = np.array(args)
status = True status = True
except Exception as e: elif cmd == 'stop':
self.exec_logger.warning(f'Unable to set sequence: {e}') self.stop()
elif cmd == 'rs_check':
try:
self.rs_check()
status = True status = True
except Exception as e: elif cmd == 'read_sequence':
print('error====', e) try:
self.exec_logger.warning(f'Unable to run rs-check: {e}') self.read_quad(args)
else: status = True
self.exec_logger.warning(f'Unkown command {cmd} - cmd_id: {cmd_id}') except Exception as e:
except Exception as e: self.exec_logger.warning(f'Unable to read sequence: {e}')
self.exec_logger.warning(f'Unable to decode command {message}: {e}') elif cmd == 'set_sequence':
status = False try:
finally: self.sequence = np.array(args)
reply = {'cmd_id': cmd_id, 'status': status} status = True
reply = json.dumps(reply) except Exception as e:
self.exec_logger.debug(f'Execution report: {reply}') self.exec_logger.warning(f'Unable to set sequence: {e}')
self.exec_logger.debug(reply) elif cmd == 'rs_check':
reply = bytes(reply, 'utf-8') try:
socket.send(reply) self.rs_check()
# Do some 'work' status = True
time.sleep(.1) except Exception as e:
print('error====', e)
self.exec_logger.warning(f'Unable to run rs-check: {e}')
else:
self.exec_logger.warning(f'Unkown command {cmd} - cmd_id: {cmd_id}')
except Exception as e:
self.exec_logger.warning(f'Unable to decode command {message}: {e}')
status = False
finally:
reply = {'cmd_id': cmd_id, 'status': status}
reply = json.dumps(reply)
self.exec_logger.debug(f'Execution report: {reply}')
self.exec_logger.debug(reply)
reply = bytes(reply, 'utf-8')
socket.send(reply)
except zmq.Again:
time.sleep(.1)
def measure(self, cmd_id=None): def measure(self, cmd_id=None):
"""Run the sequence in a separate thread. Can be stopped by 'OhmPi.stop()'. """Run the sequence in a separate thread. Can be stopped by 'OhmPi.stop()'.
......
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