diff options
Diffstat (limited to '')
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | System/Pendulum/__init__.py | 3 | ||||
| -rw-r--r-- | System/Pendulum/encoder.py (renamed from System/encoder.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/errorTestScript.py (renamed from System/errorTestScript.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/homework8.ipynb (renamed from System/homework8.ipynb) | 0 | ||||
| -rw-r--r-- | System/Pendulum/initialize_system.py (renamed from System/initialize_system.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/motor.py (renamed from System/motor.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/results.csv (renamed from System/results.csv) | 0 | ||||
| -rw-r--r-- | System/Pendulum/swingUp.py (renamed from System/swingUp.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/system.py (renamed from System/system.py) | 4 | ||||
| -rw-r--r-- | System/Pendulum/system_swingup_test.py (renamed from System/system_swingup_test.py) | 0 | ||||
| -rw-r--r-- | System/Pendulum/system_swingup_test_2.py (renamed from System/system_swingup_test_2.py) | 0 | ||||
| -rw-r--r-- | System/Tests/donovanTestScript.py (renamed from System/donovanTestScript.py) | 0 | ||||
| -rw-r--r-- | System/Tests/samTestScript.py (renamed from System/samTestScript.py) | 0 | ||||
| -rw-r--r-- | System/Tests/test_Encoder.py (renamed from System/test_Encoder.py) | 0 | ||||
| -rw-r--r-- | System/Tests/test_Motor.py (renamed from System/test_Motor.py) | 0 | ||||
| -rw-r--r-- | System/Tests/test_Return_Home.py (renamed from System/test_Return_Home.py) | 0 | ||||
| -rw-r--r-- | System/Tests/test_System.py (renamed from System/test_System.py) | 0 | ||||
| -rw-r--r-- | System/__init__.py | 0 | ||||
| -rw-r--r-- | System/setup.py | 16 |
20 files changed, 22 insertions, 2 deletions
@@ -8,6 +8,7 @@ The structure for the repository is as follows: ``` ├── System (folder) │ ├── system.py (the main Python script) +│ ├── pendulum.py (here be dragons) │ └── motor.py (the motor controller) ├── Web (folder) │ └── * diff --git a/System/Pendulum/__init__.py b/System/Pendulum/__init__.py new file mode 100644 index 0000000..510ffea --- /dev/null +++ b/System/Pendulum/__init__.py @@ -0,0 +1,3 @@ +from .motor import Motor +from system import System +from encoder import Encoder
\ No newline at end of file diff --git a/System/encoder.py b/System/Pendulum/encoder.py index ece7fd1..ece7fd1 100644 --- a/System/encoder.py +++ b/System/Pendulum/encoder.py diff --git a/System/errorTestScript.py b/System/Pendulum/errorTestScript.py index cb029d5..cb029d5 100644 --- a/System/errorTestScript.py +++ b/System/Pendulum/errorTestScript.py diff --git a/System/homework8.ipynb b/System/Pendulum/homework8.ipynb index a9c28c9..a9c28c9 100644 --- a/System/homework8.ipynb +++ b/System/Pendulum/homework8.ipynb diff --git a/System/initialize_system.py b/System/Pendulum/initialize_system.py index 38b7134..38b7134 100644 --- a/System/initialize_system.py +++ b/System/Pendulum/initialize_system.py diff --git a/System/motor.py b/System/Pendulum/motor.py index 427d393..427d393 100644 --- a/System/motor.py +++ b/System/Pendulum/motor.py diff --git a/System/results.csv b/System/Pendulum/results.csv index ca22685..ca22685 100644 --- a/System/results.csv +++ b/System/Pendulum/results.csv diff --git a/System/swingUp.py b/System/Pendulum/swingUp.py index fb5d4c0..fb5d4c0 100644 --- a/System/swingUp.py +++ b/System/Pendulum/swingUp.py diff --git a/System/system.py b/System/Pendulum/system.py index 49c35d2..21439aa 100644 --- a/System/system.py +++ b/System/Pendulum/system.py @@ -1,6 +1,6 @@ #!/usr/bin/env python
-from motor import Motor
-from encoder import Encoder
+from .motor import Motor
+from .encoder import Encoder
import math
from datetime import datetime
from time import sleep
diff --git a/System/system_swingup_test.py b/System/Pendulum/system_swingup_test.py index e13c7ca..e13c7ca 100644 --- a/System/system_swingup_test.py +++ b/System/Pendulum/system_swingup_test.py diff --git a/System/system_swingup_test_2.py b/System/Pendulum/system_swingup_test_2.py index fc02ed6..fc02ed6 100644 --- a/System/system_swingup_test_2.py +++ b/System/Pendulum/system_swingup_test_2.py diff --git a/System/donovanTestScript.py b/System/Tests/donovanTestScript.py index 4a51f08..4a51f08 100644 --- a/System/donovanTestScript.py +++ b/System/Tests/donovanTestScript.py diff --git a/System/samTestScript.py b/System/Tests/samTestScript.py index 5f9312f..5f9312f 100644 --- a/System/samTestScript.py +++ b/System/Tests/samTestScript.py diff --git a/System/test_Encoder.py b/System/Tests/test_Encoder.py index bb6e3e4..bb6e3e4 100644 --- a/System/test_Encoder.py +++ b/System/Tests/test_Encoder.py diff --git a/System/test_Motor.py b/System/Tests/test_Motor.py index f48b6ee..f48b6ee 100644 --- a/System/test_Motor.py +++ b/System/Tests/test_Motor.py diff --git a/System/test_Return_Home.py b/System/Tests/test_Return_Home.py index 04e19cb..04e19cb 100644 --- a/System/test_Return_Home.py +++ b/System/Tests/test_Return_Home.py diff --git a/System/test_System.py b/System/Tests/test_System.py index c05affc..c05affc 100644 --- a/System/test_System.py +++ b/System/Tests/test_System.py diff --git a/System/__init__.py b/System/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/System/__init__.py +++ /dev/null diff --git a/System/setup.py b/System/setup.py new file mode 100644 index 0000000..6ec0825 --- /dev/null +++ b/System/setup.py @@ -0,0 +1,16 @@ +from setuptools import setup + +setup( + name='Pendulum', + version='0.1.0', + description='A package to run commands on remote servers', + url='https://github.com/UMN-EE4951W-Lamperski/pendulum', + author='EE 4951W Team', + author_email='', + packages=['Pendulum'], + classifiers=[ + 'Development Status :: 1 - Planning', + 'Intended Audience :: Science/Research', + ], + python_requires=">=3.8", +)
\ No newline at end of file |