From 26e86d79930917ba470e3ac6ad1aca7b1464d6a5 Mon Sep 17 00:00:00 2001
From: "rpi2.0" <rpi2.0>
Date: Fri, 28 Oct 2022 12:38:38 +0200
Subject: [PATCH] fixes issues on merge in ohmpi.py and config.py - now works
well
---
config.py | 2 +-
http_interface.py | 2 +-
ohmpi.py | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.py b/config.py
index d06abbe2..9345d1d9 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 ed4f4617..bc0e71f3 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 cd474e10..ce32bfb3 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:
--
GitLab