From bcfe4808c017ab3383eb9942bdf0ed5009d2ed96 Mon Sep 17 00:00:00 2001
From: Leon Teichroeb <st161482@stud.uni-stuttgart.de>
Date: Tue, 27 Jul 2021 15:09:24 +0200
Subject: [PATCH] Refatoring: Moved .py files into src folder. Unified some
 file names

---
 Test cases.xlsx                              | Bin 18028 -> 0 bytes
 {Arduino => src/arduino}/README_arduino.md   |   0
 {Arduino => src/arduino}/__init__.py         |   0
 {Arduino => src/arduino}/arduino.py          |   0
 {Arduino => src/arduino}/prototype.ino       |   0
 cage_func.py => src/cage_func.py             |  12 ++++++------
 config_handling.py => src/config_handling.py |   2 +-
 csv_logging.py => src/csv_logging.py         |   4 ++--
 csv_threading.py => src/csv_threading.py     |   2 +-
 globals.py => src/globals.py                 |   4 ++--
 main.py => src/main.py                       |   6 +++---
 {pyps2000b => src/ps2000b}/LICENSE           |   0
 {pyps2000b => src/ps2000b}/PS2000B.py        |   0
 {pyps2000b => src/ps2000b}/README.md         |   0
 {pyps2000b => src/ps2000b}/__init__.py       |   0
 socket_control.py => src/socket_control.py   |   2 +-
 User_Interface.py => src/user_interface.py   |   0
 test.csv                                     |   4 ----
 18 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 Test cases.xlsx
 rename {Arduino => src/arduino}/README_arduino.md (100%)
 rename {Arduino => src/arduino}/__init__.py (100%)
 rename {Arduino => src/arduino}/arduino.py (100%)
 rename {Arduino => src/arduino}/prototype.ino (100%)
 rename cage_func.py => src/cage_func.py (98%)
 rename config_handling.py => src/config_handling.py (99%)
 rename csv_logging.py => src/csv_logging.py (98%)
 rename csv_threading.py => src/csv_threading.py (99%)
 rename globals.py => src/globals.py (94%)
 rename main.py => src/main.py (97%)
 rename {pyps2000b => src/ps2000b}/LICENSE (100%)
 rename {pyps2000b => src/ps2000b}/PS2000B.py (100%)
 rename {pyps2000b => src/ps2000b}/README.md (100%)
 rename {pyps2000b => src/ps2000b}/__init__.py (100%)
 rename socket_control.py => src/socket_control.py (99%)
 rename User_Interface.py => src/user_interface.py (100%)
 delete mode 100644 test.csv

diff --git a/Test cases.xlsx b/Test cases.xlsx
deleted file mode 100644
index da0c57af67d80b2605f18655ffaa09d840b61233..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18028
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

diff --git a/Arduino/README_arduino.md b/src/arduino/README_arduino.md
similarity index 100%
rename from Arduino/README_arduino.md
rename to src/arduino/README_arduino.md
diff --git a/Arduino/__init__.py b/src/arduino/__init__.py
similarity index 100%
rename from Arduino/__init__.py
rename to src/arduino/__init__.py
diff --git a/Arduino/arduino.py b/src/arduino/arduino.py
similarity index 100%
rename from Arduino/arduino.py
rename to src/arduino/arduino.py
diff --git a/Arduino/prototype.ino b/src/arduino/prototype.ino
similarity index 100%
rename from Arduino/prototype.ino
rename to src/arduino/prototype.ino
diff --git a/cage_func.py b/src/cage_func.py
similarity index 98%
rename from cage_func.py
rename to src/cage_func.py
index da7dbb1..7ae72bb 100644
--- a/cage_func.py
+++ b/src/cage_func.py
@@ -8,9 +8,9 @@ import traceback
 from tkinter import messagebox
 
 # import other project files
-from User_Interface import ui_print
-from pyps2000b import PS2000B
-from Arduino import Arduino
+from user_interface import ui_print
+from ps2000b import PS2000B
+from arduino import Arduino
 import config_handling as config
 import globals as g
 
@@ -192,8 +192,8 @@ class ArduinoCtrl(Arduino):
                         axis.polarity_switched = "False"  # set attribute in axis object accordingly
             except Exception as e:  # some error occurred while trying to read status, usually arduino is disconnected
                 # show warning messages to alert user
-                ui_print("Error with Arduino:", e)
-                messagebox.showerror("Error with Arduino!", "Connection Error with Arduino: \n%s" % e)
+                ui_print("Error with arduino:", e)
+                messagebox.showerror("Error with arduino!", "Connection Error with arduino: \n%s" % e)
                 for axis in g.AXES:  # set polarity switch attributes in axis objects to "Unknown"
                     axis.polarity_switched = "Unknown"
                 self.connected = "Connection Error"  # update own connection status
@@ -347,7 +347,7 @@ def shut_down_all():  # safe shutdown at program end or on error
         ui_print("Z PSU not connected, can't deactivate.")
         message += "\nZ PSU not connected, can't deactivate."
 
-    # Shut down Arduino:
+    # Shut down arduino:
     try:
         g.ARDUINO.safe()  # call safe method in ArduinoCtrl class (all relay pins to LOW)
     except BaseException as e:  # some error occurred
diff --git a/config_handling.py b/src/config_handling.py
similarity index 99%
rename from config_handling.py
rename to src/config_handling.py
index 66ef1fd..3b49065 100644
--- a/config_handling.py
+++ b/src/config_handling.py
@@ -9,7 +9,7 @@ from tkinter import messagebox
 import globals as g
 import cage_func as func
 # noinspection PyPep8Naming
