Commit fa9694b5 authored by rpi2.0's avatar rpi2.0
Browse files

fixes merging issues on ohmpi.py

Showing with 3 additions and 8 deletions
+3 -8
......@@ -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 = {
......
......@@ -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
=======
......
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