Fix some naming, imports

walmis · Apr 19, 2024 · 6030e7a · 6030e7a
1 parent 8b6ec29
commit 6030e7a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 35 deletions.
diff --git a/telemffb/telem/SimConnectManager.py b/telemffb/telem/SimConnectManager.py
@@ -50,14 +50,14 @@ def dbprint(color, msg):
 
 
 class SimVar:
-    def __init__(self, name, var, sc_unit, unit=None, type=DATATYPE_FLOAT64, scale=None, mutator=None):
+    def __init__(self, name, var, sc_unit, unit=None, datatype=DATATYPE_FLOAT64, scale=None, mutator=None):
         self.name = name
         self.var = var
         self.scale = scale
         self.mutator = mutator
         self.sc_unit = sc_unit
         self.unit = unit
-        self.datatype = type
+        self.datatype = datatype
         self.parent = None
         self.index = None # index for multivariable simvars
         if self.sc_unit.lower() in ["bool", "enum"]:
@@ -121,7 +121,7 @@ class SimConnectManager(threading.Thread):
 
     sim_vars = [
         SimVar("T", "ABSOLUTE TIME","Seconds" ),
-        SimVar("N", "TITLE", "", type=DATATYPE_STRING128),
+        SimVar("N", "TITLE", "", datatype=DATATYPE_STRING128),
         SimVar("G", "G FORCE", "Number"),
         SimVarArray("AccBody", "ACCELERATION BODY <>", "feet per second squared", scale=0.031081, keywords=("X", "Y", "Z")), #scale fps/s to g
         SimVar("TAS", "AIRSPEED TRUE", "meter/second"),
@@ -167,10 +167,10 @@ class SimConnectManager(threading.Thread):
         SimVar("Parked", "PLANE IN PARKING STATE", "Bool"),
         SimVar("Slew", "IS SLEW ACTIVE", "Bool"),
         SimVar("SurfaceType", "SURFACE TYPE", "Enum", mutator=lambda x: surface_types.get(x, "unknown")),
-        SimVar("SimconnectCategory", "CATEGORY", "", type=DATATYPE_STRING128),
+        SimVar("SimconnectCategory", "CATEGORY", "", datatype=DATATYPE_STRING128),
         SimVar("EngineType", "ENGINE TYPE", "Enum"),
         SimVarArray("EngRPM", "GENERAL ENG PCT MAX RPM", "percent", min=1, max=4),
-        SimVar("NumEngines", "NUMBER OF ENGINES", "Number", type=DATATYPE_INT32),
+        SimVar("NumEngines", "NUMBER OF ENGINES", "Number", datatype=DATATYPE_INT32),
         SimVarArray("AmbWind", "AMBIENT WIND <>", "meter/second", keywords= ("X", "Y", "Z")),
         SimVarArray("VelWorld", "VELOCITY WORLD <>", "meter/second", keywords= ("X", "Y", "Z")),
         SimVarArray("WeightOnWheels", "CONTACT POINT COMPRESSION", "Number", min=0, max=2),
@@ -191,7 +191,7 @@ class SimConnectManager(threading.Thread):
 
     ]
 
-    def __init__(self, unique_id):
+    def __init__(self):
         threading.Thread.__init__(self, daemon=True)
         self.sc = None
         self._quit = False
@@ -213,8 +213,8 @@ def __init__(self, unique_id):
         self.sv_dict = {}
 
 
-    def addSimVar(self, name, var, sc_unit, unit=None, type=DATATYPE_FLOAT64, scale=None, mutator=None):
-        self.temp_sim_vars.append(SimVar(name, var, sc_unit, unit=unit, type=type, scale=scale, mutator=mutator))
+    def add_simvar(self, name, var, sc_unit, unit=None, datatype=DATATYPE_FLOAT64, scale=None, mutator=None):
+        self.temp_sim_vars.append(SimVar(name, var, sc_unit, unit=unit, datatype=datatype, scale=scale, mutator=mutator))
 
     def substitute_simvars(self):
         # build a combined list of the pre-defined simvars from __init__ and any new/updated simvars that have been set by a model
@@ -479,7 +479,7 @@ def emit_packet(self, data):
     while True:
         time.sleep(1)
         if not tst_executed and time.time() > 5:
-            s.addSimVar("APMaster", "L:ApMode", "Enum")
-            s.addSimVar("PropThrust", "L:Eng1_RPM", "number")
+            s.add_simvar("APMaster", "L:ApMode", "Enum")
+            s.add_simvar("PropThrust", "L:Eng1_RPM", "number")
             s._subscribe()
             tst_executed = True
diff --git a/telemffb/telem/SimConnectSock.py b/telemffb/telem/SimConnectSock.py
@@ -8,11 +8,7 @@
 
 class SimConnectSock(SimConnectManager):
     def __init__(self, telem: TelemManager):
-        if not unique_id:
-            # TODO: maybe use process PID here?
-            unique_id = int(G.device_usbpid)
-
-        super().__init__(unique_id)
+        super().__init__()
         telem.set_simconnect(self)
         self._telem = telem
 

diff --git a/telemffb/telem/TelemManager.py b/telemffb/telem/TelemManager.py
@@ -305,7 +305,7 @@ def process_data(self, data):
                 if data_source == "MSFS2020" and aircraft_name != '':
                     d1 = xmlutils.read_sc_overrides(aircraft_name)
                     for sv in d1:
-                        self._simconnect.addSimVar(name=sv['name'], var=sv['var'], sc_unit=sv['sc_unit'], scale=sv['scale'])
+                        self._simconnect.add_simvar(name=sv['name'], var=sv['var'], sc_unit=sv['sc_unit'], scale=sv['scale'])
                     self._simconnect._resubscribe()
 
                 if G.settings_mgr.isVisible():
@@ -342,7 +342,7 @@ def process_data(self, data):
                 if data_source == "MSFS2020" and aircraft_name != '':
                     d1 = xmlutils.read_sc_overrides(aircraft_name)
                     for sv in d1:
-                        self._simconnect.addSimVar(name=sv['name'], var=sv['var'], sc_unit=sv['sc_unit'], scale=sv['scale'])
+                        self._simconnect.add_simvar(name=sv['name'], var=sv['var'], sc_unit=sv['sc_unit'], scale=sv['scale'])
                     self._simconnect._resubscribe()
 
                 self.aircraftUpdated.emit()

diff --git a/telemffb/utils.py b/telemffb/utils.py
@@ -28,24 +28,8 @@
 import logging
 import sys
 
-from PyQt5.QtCore import QThread, pyqtSignal, QObject, QSettings
-from PyQt5.QtGui import QTextCharFormat, QColor
-
-from PyQt5 import QtCore, QtGui, Qt
-from PyQt5.QtWidgets import QFileDialog, QMessageBox
-
-from telemffb.custom_widgets import QMessageBox
-from telemffb.settingsmanager import QFileDialog, QMessageBox, SettingsWindow
-import telemffb.globals as G
-import telemffb.utils as utils
-import telemffb.winpaths as winpaths
-
-import logging
 import winreg
 import socket
-import math
-import time
-import random
 import time
 import zlib
 import subprocess
@@ -54,9 +38,19 @@
 import ssl
 import xml.etree.ElementTree as ET
 
-import telemffb.xmlutils as xmlutils
+from PyQt5.QtCore import QThread, pyqtSignal, QObject, QSettings
+from PyQt5.QtGui import QTextCharFormat, QColor
+
+from PyQt5 import QtCore, QtGui, Qt
+from PyQt5.QtWidgets import QFileDialog, QMessageBox
 import stransi
 
+from telemffb.settingsmanager import SettingsWindow
+import telemffb.globals as G
+import telemffb.winpaths as winpaths
+
+import telemffb.xmlutils as xmlutils
+
 
 class SignalEmitter(QObject):
     error_signal = pyqtSignal(str)
@@ -187,7 +181,7 @@ def get_translation(cls, key):
 
 
 class Destroyable:
-    def destroy():
+    def destroy(self):
         raise NotImplementedError