Merge pull request #42 from MWLCDev/Refactor_codebase

Refactor codebase
MWLCDev · Oct 11, 2024 · 507ca5b · 507ca5b
2 parents 54a7c28 + 1f9aaaa
commit 507ca5b
Show file tree

Hide file tree

Showing 228 changed files with 519 additions and 2,661 deletions.
diff --git a/.github/workflows/docker-compose-test.yml b/.github/workflows/docker-compose-test.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,8 @@
 {
     "cSpell.words": [
+      "BYODR",
       "GPIO",
+      "Jetson",
       "teleop"
     ],
     "python.analysis.typeCheckingMode": "off",

diff --git a/...i/BYODR_utils/NANO_specific/gpio_relay.py → BYODR_utils/JETSON_specific/gpio_relay.py b/...i/BYODR_utils/NANO_specific/gpio_relay.py → BYODR_utils/JETSON_specific/gpio_relay.py
@@ -2,10 +2,10 @@
 
 import threading
 
-import Jetson.GPIO as GPIO
+import Jetson.GPIO as GPIO  # type: ignore
 
 
-class ThreadSafeGpioRelay(object):
+class ThreadSafeJetsonGpioRelay(object):
     """
     Thread-safe class for managing a GPIO relay on a Jetson Nano.
     """

diff --git a/raspi/BYODR_utils/NANO_specific/utilities.py → BYODR_utils/JETSON_specific/utilities.py b/raspi/BYODR_utils/NANO_specific/utilities.py → BYODR_utils/JETSON_specific/utilities.py
diff --git a/raspi/BYODR_utils/PI_specific/gpio_relay.py → BYODR_utils/PI_specific/gpio_relay.py b/raspi/BYODR_utils/PI_specific/gpio_relay.py → BYODR_utils/PI_specific/gpio_relay.py
diff --git a/raspi/BYODR_utils/PI_specific/utilities.py → BYODR_utils/PI_specific/utilities.py b/raspi/BYODR_utils/PI_specific/utilities.py → BYODR_utils/PI_specific/utilities.py
diff --git a/raspi/BYODR_utils/common/__init__.py → BYODR_utils/common/__init__.py b/raspi/BYODR_utils/common/__init__.py → BYODR_utils/common/__init__.py
diff --git a/raspi/BYODR_utils/common/ipc.py → BYODR_utils/common/ipc.py b/raspi/BYODR_utils/common/ipc.py → BYODR_utils/common/ipc.py
diff --git a/common/byodr/utils/location.py → BYODR_utils/common/location.py b/common/byodr/utils/location.py → BYODR_utils/common/location.py
diff --git a/raspi/BYODR_utils/common/navigate.py → BYODR_utils/common/navigate.py b/raspi/BYODR_utils/common/navigate.py → BYODR_utils/common/navigate.py
diff --git a/common/byodr/utils/option.py → BYODR_utils/common/option.py b/common/byodr/utils/option.py → BYODR_utils/common/option.py
diff --git a/raspi/BYODR_utils/common/protocol.py → BYODR_utils/common/protocol.py b/raspi/BYODR_utils/common/protocol.py → BYODR_utils/common/protocol.py
diff --git a/raspi/BYODR_utils/common/ssh.py → BYODR_utils/common/ssh.py b/raspi/BYODR_utils/common/ssh.py → BYODR_utils/common/ssh.py
diff --git a/common/byodr/utils/testing.py → BYODR_utils/common/testing.py b/common/byodr/utils/testing.py → BYODR_utils/common/testing.py
diff --git a/raspi/BYODR_utils/common/usbrelay.py → BYODR_utils/common/usbrelay.py b/raspi/BYODR_utils/common/usbrelay.py → BYODR_utils/common/usbrelay.py
diff --git a/common/byodr/utils/video.py → BYODR_utils/common/video.py b/common/byodr/utils/video.py → BYODR_utils/common/video.py
diff --git a/common/byodr/utils/websocket.py → BYODR_utils/common/websocket.py b/common/byodr/utils/websocket.py → BYODR_utils/common/websocket.py
diff --git a/README.md b/README.md
@@ -21,3 +21,8 @@ We went ahead and designed a rover that can be assembled from **generally availa
 * Community driven self-driving models
 * Dockerized
 * Free for personal use
+* Ability to work with modular hardware
+
+## License
+
+This project is licensed under the MIT License. See the [LICENSE](./LICENSE) file for more information.
diff --git a/Services_Documentation.txt b/Services_Documentation.txt
diff --git a/pilot/pilot/tests.py → archived/PIL/tests.py b/pilot/pilot/tests.py → archived/PIL/tests.py
@@ -8,9 +8,9 @@
 
 from app import CommandProcessor
 from app import PilotApplication
-from byodr.utils import timestamp
-from byodr.utils.navigate import ReloadableDataSource, FileSystemRouteDataSource
-from byodr.utils.testing import CollectPublisher, QueueReceiver, CollectServer
+from BYODR_utils.common import timestamp
+from BYODR_utils.common.navigate import ReloadableDataSource, FileSystemRouteDataSource
+from BYODR_utils.common.testing import CollectPublisher, QueueReceiver, CollectServer
 
 
 def test_create_and_setup(tmpdir):

diff --git a/pilot/pilot/tests_relay.py → archived/PIL/tests_relay.py b/pilot/pilot/tests_relay.py → archived/PIL/tests_relay.py
@@ -8,9 +8,9 @@
 from six.moves import range
 from six.moves.configparser import SafeConfigParser
 
-from byodr.utils import timestamp
-from byodr.utils.testing import QueueReceiver, CollectServer, CollectJSONClient
-from byodr.utils.usbrelay import SearchUsbRelayFactory
+from BYODR_utils.common import timestamp
+from BYODR_utils.common.testing import QueueReceiver, CollectServer, CollectJSONClient
+from BYODR_utils.common.usbrelay import SearchUsbRelayFactory
 from relay import MonitorApplication
 
 

diff --git a/.../archive/bionic-cp39-gstreamer.dockerfile → ...d/docker/bionic-cp39-gstreamer.dockerfile b/.../archive/bionic-cp39-gstreamer.dockerfile → ...d/docker/bionic-cp39-gstreamer.dockerfile
diff --git a/...rchive/bullseye-cp39-gstreamer.dockerfile → ...docker/bullseye-cp39-gstreamer.dockerfile b/...rchive/bullseye-cp39-gstreamer.dockerfile → ...docker/bullseye-cp39-gstreamer.dockerfile
diff --git a/...er/archive/jp42-nano-cp36-base.dockerfile → ...ved/docker/jp42-nano-cp36-base.dockerfile b/...er/archive/jp42-nano-cp36-base.dockerfile → ...ved/docker/jp42-nano-cp36-base.dockerfile
diff --git a/...rchive/jp42-nano-cp36-tensorrt.dockerfile → ...docker/jp42-nano-cp36-tensorrt.dockerfile b/...rchive/jp42-nano-cp36-tensorrt.dockerfile → ...docker/jp42-nano-cp36-tensorrt.dockerfile
diff --git a/...jp42-nano-cp36-tf115-opencv440.dockerfile → ...jp42-nano-cp36-tf115-opencv440.dockerfile b/...jp42-nano-cp36-tf115-opencv440.dockerfile → ...jp42-nano-cp36-tf115-opencv440.dockerfile
diff --git a/...r/archive/jp42-nano-cp36-tf115.dockerfile → ...ed/docker/jp42-nano-cp36-tf115.dockerfile b/...r/archive/jp42-nano-cp36-tf115.dockerfile → ...ed/docker/jp42-nano-cp36-tf115.dockerfile
diff --git a/docker/archive/pi-cp27-gpio.dockerfile → archived/docker/pi-cp27-gpio.dockerfile b/docker/archive/pi-cp27-gpio.dockerfile → archived/docker/pi-cp27-gpio.dockerfile
diff --git a/docker/archive/pi-cp37-odrive.dockerfile → archived/docker/pi-cp37-odrive.dockerfile b/docker/archive/pi-cp37-odrive.dockerfile → archived/docker/pi-cp37-odrive.dockerfile
diff --git a/docker/archive/pure-ftpd.dockerfile → archived/docker/pure-ftpd.dockerfile b/docker/archive/pure-ftpd.dockerfile → archived/docker/pure-ftpd.dockerfile
diff --git a/inference/runtime-cp36-x86.dockerfile → archived/docker/runtime-cp36-x86.dockerfile b/inference/runtime-cp36-x86.dockerfile → archived/docker/runtime-cp36-x86.dockerfile
diff --git a/docker/archive/tf113-jp43.dockerfile → archived/docker/tf113-jp43.dockerfile b/docker/archive/tf113-jp43.dockerfile → archived/docker/tf113-jp43.dockerfile
diff --git a/docker/archive/zerotier.dockerfile → archived/docker/zerotier.dockerfile b/docker/archive/zerotier.dockerfile → archived/docker/zerotier.dockerfile
diff --git a/archived/exr/app.py b/archived/exr/app.py
@@ -18,8 +18,8 @@
 from can import CanError
 from pyueye import ueye
 
-from byodr.utils import timestamp
-from byodr.utils.ipc import ReceiverThread, JSONPublisher, ImagePublisher
+from BYODR_utils.common import timestamp
+from BYODR_utils.common.ipc import ReceiverThread, JSONPublisher, ImagePublisher
 from camera import Camera, FrameThread
 
 logger = logging.getLogger(__name__)

diff --git a/archived/odometry.py b/archived/odometry.py
@@ -5,8 +5,8 @@
 
 from gpiozero import DigitalInputDevice
 
-from byodr.utils import timestamp
-from byodr.utils.ipc import JSONPublisher
+from BYODR_utils.common import timestamp
+from BYODR_utils.common.ipc import JSONPublisher
 
 logger = logging.getLogger(__name__)
 log_format = "%(levelname)s: %(filename)s %(funcName)s %(message)s"

diff --git a/teleop/teleop/tests.py → archived/tests.py b/teleop/teleop/tests.py → archived/tests.py
@@ -2,7 +2,7 @@
 import multiprocessing
 from six.moves.configparser import SafeConfigParser
 
-from .app import TeleopApplication
+from ..jetson_runtime.teleop.teleop.app import TeleopApplication
 from io import open
 
 

diff --git a/vehicles/rover/tests_rover.py → archived/tests_rover.py b/vehicles/rover/tests_rover.py → archived/tests_rover.py
@@ -3,7 +3,7 @@
 from ConfigParser import SafeConfigParser
 
 from app import RoverApplication
-from byodr.utils.testing import CollectPublisher, QueueReceiver, CollectServer
+from BYODR_utils.common.testing import CollectPublisher, QueueReceiver, CollectServer
 
 
 def test_rover_create_and_setup(tmpdir):