diff --git a/revpipyload.e4p b/revpipyload.e4p index e78a34c..716912e 100644 --- a/revpipyload.e4p +++ b/revpipyload.e4p @@ -1,7 +1,7 @@ - + en_US @@ -9,7 +9,7 @@ Python3 Console Dieser Loader wird über das Init-System geladen und führt das angegebene Pythonprogramm aus. Es ist für den RevolutionPi gedacht um automatisch das SPS-Programm zu starten. - 0.2.12 + 0.3.0 Sven Sager akira@narux.de diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py index 78034c9..a639f46 100755 --- a/revpipyload/revpipyload.py +++ b/revpipyload/revpipyload.py @@ -51,10 +51,10 @@ from time import sleep, asctime from xmlrpc.client import Binary from xmlrpc.server import SimpleXMLRPCServer -configrsc = "/opt/KUNBUS/config.rsc" +configrsc = None picontrolreset = "/opt/KUNBUS/piControlReset" procimg = "/dev/piControl0" -pyloadverion = "0.2.12" +pyloadverion = "0.3.0" class LogReader(): @@ -483,6 +483,27 @@ class RevPiPyLoad(): """Instantiiert RevPiPyLoad-Klasse.""" proginit.configure() + # Globale Werte anpassen + global configrsc + global picontrolreset + + # piCtory Konfiguration an bekannten Stellen prüfen + lst_rsc = ["/etc/revpi/config.rsc", "/opt/KUNBUS/config.rsc"] + for rscfile in lst_rsc: + if os.access(rscfile, os.F_OK | os.R_OK): + configrsc = rscfile + break + if configrsc is None: + raise RuntimeError( + "can not access known pictory configurations at {}" + "".format(", ".join(lst_rsc)) + ) + + # piControlReset suchen + if not os.access(picontrolreset, os.F_OK | os.X_OK): + picontrolreset = "/usr/bin/piTest -x" + + # Klassenattribute self._exit = True self.evt_loadconfig = Event() self.globalconfig = ConfigParser() diff --git a/setup.py b/setup.py index d0fa2cb..ae17d66 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( license="LGPLv3", name="revpipyload", - version="0.2.12", + version="0.3.0", scripts=["data/revpipyload"],