fix

davwys · Dec 4, 2019 · f4fbb33 · f4fbb33
2 parents bee52b7 + 299d981
commit f4fbb33
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 32 deletions.
diff --git a/playingDashboard/.idea/workspace.xml b/playingDashboard/.idea/workspace.xml
diff --git a/playingDashboard/__pycache__/data_handling.cpython-37.pyc b/playingDashboard/__pycache__/data_handling.cpython-37.pyc
diff --git a/playingDashboard/__pycache__/serial_functions.cpython-37.pyc b/playingDashboard/__pycache__/serial_functions.cpython-37.pyc
diff --git a/playingDashboard/serial_functions.py b/playingDashboard/serial_functions.py
@@ -58,8 +58,12 @@ def select_port(self, port):
 
         # Enable serial port (system dependent)
         if platform.system() is not "Windows":
-            self.ser = serial.Serial('/dev/cu.' + str(self.selectedPort), 57600)  # open serial port
+            if platform.system() is not "Darwin":
+                self.ser = serial.Serial(str(self.selectedPort), 57600)  # open serial port
+            else:
+                self.ser = serial.Serial('/dev/cu.' + str(self.selectedPort), 57600)  # open serial port
         else:
+            print("opening port: {}".format(self.selectedPort))
             self.ser = serial.Serial(str(self.selectedPort), 57600)  # open serial port
 
         time.sleep(1)

diff --git a/trainingDashboard/.idea/workspace.xml b/trainingDashboard/.idea/workspace.xml
diff --git a/trainingDashboard/__pycache__/data_handling.cpython-37.pyc b/trainingDashboard/__pycache__/data_handling.cpython-37.pyc
diff --git a/trainingDashboard/__pycache__/input.cpython-37.pyc b/trainingDashboard/__pycache__/input.cpython-37.pyc
diff --git a/trainingDashboard/__pycache__/log.cpython-37.pyc b/trainingDashboard/__pycache__/log.cpython-37.pyc
diff --git a/trainingDashboard/__pycache__/serial_functions.cpython-37.pyc b/trainingDashboard/__pycache__/serial_functions.cpython-37.pyc
diff --git a/trainingDashboard/serial_functions.py b/trainingDashboard/serial_functions.py
@@ -58,7 +58,10 @@ def select_port(self, port):
 
         # Enable serial port (system dependent)
         if platform.system() is not "Windows":
-            self.ser = serial.Serial('/dev/cu.' + str(self.selectedPort), 57600)  # open serial port
+            if platform.system() is not "Darwin":
+                self.ser = serial.Serial(str(self.selectedPort), 57600)  # open serial port
+            else:
+                self.ser = serial.Serial('/dev/cu.' + str(self.selectedPort), 57600)  # open serial port
         else:
             print("opening port: {}".format(self.selectedPort))
             self.ser = serial.Serial(str(self.selectedPort), 57600)  # open serial port