From 2705bd0e64cadabf974d0936783e1c5b0b273db8 Mon Sep 17 00:00:00 2001
From: Boris <boris@workfloor.com>
Date: Tue, 28 Jan 2025 20:13:12 +0100
Subject: [PATCH] bugfixes

---
 communicator/communicator_raw.py  | 5 +++--
 joystick/sjoel_joystick_simple.py | 2 +-
 main.py                           | 8 +++-----
 mygpio/__init__.py                | 2 +-
 settings/device_settings.py       | 3 ---
 shutdown_helper.py                | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/communicator/communicator_raw.py b/communicator/communicator_raw.py
index b1e8996..46ade3a 100644
--- a/communicator/communicator_raw.py
+++ b/communicator/communicator_raw.py
@@ -1,7 +1,8 @@
-import time
 import threading
+import time
 
-import mygpio as pigpio
+# import mygpio as pigpio
+import pigpio
 
 from controller.sjoel_controller_base import MovementDirection
 from settings.raw_controls_settings import RawControlsSettings
diff --git a/joystick/sjoel_joystick_simple.py b/joystick/sjoel_joystick_simple.py
index ac4a0bc..2813023 100644
--- a/joystick/sjoel_joystick_simple.py
+++ b/joystick/sjoel_joystick_simple.py
@@ -1,7 +1,7 @@
 import pigpio
 
 from controller.sjoel_controller_base import SjoelControllerBase, MovementDirection
-from settings.joystick_settings import JoystickSettings, PullDirection
+from settings.joystick_settings import JoystickSettings
 
 
 class SjoelJoystickSimple:
diff --git a/main.py b/main.py
index aa7b47a..f9902ad 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,12 @@
 import argparse
 import time
 
+from communicator.communicator_raw import CommunicatorRaw
+from controller.sjoel_controller_raw import SjoelControllerRaw
 from joystick.sjoel_joystick_simple import SjoelJoystickSimple
 from server.sjoel_server_socket import SjoelServerSocket
 from settings.device_settings import DeviceSettings
 from settings.hosting_settings import HostingSettings
-from communicator.communicator_raw import CommunicatorRaw
-from controller.sjoel_controller_raw import SjoelControllerRaw
 
 
 def parse_hosting_settings() -> HostingSettings:
@@ -15,13 +15,11 @@ def parse_hosting_settings() -> HostingSettings:
     parser.add_argument('--interface', default='0.0.0.0', type=str,
                         help='Override interface to listen on, default: 0.0.0.0')
     parser.add_argument('--port', default=5000, type=int, help='Override port to listen on, default: 5000')
-    parser.add_argument('--serial', type=str, help='Override the serial port the robot is connected to')
-    parser.add_argument('--baud', type=int, help='Override the baud rate of the serial connection')
     parser.add_argument('--debug', help='Enables debug logging', action='store_true')
     parser.add_argument('--mock', help='Enables the mock controller', action='store_true')
     args = parser.parse_args()
 
-    return HostingSettings(args.config, args.interface, args.port, args.debug, args.mock, args.serial, args.baud)
+    return HostingSettings(args.config, args.interface, args.port, args.debug, args.mock)
 
 
 def create_app(config: HostingSettings | None = None):
diff --git a/mygpio/__init__.py b/mygpio/__init__.py
index 0277b57..51c04e5 100644
--- a/mygpio/__init__.py
+++ b/mygpio/__init__.py
@@ -1,2 +1,2 @@
+from .pi import OUTPUT, INPUT
 from .pi import pi
-from .pi import OUTPUT, INPUT
\ No newline at end of file
diff --git a/settings/device_settings.py b/settings/device_settings.py
index da41e3c..7b44667 100644
--- a/settings/device_settings.py
+++ b/settings/device_settings.py
@@ -1,9 +1,6 @@
-import enum
-
 import toml
 from pydantic import BaseModel
 
-from settings.gcode_settings import GcodeSettings
 from settings.joystick_settings import JoystickSettings
 from settings.raw_controls_settings import RawControlsSettings
 
diff --git a/shutdown_helper.py b/shutdown_helper.py
index c02fe91..c53724b 100644
--- a/shutdown_helper.py
+++ b/shutdown_helper.py
@@ -1,6 +1,6 @@
-import time
 import os
 import threading
+import time
 
 
 class ShutdownHelper: