diff --git a/config.py b/config.py index d06abbe2714b270ae537dd908a9e77420d15f2f4..9345d1d932a00f7059936f24ca02b58112d11fc9 100644 --- a/config.py +++ b/config.py @@ -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 = { diff --git a/http_interface.py b/http_interface.py index ed4f461715d812edf114231160e9ab132604d46d..bc0e71f3db458c1a3ba2cfab94ff949d2e3edab3 100644 --- a/http_interface.py +++ b/http_interface.py @@ -1,4 +1,4 @@ -rom http.server import SimpleHTTPRequestHandler, HTTPServer +from http.server import SimpleHTTPRequestHandler, HTTPServer import os import json import uuid diff --git a/ohmpi.py b/ohmpi.py index cd474e1099f23f82399b7e02411e42fe5269bcd1..ce32bfb3b8e056297503b4a9100054475ee1b314 100644 --- a/ohmpi.py +++ b/ohmpi.py @@ -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: