Merge pull request #80 from maartentamboer/feature/use-submodule

Feature/use submodule
maartentamboer · Aug 18, 2021 · 31600c9 · 31600c9
2 parents ed1fafc + fb71fe6
commit 31600c9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 176 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "MSFSPythonSimConnectMobiFlightExtension"]
+	path = MSFSPythonSimConnectMobiFlightExtension
+	url = https://github.com/Koseng/MSFSPythonSimConnectMobiFlightExtension.git
diff --git a/MSFSPythonSimConnectMobiFlightExtension b/MSFSPythonSimConnectMobiFlightExtension
diff --git a/SimConnectMobiflight/mobiflight_variable_requests.py b/SimConnectMobiflight/mobiflight_variable_requests.py
diff --git a/SimConnectMobiflight/simconnect_mobiflight.py b/SimConnectMobiflight/simconnect_mobiflight.py
diff --git a/conditionalrunner.py b/conditionalrunner.py
@@ -2,8 +2,8 @@
 from globalstorage import GlobalStorage
 
 from SimConnect import Event
-from SimConnectMobiflight.simconnect_mobiflight import SimConnectMobiFlight
-from SimConnectMobiflight.mobiflight_variable_requests import MobiFlightVariableRequests
+from MSFSPythonSimConnectMobiFlightExtension.src.simconnect_mobiflight import SimConnectMobiFlight
+from MSFSPythonSimConnectMobiFlightExtension.src.mobiflight_variable_requests import MobiFlightVariableRequests
 
 env = Environment(
     autoescape=select_autoescape(['html', 'xml'])

diff --git a/globalstorage.py b/globalstorage.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from SimConnect import AircraftEvents, AircraftRequests
-from SimConnectMobiflight.mobiflight_variable_requests import MobiFlightVariableRequests
+from MSFSPythonSimConnectMobiFlightExtension.src.mobiflight_variable_requests import MobiFlightVariableRequests
 
 from singleton import Singleton
 from rotaryencoder import RotaryEncoder

diff --git a/main.py b/main.py
@@ -1,8 +1,8 @@
 import time
 import logging
 from SimConnect import AircraftEvents, AircraftRequests
-from SimConnectMobiflight.simconnect_mobiflight import SimConnectMobiFlight
-from SimConnectMobiflight.mobiflight_variable_requests import MobiFlightVariableRequests
+from MSFSPythonSimConnectMobiFlightExtension.src.simconnect_mobiflight import SimConnectMobiFlight
+from MSFSPythonSimConnectMobiFlightExtension.src.mobiflight_variable_requests import MobiFlightVariableRequests
 from rotaryencoder import RotaryEncoder
 from pushbutton import PushButton
 from fader import Fader