-import User_Interface as ui
+import user_interface as ui
 
 global CONFIG_FILE  # string storing the path of the used config file
 global CONFIG_OBJECT  # object of type ConfigParser(), storing all configuration information
diff --git a/csv_logging.py b/src/csv_logging.py
similarity index 98%
rename from csv_logging.py
rename to src/csv_logging.py
index a04636e..3f20df5 100644
--- a/csv_logging.py
+++ b/src/csv_logging.py
@@ -1,5 +1,5 @@
 # This file contains functions related to logging data from the program to a CSV file.
-# They are mainly but not only called by the ConfigureLogging class in User_Interface.py.
+# They are mainly but not only called by the ConfigureLogging class in user_interface.py.
 
 # import packages
 import pandas as pd
@@ -10,7 +10,7 @@ from tkinter import messagebox
 
 # import other project files
 import globals as g
-import User_Interface as ui
+import user_interface as ui
 
 log_data = pd.DataFrame()  # pandas data frame containing the logged data, in-program representation of csv/excel data
 unsaved_data = False  # Bool to indicate if there is unsaved data, set to True each time a datapoint is logged
diff --git a/csv_threading.py b/src/csv_threading.py
similarity index 99%
rename from csv_threading.py
rename to src/csv_threading.py
index 7793dcf..e98ee43 100644
--- a/csv_threading.py
+++ b/src/csv_threading.py
@@ -11,7 +11,7 @@ from tkinter import messagebox
 import matplotlib.pyplot as plt
 
 # import other project files:
-import User_Interface as ui
+import user_interface as ui
 import cage_func as func
 import globals as g
 
diff --git a/globals.py b/src/globals.py
similarity index 94%
rename from globals.py
rename to src/globals.py
index 46e8024..e38c910 100644
--- a/globals.py
+++ b/src/globals.py
@@ -44,8 +44,8 @@ default_arrays = {
 }
 # Dictionary for PSU serial ports:
 default_ports = {
-    "xy_port": "COM1",  # Default serial port where PSU for X- and Y-Axes is connected
-    "z_port": "COM2",  # Default serial port where PSU for Z-Axis is connected
+    "xy_port": "COM8",  # Default serial port where PSU for X- and Y-Axes is connected
+    "z_port": "COM5",  # Default serial port where PSU for Z-Axis is connected
 }
 
 # Configuration for socket interface
diff --git a/main.py b/src/main.py
similarity index 97%
rename from main.py
rename to src/main.py
index 40275c5..25421a8 100644
--- a/main.py
+++ b/src/main.py
@@ -7,9 +7,9 @@ from tkinter import messagebox
 
 # import other project files:
 import cage_func as func
-from User_Interface import HelmholtzGUI
-from User_Interface import ui_print
-import User_Interface as ui
+from user_interface import HelmholtzGUI
+from user_interface import ui_print
+import user_interface as ui
 import globals as g
 import config_handling as config
 import csv_logging as log
diff --git a/pyps2000b/LICENSE b/src/ps2000b/LICENSE
similarity index 100%
rename from pyps2000b/LICENSE
rename to src/ps2000b/LICENSE
diff --git a/pyps2000b/PS2000B.py b/src/ps2000b/PS2000B.py
similarity index 100%
rename from pyps2000b/PS2000B.py
rename to src/ps2000b/PS2000B.py
diff --git a/pyps2000b/README.md b/src/ps2000b/README.md
similarity index 100%
rename from pyps2000b/README.md
rename to src/ps2000b/README.md
diff --git a/pyps2000b/__init__.py b/src/ps2000b/__init__.py
similarity index 100%
rename from pyps2000b/__init__.py
rename to src/ps2000b/__init__.py
diff --git a/socket_control.py b/src/socket_control.py
similarity index 99%
rename from socket_control.py
rename to src/socket_control.py
index 24630c2..1de51c0 100644
--- a/socket_control.py
+++ b/src/socket_control.py
@@ -1,5 +1,5 @@
 import globals as g
-from User_Interface import ui_print
+from user_interface import ui_print
 import cage_func as cage_controls
 
 from threading import Thread
diff --git a/User_Interface.py b/src/user_interface.py
similarity index 100%
rename from User_Interface.py
rename to src/user_interface.py
diff --git a/test.csv b/test.csv
deleted file mode 100644
index dfe124f..0000000
--- a/test.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-Date;Time;t (s);X PSU Status;Y PSU Status;Z PSU Status;X Voltage Setpoint;Y Voltage Setpoint;Z Voltage Setpoint;X Actual Voltage;Y Actual Voltage;Z Actual Voltage;X Current Setpoint;Y Current Setpoint;Z Current Setpoint;X Actual Current;Y Actual Current;Z Actual Current;X Target Field;Y Target Field;Z Target Field;X Trgt. Field Raw;Y Trgt. Field Raw;Z Trgt. Field Raw;X Target Current;Y Target Current;Z Target Current;X Inverted;Y Inverted;Z Inverted
-2021-03-22;10:58:32,248216;0,0;Not Connected;Not Connected;Not Connected;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;Unknown;Unknown;Unknown
-2021-03-22;10:58:33,262910;1,014694;Not Connected;Not Connected;Not Connected;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;Unknown;Unknown;Unknown
-2021-03-22;10:58:34,271188;2,022972;Not Connected;Not Connected;Not Connected;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;Unknown;Unknown;Unknown