mirror of
https://github.com/naruxde/revpipyload.git
synced 2025-11-08 15:13:52 +01:00
Bugfix of imports and wordorder for revpi commander
This commit is contained in:
@@ -13,7 +13,6 @@ import pickle
|
|||||||
from xmlrpc.client import Binary
|
from xmlrpc.client import Binary
|
||||||
|
|
||||||
import revpimodio2
|
import revpimodio2
|
||||||
from revpimodio2.io import StructIO
|
|
||||||
|
|
||||||
from . import proginit
|
from . import proginit
|
||||||
|
|
||||||
@@ -92,7 +91,7 @@ class ProcimgServer:
|
|||||||
io._bitaddress,
|
io._bitaddress,
|
||||||
io._byteorder,
|
io._byteorder,
|
||||||
io._signed,
|
io._signed,
|
||||||
io.wordorder if issubclass(io, StructIO) else "ignored"
|
getattr(io, "wordorder", "ignored"),
|
||||||
])
|
])
|
||||||
return Binary(pickle.dumps(dict_ios))
|
return Binary(pickle.dumps(dict_ios))
|
||||||
|
|
||||||
|
|||||||
@@ -417,7 +417,7 @@ class RevPiPyLoad:
|
|||||||
|
|
||||||
# Erweiterte Funktionen anmelden
|
# Erweiterte Funktionen anmelden
|
||||||
try:
|
try:
|
||||||
import procimgserver
|
from . import procimgserver
|
||||||
except Exception:
|
except Exception:
|
||||||
self.xml_ps = None
|
self.xml_ps = None
|
||||||
proginit.logger.warning(
|
proginit.logger.warning(
|
||||||
@@ -496,7 +496,7 @@ class RevPiPyLoad:
|
|||||||
th_plc = None
|
th_plc = None
|
||||||
if self.mqtt:
|
if self.mqtt:
|
||||||
try:
|
try:
|
||||||
from mqttserver import MqttServer
|
from .mqttserver import MqttServer
|
||||||
except Exception:
|
except Exception:
|
||||||
proginit.logger.warning(
|
proginit.logger.warning(
|
||||||
"can not load revpimodio2 module. maybe its not installed "
|
"can not load revpimodio2 module. maybe its not installed "
|
||||||
@@ -1463,7 +1463,7 @@ def main() -> int:
|
|||||||
proginit.configure()
|
proginit.configure()
|
||||||
|
|
||||||
if proginit.pargs.test:
|
if proginit.pargs.test:
|
||||||
from testsystem import TestSystem
|
from .testsystem import TestSystem
|
||||||
|
|
||||||
root = TestSystem()
|
root = TestSystem()
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ __license__ = "GPLv2"
|
|||||||
|
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
|
|
||||||
import proginit
|
from . import proginit
|
||||||
|
|
||||||
newline = "\n------------------------------------------------------------\n"
|
newline = "\n------------------------------------------------------------\n"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user