From fa9694b54dc40dc671791312a3e89ed27cadd306 Mon Sep 17 00:00:00 2001
From: "rpi2.0" <rpi2.0>
Date: Fri, 28 Oct 2022 12:25:25 +0200
Subject: [PATCH] fixes merging issues on ohmpi.py
---
config.py | 3 ++-
ohmpi.py | 8 +-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/config.py b/config.py
index 04577882..d06abbe2 100644
--- a/config.py
+++ b/config.py
@@ -17,7 +17,8 @@ OHMPI_CONFIG = {
'version': 2,
'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'
+ 'settings': 'ohmpi_settings.json',
+ 'board_version':2.0
} # TODO: add a dictionary with INA models and associated gain values
# CONTROL_CONFIG = {
diff --git a/ohmpi.py b/ohmpi.py
index fc6ba5ff..cd474e10 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -164,12 +164,6 @@ class OhmPi(object):
self.pin1.direction = Direction.OUTPUT
self.pin1.value = False
-
- # Starts the command processing thread
- self.cmd_listen = True
- self.cmd_thread = threading.Thread(target=self.process_commands)
- self.cmd_thread.start()
-
# Starts the command processing thread
self.cmd_listen = True
self.cmd_thread = threading.Thread(target=self._control)
@@ -285,7 +279,7 @@ class OhmPi(object):
return output
@staticmethod
- def get_platform():
+ def _get_platform():
"""Get platform name and check if it is a raspberry pi
Returns
=======
--
GitLab