Commit 26e86d79 authored by rpi2.0's avatar rpi2.0
Browse files

fixes issues on merge in ohmpi.py and config.py - now works well

Showing with 6 additions and 6 deletions
+6 -6
......@@ -18,7 +18,7 @@ OHMPI_CONFIG = {
'max_elec': 64,
'board_addresses': {'A': 0x73, 'B': 0x72, 'M': 0x71, 'N': 0x70}, # def. {'A': 0x76, 'B': 0x71, 'M': 0x74, 'N': 0x70}
'settings': 'ohmpi_settings.json',
'board_version':2.0
'board_version': '22.10'
} # TODO: add a dictionary with INA models and associated gain values
# CONTROL_CONFIG = {
......
rom http.server import SimpleHTTPRequestHandler, HTTPServer
from http.server import SimpleHTTPRequestHandler, HTTPServer
import os
import json
import uuid
......
......@@ -1012,13 +1012,13 @@ class OhmPi(object):
except Exception as e:
self.exec_logger.warning(f'Unable to set sequence: {e}')
status = False
elif cmd == 'start':
self.measure(cmd_id)
elif cmd == 'run_sequence':
self.run_sequence(cmd_id)
while not self.status == 'idle':
time.sleep(0.1)
status = True
elif cmd == 'stop':
self.stop()
elif cmd == 'interrupt':
self.interrupt()
status = True
elif cmd == 'load_sequence':
try:
......
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